Fix for #103

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

@@ -22,7 +22,6 @@
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.dom.MethodInvocation;
 
 import com.google.common.collect.HashBasedTable;
 import com.google.common.collect.Table;
@@ -281,114 +280,117 @@ public void start() throws IOException, CoreException, CallGraphBuilderCancelExc
 // the node of where the stream was declared: TODO: Can this be
 // somehow rewritten to get blocks corresponding to terminal
 // operations?
-CGNode cgNode = this.getStream().getEnclosingMethodNode();
-
-for (Iterator<CallSiteReference> callSites = cgNode.iterateCallSites(); callSites.hasNext();) {
-CallSiteReference callSiteReference = callSites.next();
-MethodReference calledMethod = callSiteReference.getDeclaredTarget();
-
-// is it a terminal operation? TODO: Should this be
-// cached somehow? Collection of all terminal operation
-// invocations?
-if (isTerminalOperation(calledMethod)) {
-// get the basic block for the call.
-ISSABasicBlock[] blocksForCall = cgNode.getIR().getBasicBlocksForCall(callSiteReference);
-
-assert blocksForCall.length == 1 : "Expecting only a single basic block for the call: "
-+ callSiteReference;
-
-for (int i = 0; i < blocksForCall.length; i++) {
-ISSABasicBlock block = blocksForCall[i];
-
-BasicBlockInContext<IExplodedBasicBlock> blockInContext = getBasicBlockInContextForBlock(
-block, cgNode, supergraph)
-.orElseThrow(() -> new IllegalStateException(
-"No basic block in context for block: " + block));
-
-if (!terminalBlockToPossibleReceivers.containsKey(blockInContext)) {
-// associate possible receivers with the
-// blockInContext.
-// search through each instruction in the
-// block.
-int processedInstructions = 0;
-for (Iterator<SSAInstruction> it = block.iterator(); it.hasNext();) {
-SSAInstruction instruction = it.next();
-
-// if it's a phi instruction.
-if (instruction instanceof SSAPhiInstruction)
-// skip it. The pointer analysis
-// below will handle it.
-continue;
-
-// Get the possible receivers. This
-// number corresponds to the value
-// number of the receiver of the method.
-int valueNumberForReceiver = instruction.getUse(0);
-
-// it should be represented by a pointer
-// key.
-PointerKey pointerKey = engine.getHeapGraph().getHeapModel()
-.getPointerKeyForLocal(cgNode, valueNumberForReceiver);
-
-// get the points to set for the
-// receiver. This will give us all
-// object instances that the receiver
-// reference points to.
-OrdinalSet<InstanceKey> pointsToSet = engine.getPointerAnalysis()
-.getPointsToSet(pointerKey);
-assert pointsToSet != null : "The points-to set (I think) should not be null for pointer: "
-+ pointerKey;
-
-OrdinalSet<InstanceKey> previousReceivers = terminalBlockToPossibleReceivers
-.put(blockInContext, pointsToSet);
-assert previousReceivers == null : "Reassociating a blockInContext: "
-+ blockInContext + " with a new points-to set: " + pointsToSet
-+ " that was originally: " + previousReceivers;
-
-++processedInstructions;
+Iterator<CGNode> cgNodes = this.getStream().getAnalysisEngine().getCallGraph().iterator();
+for (;cgNodes.hasNext();) {
+CGNode cgNode = cgNodes.next();
+for (Iterator<CallSiteReference> callSites = cgNode.iterateCallSites(); callSites.hasNext();) {
+CallSiteReference callSiteReference = callSites.next();
+MethodReference calledMethod = callSiteReference.getDeclaredTarget();
+
+// is it a terminal operation? TODO: Should this be
+// cached somehow? Collection of all terminal operation
+// invocations?
+if (isTerminalOperation(calledMethod)) {
+// get the basic block for the call.
+
+ISSABasicBlock[] blocksForCall = cgNode.getIR().getBasicBlocksForCall(callSiteReference);
+
+assert blocksForCall.length == 1 : "Expecting only a single basic block for the call: "
++ callSiteReference;
+
+for (int i = 0; i < blocksForCall.length; i++) {
+ISSABasicBlock block = blocksForCall[i];
+
+BasicBlockInContext<IExplodedBasicBlock> blockInContext = getBasicBlockInContextForBlock(
+block, cgNode, supergraph)
+.orElseThrow(() -> new IllegalStateException(
+"No basic block in context for block: " + block));
+
+if (!terminalBlockToPossibleReceivers.containsKey(blockInContext)) {
+// associate possible receivers with the
+// blockInContext.
+// search through each instruction in the
+// block.
+int processedInstructions = 0;
+for (Iterator<SSAInstruction> it = block.iterator(); it.hasNext();) {
+SSAInstruction instruction = it.next();
+
+// if it's a phi instruction.
+if (instruction instanceof SSAPhiInstruction)
+// skip it. The pointer analysis
+// below will handle it.
+continue;
+
+// Get the possible receivers. This
+// number corresponds to the value
+// number of the receiver of the method.
+int valueNumberForReceiver = instruction.getUse(0);
+
+// it should be represented by a pointer
+// key.
+PointerKey pointerKey = engine.getHeapGraph().getHeapModel()
+.getPointerKeyForLocal(cgNode, valueNumberForReceiver);
+
+// get the points to set for the
+// receiver. This will give us all
+// object instances that the receiver
+// reference points to.
+OrdinalSet<InstanceKey> pointsToSet = engine.getPointerAnalysis()
+.getPointsToSet(pointerKey);
+assert pointsToSet != null : "The points-to set (I think) should not be null for pointer: "
++ pointerKey;
+
+OrdinalSet<InstanceKey> previousReceivers = terminalBlockToPossibleReceivers
+.put(blockInContext, pointsToSet);
+assert previousReceivers == null : "Reassociating a blockInContext: "
++ blockInContext + " with a new points-to set: " + pointsToSet
++ " that was originally: " + previousReceivers;
+
+++processedInstructions;
+}
+
+assert processedInstructions == 1 : "Expecting to process one and only one instruction here.";
 }
 
-assert processedInstructions == 1 : "Expecting to process one and only one instruction here.";
-}
-
-IntSet intSet = instanceResult.getResult().getResult(blockInContext);
-for (IntIterator it = intSet.intIterator(); it.hasNext();) {
-int nextInt = it.next();
-
-// retrieve the state set for this instance
-// and block.
-Map<TypestateRule, Set<IDFAState>> ruleToStates = instanceBlockStateTable
-.get(instanceKey, blockInContext);
-
-// if it doesn't yet exist.
-if (ruleToStates == null) {
-// allocate a new rule map.
-ruleToStates = new HashMap<>();
-
-// place it in the table.
-instanceBlockStateTable.put(instanceKey, blockInContext, ruleToStates);
-}
-
-Set<IDFAState> stateSet = ruleToStates.get(rule);
-
-// if it does not yet exist.
-if (stateSet == null) {
-// allocate a new set.
-stateSet = new HashSet<>();
-
-// place it in the map.
-ruleToStates.put(rule, stateSet);
-}
-
-// get the facts.
-Factoid factoid = instanceResult.getDomain().getMappedObject(nextInt);
-if (factoid != DUMMY_ZERO) {
-BaseFactoid baseFactoid = (BaseFactoid) factoid;
-assert baseFactoid.instance.equals(
-instanceKey) : "Sanity check that the fact instance should be the same as the instance being examined.";
-
-// add the encountered state to the set.
-stateSet.add(baseFactoid.state);
+IntSet intSet = instanceResult.getResult().getResult(blockInContext);
+for (IntIterator it = intSet.intIterator(); it.hasNext();) {
+int nextInt = it.next();
+
+// retrieve the state set for this instance
+// and block.
+Map<TypestateRule, Set<IDFAState>> ruleToStates = instanceBlockStateTable
+.get(instanceKey, blockInContext);
+
+// if it doesn't yet exist.
+if (ruleToStates == null) {
+// allocate a new rule map.
+ruleToStates = new HashMap<>();
+
+// place it in the table.
+instanceBlockStateTable.put(instanceKey, blockInContext, ruleToStates);
+}
+
+Set<IDFAState> stateSet = ruleToStates.get(rule);
+
+// if it does not yet exist.
+if (stateSet == null) {
+// allocate a new set.
+stateSet = new HashSet<>();
+
+// place it in the map.
+ruleToStates.put(rule, stateSet);
+}
+
+// get the facts.
+Factoid factoid = instanceResult.getDomain().getMappedObject(nextInt);
+if (factoid != DUMMY_ZERO) {
+BaseFactoid baseFactoid = (BaseFactoid) factoid;
+assert baseFactoid.instance.equals(
+instanceKey) : "Sanity check that the fact instance should be the same as the instance being examined.";
+
+// add the encountered state to the set.
+stateSet.add(baseFactoid.state);
+}
 }
 }
 }

edu.cuny.hunter.streamrefactoring.tests/resources/ConvertStreamToParallel/testNonInternalAPI2/in/A.java

@@ -0,0 +1,20 @@
+package p;
+
+import java.util.HashSet;
+import java.util.stream.*;
+
+import edu.cuny.hunter.streamrefactoring.annotations.*;
+
+class A {
+
+Stream<Object> m() {
+Stream<Object> stream = new HashSet<>().stream().distinct();
+return stream;
+}
+
+@EntryPoint
+void n() {
+Stream<Object> s = m();
+s.count();
+}
+}

edu.cuny.hunter.streamrefactoring.tests/resources/ConvertStreamToParallel/testNonInternalAPI3/in/A.java

@@ -0,0 +1,20 @@
+package p;
+
+import java.util.HashSet;
+import java.util.stream.*;
+
+import edu.cuny.hunter.streamrefactoring.annotations.*;
+
+class A {
+
+Stream<Object> m() {
+Stream<Object> stream = new HashSet<>().stream();
+return stream;
+}
+
+@EntryPoint
+void n() {
+Stream<Object> s = m();
+s.distinct().count();
+}
+}

edu.cuny.hunter.streamrefactoring.tests/resources/ConvertStreamToParallel/testNonInternalAPI4/in/A.java

@@ -0,0 +1,20 @@
+package p;
+
+import java.util.HashSet;
+import java.util.stream.*;
+
+import edu.cuny.hunter.streamrefactoring.annotations.*;
+
+class A {
+
+Stream<Object> m() {
+Stream<Object> stream = new HashSet<>().stream().sorted();
+return stream;
+}
+
+@EntryPoint
+void n() {
+Stream<Object> s = m();
+s.distinct().count();
+}
+}

edu.cuny.hunter.streamrefactoring.tests/resources/ConvertStreamToParallel/testNonInternalAPI5/in/A.java

@@ -0,0 +1,20 @@
+package p;
+
+import java.util.HashSet;
+import java.util.stream.*;
+
+import edu.cuny.hunter.streamrefactoring.annotations.*;
+
+class A {
+
+Stream<Object> m() {
+Stream<Object> stream = new HashSet<>().stream().parallel();
+return stream;
+}
+
+@EntryPoint
+void n() {
+Stream<Object> s = m();
+s.distinct().count();
+}
+}

edu.cuny.hunter.streamrefactoring.tests/resources/ConvertStreamToParallel/testNonInternalAPI6/in/A.java

@@ -0,0 +1,23 @@
+package p;
+
+import java.util.HashSet;
+import java.util.stream.*;
+
+import edu.cuny.hunter.streamrefactoring.annotations.*;
+
+class A {
+
+Stream<Object> m() {
+Stream<Object> stream = new HashSet<>().stream().parallel();
+return stream;
+}
+
+void n(Stream<Object> s) {
+s.distinct().count();
+}
+
+@EntryPoint
+public void main(String[] args) {
+n(m());
+}
+}