Some work on #148.

Author: khatchad

edu.cuny.hunter.streamrefactoring.core/src/edu/cuny/hunter/streamrefactoring/core/analysis/Stream.java

@@ -409,7 +409,7 @@ public InstanceKey getInstanceKey(Collection<InstanceKey> trackedInstances,
 			instanceKey = this.getInstructionForCreation(engine)
 					.flatMap(instruction -> trackedInstances.stream()
 							.filter(ik -> instanceKeyCorrespondsWithInstantiationInstruction(ik, instruction,
-									engine.getCallGraph()))
+									this.getEnclosingMethodReference(), engine.getCallGraph()))
 							.findFirst())
 					.orElseThrow(() -> new InstanceKeyNotFoundException("Can't find instance key for: "
 							+ this.getCreation() + " using tracked instances: " + trackedInstances));

edu.cuny.hunter.streamrefactoring.core/src/edu/cuny/hunter/streamrefactoring/core/analysis/StreamStateMachine.java

@@ -1166,6 +1166,7 @@ private void fillInstanceToPredecessorMap(EclipseProjectAnalysisEngine<InstanceK
 
 	private void fillInstanceToStreamMap(Set<Stream> streamSet, EclipseProjectAnalysisEngine<InstanceKey> engine)
 			throws InvalidClassFileException, IOException, CoreException {
+		int skippedStreams = 0;
 		for (Stream stream : streamSet) {
 			InstanceKey instanceKey = null;
 			try {
@@ -1182,13 +1183,14 @@ private void fillInstanceToStreamMap(Set<Stream> streamSet, EclipseProjectAnalys
 							"Either pivital code isn't reachable for stream: " + stream.getCreation()
 									+ " or entry points are misconfigured.");
 				}
+				++skippedStreams;
 				continue; // next stream.
 			}
 			instanceToStreamMap.put(instanceKey, stream);
 		} // end each stream.
 
 		// sanity check since it's a bijection.
-		if (instanceToStreamMap.size() != streamSet.size())
+		if (instanceToStreamMap.size() != streamSet.size() - skippedStreams)
 			throw new IllegalArgumentException("Stream set does not produce a bijection of instance keys.");
 	}
 

edu.cuny.hunter.streamrefactoring.core/src/edu/cuny/hunter/streamrefactoring/core/safe/Util.java

@@ -3,6 +3,7 @@
 import java.util.Iterator;
 
 import com.ibm.wala.classLoader.CallSiteReference;
+import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.classLoader.NewSiteReference;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.CallGraph;
@@ -37,7 +38,7 @@ private Util() {
 	 *         instance key according to the given call graph.
 	 */
 	public static boolean instanceKeyCorrespondsWithInstantiationInstruction(InstanceKey instanceKey,
-			SSAInvokeInstruction instruction, CallGraph callGraph) {
+			SSAInvokeInstruction instruction, MethodReference instructionEnclosingMethod, CallGraph callGraph) {
 		// Creation sites for the instance with the given key in the given call
 		// graph.
 		Iterator<Pair<CGNode, NewSiteReference>> creationSites = instanceKey.getCreationSites(callGraph);
@@ -53,13 +54,22 @@ public static boolean instanceKeyCorrespondsWithInstantiationInstruction(Instanc
 			// get the call site references corresponding to the call string.
 			CallSiteReference[] callSiteRefs = callString.getCallSiteRefs();
 
+			// get the methods corresponding to the call string.
+			IMethod[] methods = callString.getMethods();
+
+			// check sanity.
+			assert callSiteRefs.length == methods.length : "Call sites and methods should correlate.";
+
 			// for each call site reference.
-			for (CallSiteReference callSiteReference : callSiteRefs) {
+			for (int i = 0; i < callSiteRefs.length; i++) {
+				CallSiteReference callSiteReference = callSiteRefs[i];
+				IMethod method = methods[i];
 				CallSiteReference instructionCallSite = instruction.getCallSite();
 
 				// if the call site reference equals the call site corresponding
 				// to the creation instruction.
-				if (callSiteReference.equals(instructionCallSite))
+				if (callSiteReference.equals(instructionCallSite)
+						&& method.getReference().getSignature().equals(instructionEnclosingMethod.getSignature()))
 					return true;
 				// workaround #80.
 				else if (callSiteReference.getProgramCounter() == instructionCallSite.getProgramCounter()) {

edu.cuny.hunter.streamrefactoring.eval/Stream Refactoring Evaluation.launch

@@ -107,6 +107,7 @@
 <booleanAttribute key="generateProfile" value="true"/>
 <booleanAttribute key="includeOptional" value="true"/>
 <stringAttribute key="location" value="${workspace_loc}/../Experiments"/>
+<stringAttribute key="org.eclipse.debug.ui.ATTR_CAPTURE_IN_FILE" value="${workspace_loc}/../Experiments/results/run.log"/>
 <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
 <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
 </listAttribute>