Changes to fix in a9a38e7.

I don't think we have this bug with unordered() any longer, perhaps due
to arbitrary call string lengths of ctor fixes.

Author: khatchad

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

@@ -746,46 +746,26 @@ private void discoverPossibleSideEffects(EclipseProjectAnalysisEngine<InstanceKe
 				continue;
 
 			CallStringWithReceivers callString = Util.getCallString(instance);
-			CallSiteReference[] callSiteRefs = callString.getCallSiteRefs();
-			assert callSiteRefs.length == 2 : "Expecting call sites two-deep.";
+			assert callString.getMethods().length >= 1 : "Expecting call sites at least one-deep.";
 
-			// get the target of the caller.
-			MethodReference callerDeclaredTarget = callSiteRefs[1].getDeclaredTarget();
-
-			// get it's IR.
-			IMethod callerTargetMethod = engine.getClassHierarchy().resolveMethod(callerDeclaredTarget);
-			boolean fallback = false;
-
-			if (callerTargetMethod == null) {
-				LOGGER.warning("Cannot resolve caller declared target method: " + callerDeclaredTarget);
-
-				// fall back.
-				callerTargetMethod = callString.getMethods()[1];
-				LOGGER.warning("Falling back to method: " + callerTargetMethod);
-				fallback = true;
-			}
-
-			IR ir = engine.getCache().getIR(callerTargetMethod);
+			IR ir = engine.getCache().getIR(callString.getMethods()[0]);
 
 			if (ir == null) {
-				LOGGER.warning("Can't find IR for target: " + callerTargetMethod);
+				LOGGER.warning("Can't find IR for target: " + callString.getMethods()[0]);
 				continue; // next instance.
 			}
 
 			// get calls to the caller target.
-			// if we are falling back, use index 1, otherwise stick with index
-			// 0.
-			int callSiteRefsInx = fallback ? 1 : 0;
-			SSAAbstractInvokeInstruction[] calls = ir.getCalls(callSiteRefs[callSiteRefsInx]);
+			SSAAbstractInvokeInstruction[] calls = ir.getCalls(callString.getCallSiteRefs()[0]);
 			assert calls.length == 1 : "Are we only expecting one call here?";
 
 			// I guess we're only interested in ones with a single behavioral
 			// parameter (the first parameter is implicit).
 			if (calls[0].getNumberOfUses() == 2) {
 				// get the use of the first parameter.
 				int use = calls[0].getUse(1);
-				this.discoverLambdaSideEffects(engine, mod, Collections.singleton(instance), callerDeclaredTarget, ir,
-						use);
+				this.discoverLambdaSideEffects(engine, mod, Collections.singleton(instance),
+						callString.getMethods()[0].getReference(), ir, use);
 			}
 		}
 	}