Almost complete revert of Bug 452788 (#4624)

stephan-herrmann · web-flow · commit a6af724bba7d · 2025-11-13T20:37:57.000+01:00
commit being reverted: bac0b68 see #4624
diff --git a/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/AllocationExpression.java b/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/AllocationExpression.java
@@ -91,7 +91,6 @@ public class AllocationExpression extends Expression implements IPolyExpression,
 	 // hold on to this context from invocation applicability inference until invocation type inference (per method candidate):
 	private Map<ParameterizedGenericMethodBinding, InferenceContext18> inferenceContexts;
 	public HashMap<TypeBinding, MethodBinding> solutionsPerTargetType;
-	private InferenceContext18 outerInferenceContext; // resolving within the context of an outer (lambda) inference?
 	public boolean argsContainCast;
 	public TypeBinding[] argumentTypes = Binding.NO_PARAMETERS;
 	public boolean argumentsHaveErrors = false;
@@ -855,7 +854,6 @@ public void cleanUpInferenceContexts() {
 		value.cleanUp();
 	}
 	this.inferenceContexts = null;
-	this.outerInferenceContext = null;
 	this.solutionsPerTargetType = null;
 }
 
@@ -866,7 +864,7 @@ public ExpressionContext getExpressionContext() {
 }
 @Override
 public InferenceContext18 freshInferenceContext(Scope scope) {
-	return new InferenceContext18(scope, this.arguments, this, this.outerInferenceContext);
+	return new InferenceContext18(scope, this.arguments, this);
 }
 @Override
 public int nameSourceStart() {
diff --git a/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/ExplicitConstructorCall.java b/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/ExplicitConstructorCall.java
@@ -607,7 +607,7 @@ public Expression[] arguments() {
 	// -- interface InvocationSite: --
 	@Override
 	public InferenceContext18 freshInferenceContext(Scope scope) {
-		return new InferenceContext18(scope, this.arguments, this, null);
+		return new InferenceContext18(scope, this.arguments, this);
 	}
 	@Override
 	public int nameSourceEnd() {
diff --git a/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/Expression.java b/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/Expression.java
@@ -1115,7 +1115,7 @@ public TypeBinding resolveTypeExpecting(BlockScope scope, TypeBinding expectedTy
 	return expressionType;
 }
 
-public Expression resolveExpressionExpecting(TypeBinding targetType, Scope scope, InferenceContext18 context) {
+public Expression resolveExpressionExpecting(TypeBinding targetType, Scope scope) {
 	return this; // subclasses should implement for a better resolved expression if required.
 }
 
diff --git a/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/IPolyExpression.java b/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/IPolyExpression.java
@@ -16,7 +16,6 @@
 package org.eclipse.jdt.internal.compiler.ast;
 
 import org.eclipse.jdt.internal.compiler.lookup.BlockScope;
-import org.eclipse.jdt.internal.compiler.lookup.InferenceContext18;
 import org.eclipse.jdt.internal.compiler.lookup.InvocationSite;
 import org.eclipse.jdt.internal.compiler.lookup.MethodBinding;
 import org.eclipse.jdt.internal.compiler.lookup.PolyTypeBinding;
@@ -64,6 +63,6 @@ public interface IPolyExpression {
 	*/
 	public TypeBinding resolveType(BlockScope blockScope);
 	// Resolve expression tentatively - should have no lingering side-effects that may impact final resolution !
-	public Expression resolveExpressionExpecting(TypeBinding targetType, Scope scope, InferenceContext18 inferenceContext);
+	public Expression resolveExpressionExpecting(TypeBinding targetType, Scope scope);
 
 }
diff --git a/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/LambdaExpression.java b/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/LambdaExpression.java
@@ -102,7 +102,6 @@ public class LambdaExpression extends FunctionalExpression implements IPolyExpre
 	private static final Block NO_BODY = new Block(0);
 	private HashMap<TypeBinding, LambdaExpression> copiesPerTargetType;
 	protected Expression [] resultExpressions = NO_EXPRESSIONS;
-	public InferenceContext18 inferenceContext; // when performing tentative resolve keep a back reference to the driving context
 	private Map<Integer/*sourceStart*/, LocalTypeBinding> localTypes; // support look-up of a local type from this lambda copy
 	public boolean hasVarTypedArguments = false;
 	int firstLocalLocal; // analysis index of first local variable (if any) post parameter(s) in the lambda; ("local local" as opposed to "outer local")
@@ -882,7 +881,7 @@ CompatibilityResult internalIsCompatibleWith(TypeBinding targetType, Scope skope
 
 		LambdaExpression copy = null;
 		try {
-			copy = cachedResolvedCopy(targetType, argumentsTypeElided(), false, null, skope); // if argument types are elided, we don't care for result expressions against *this* target, any valid target is OK.
+			copy = cachedResolvedCopy(targetType, argumentsTypeElided(), false, skope); // if argument types are elided, we don't care for result expressions against *this* target, any valid target is OK.
 		} catch (CopyFailureException cfe) {
 			if (this.assistNode)
 				return CompatibilityResult.COMPATIBLE; // can't type check result expressions, just say yes.
@@ -936,7 +935,7 @@ static class CopyFailureException extends RuntimeException {
 		private static final long serialVersionUID = 1L;
 	}
 
-	private LambdaExpression cachedResolvedCopy(TypeBinding targetType, boolean anyTargetOk, boolean requireExceptionAnalysis, InferenceContext18 context, Scope outerScope) {
+	private LambdaExpression cachedResolvedCopy(TypeBinding targetType, boolean anyTargetOk, boolean requireExceptionAnalysis, Scope outerScope) {
 		if (this.committed && outerScope instanceof BlockScope) {
 			this.enclosingScope = (BlockScope) outerScope;
 			// trust the result of any previous shape analysis:
@@ -981,7 +980,6 @@ private LambdaExpression cachedResolvedCopy(TypeBinding targetType, boolean anyT
 
 				copy.setExpressionContext(this.expressionContext);
 				copy.setExpectedType(targetType);
-				copy.inferenceContext = context;
 				TypeBinding type = copy.resolveType(this.enclosingScope, true);
 				if (type == null || !type.isValidBinding())
 					return null;
@@ -1009,10 +1007,10 @@ private LambdaExpression cachedResolvedCopy(TypeBinding targetType, boolean anyT
 	 * @return a resolved copy of 'this' or null if significant errors where encountered
 	 */
 	@Override
-	public LambdaExpression resolveExpressionExpecting(TypeBinding targetType, Scope skope, InferenceContext18 context) {
+	public LambdaExpression resolveExpressionExpecting(TypeBinding targetType, Scope skope) {
 		LambdaExpression copy = null;
 		try {
-			copy = cachedResolvedCopy(targetType, false, true, context, null /* to be safe we signal: not yet committed */);
+			copy = cachedResolvedCopy(targetType, false, true, null /* to be safe we signal: not yet committed */);
 		} catch (CopyFailureException cfe) {
 			return null;
 		}
@@ -1065,7 +1063,7 @@ public boolean sIsMoreSpecific(TypeBinding s, TypeBinding t, Scope skope) {
 
 		LambdaExpression copy;
 		try {
-			copy = cachedResolvedCopy(s, true /* any resolved copy is good */, false, null, null /*not yet committed*/); // we expect a cached copy - otherwise control won't reach here.
+			copy = cachedResolvedCopy(s, true /* any resolved copy is good */, false, null /*not yet committed*/); // we expect a cached copy - otherwise control won't reach here.
 		} catch (CopyFailureException cfe) {
 			if (this.assistNode)
 				return false;
diff --git a/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/MessageSend.java b/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/MessageSend.java
@@ -108,7 +108,6 @@ public class MessageSend extends Expression implements IPolyExpression, Invocati
 	 // hold on to this context from invocation applicability inference until invocation type inference (per method candidate):
 	private Map<ParameterizedGenericMethodBinding, InferenceContext18> inferenceContexts;
 	private HashMap<TypeBinding, MethodBinding> solutionsPerTargetType;
-	private InferenceContext18 outerInferenceContext; // resolving within the context of an outer (lambda) inference?
 
 	private boolean receiverIsType;
 	protected boolean argsContainCast;
@@ -1117,11 +1116,6 @@ protected TypeBinding handleNullnessCodePatterns(BlockScope scope, TypeBinding r
 }
 
 protected TypeBinding findMethodBinding(BlockScope scope) {
-	ReferenceContext referenceContext = scope.methodScope().referenceContext;
-	if (referenceContext instanceof LambdaExpression) {
-		this.outerInferenceContext = ((LambdaExpression) referenceContext).inferenceContext;
-	}
-
 	if (this.expectedType != null && this.binding instanceof PolyParameterizedGenericMethodBinding) {
 		this.binding = this.solutionsPerTargetType.get(this.expectedType);
 	}
@@ -1338,7 +1332,6 @@ public void cleanUpInferenceContexts() {
 			value.cleanUp();
 	}
 	this.inferenceContexts = null;
-	this.outerInferenceContext = null;
 	this.solutionsPerTargetType = null;
 }
 @Override
@@ -1352,7 +1345,7 @@ public ExpressionContext getExpressionContext() {
 // -- Interface InvocationSite: --
 @Override
 public InferenceContext18 freshInferenceContext(Scope scope) {
-	return new InferenceContext18(scope, this.arguments, this, this.outerInferenceContext);
+	return new InferenceContext18(scope, this.arguments, this);
 }
 @Override
 public boolean isQualifiedSuper() {
diff --git a/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/ReferenceExpression.java b/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/ReferenceExpression.java
@@ -1028,7 +1028,7 @@ public InferenceContext18 getInferenceContext(ParameterizedMethodBinding method)
 	}
 
 	@Override
-	public ReferenceExpression resolveExpressionExpecting(TypeBinding targetType, Scope scope, InferenceContext18 inferenceContext) {
+	public ReferenceExpression resolveExpressionExpecting(TypeBinding targetType, Scope scope) {
 		if (this.exactMethodBinding != null) { // We may see inference variables in target type.
 			MethodBinding functionType = targetType.getSingleAbstractMethod(scope, true);
 			if (functionType == null || functionType.problemId() == ProblemReasons.NoSuchSingleAbstractMethod)
@@ -1080,7 +1080,7 @@ public TypeBinding[] genericTypeArguments() {
 	public InferenceContext18 freshInferenceContext(Scope scope) {
 		if (this.expressionContext != ExpressionContext.VANILLA_CONTEXT) {
 			Expression[] arguments = createPseudoExpressions(this.freeParameters);
-			return new InferenceContext18(scope, arguments, this, null);
+			return new InferenceContext18(scope, arguments, this);
 		}
 		return null; // shouldn't happen, actually
 	}
diff --git a/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/BoundSet.java b/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/BoundSet.java
@@ -1302,25 +1302,6 @@ private void allSuperPairsWithCommonGenericTypeRecursive(TypeBinding s, TypeBind
 		}
 	}
 
-	public TypeBinding getEquivalentOuterVariable(InferenceVariable variable, InferenceVariable[] outerVariables) {
-		ThreeSets three = this.boundsPerVariable.get(variable);
-		if (three != null) {
-			for (TypeBound bound : three.sameBounds) {
-				for (InferenceVariable iv : outerVariables)
-					if (TypeBinding.equalsEquals(bound.right, iv))
-						return iv;
-			}
-		}
-		for (InferenceVariable iv : outerVariables) {
-			three = this.boundsPerVariable.get(iv);
-			if (three != null && three.sameBounds != null) {
-				for (TypeBound bound : three.sameBounds)
-					if (TypeBinding.equalsEquals(bound.right, variable))
-						return iv;
-			}
-		}
-		return null;
-	}
 	public TypeBinding condition18_5_5_item_4(
 			ReferenceBinding rAlpha,
 			InferenceVariable[] alpha,
diff --git a/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/ConstraintExceptionFormula.java b/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/ConstraintExceptionFormula.java
@@ -88,12 +88,12 @@ public Object reduce(InferenceContext18 inferenceContext) {
 
 		TypeBinding[] ePrime = null;
 		if (this.left instanceof LambdaExpression) {
-			LambdaExpression lambda = ((LambdaExpression) this.left).resolveExpressionExpecting(this.right, inferenceContext.scope, inferenceContext);
+			LambdaExpression lambda = ((LambdaExpression) this.left).resolveExpressionExpecting(this.right, inferenceContext.scope);
 			if (lambda == null)
 				return TRUE; // cannot make use of this buggy constraint
 			ePrime = lambda.getThrownExceptions().toArray(TypeBinding[]::new);
 		} else {
-			ReferenceExpression referenceExpression = ((ReferenceExpression) this.left).resolveExpressionExpecting(this.right, scope, inferenceContext);
+			ReferenceExpression referenceExpression = ((ReferenceExpression) this.left).resolveExpressionExpecting(this.right, scope);
 			MethodBinding method = referenceExpression != null ? referenceExpression.binding : null;
 			if (method != null)
 				ePrime = method.thrownExceptions;
diff --git a/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/ConstraintExpressionFormula.java b/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/ConstraintExpressionFormula.java
@@ -185,7 +185,7 @@ public Object reduce(InferenceContext18 inferenceContext) throws InferenceFailur
 					for (TypeBinding parameter : parameters)
 						if (!parameter.isProperType(true))
 							return FALSE;
-				lambda = lambda.resolveExpressionExpecting(t, inferenceContext.scope, inferenceContext);
+				lambda = lambda.resolveExpressionExpecting(t, inferenceContext.scope);
 				if (lambda == null)
 					return FALSE; // not strictly unreduceable, but proceeding with TRUE would likely produce secondary errors
 				if (functionType.returnType == TypeBinding.VOID) {
@@ -268,7 +268,7 @@ private Object reduceReferenceExpressionCompatibility(ReferenceExpression refere
 		if (functionType == null)
 			return FALSE;
 		// potentially-applicable method for the method reference when targeting T (15.13.1),
-		reference = reference.resolveExpressionExpecting(t, inferenceContext.scope, inferenceContext);
+		reference = reference.resolveExpressionExpecting(t, inferenceContext.scope);
 		MethodBinding potentiallyApplicable = reference != null ? reference.binding : null;
 		if (potentiallyApplicable == null)
 			return FALSE;
@@ -518,7 +518,7 @@ Collection<InferenceVariable> inputVariables(final InferenceContext18 context) {
 				if (sam.returnType != TypeBinding.VOID) {
 					// ii)
 					final TypeBinding r = sam.returnType;
-					LambdaExpression resolved = lambda.resolveExpressionExpecting(this.right, context.scope, context);
+					LambdaExpression resolved = lambda.resolveExpressionExpecting(this.right, context.scope);
 					Expression[] resultExpressions = resolved != null ? resolved.resultExpressions() : null;
 					for (int i = 0, length = resultExpressions == null ? 0 : resultExpressions.length; i < length; i++) {
 						variables.addAll(new ConstraintExpressionFormula(resultExpressions[i], r, COMPATIBLE).inputVariables(context));
diff --git a/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/InferenceContext18.java b/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/InferenceContext18.java
@@ -194,13 +194,12 @@ static class SuspendedInferenceRecord {
 	}
 
 	/** Construct an inference context for an invocation (method/constructor). */
-	public InferenceContext18(Scope scope, Expression[] arguments, InvocationSite site, InferenceContext18 outerContext) {
+	public InferenceContext18(Scope scope, Expression[] arguments, InvocationSite site) {
 		this.scope = scope;
 		this.environment = scope.environment();
 		this.object = scope.getJavaLangObject();
 		this.invocationArguments = arguments;
 		this.currentInvocation = site;
-		this.outerContext = outerContext;
 		if (site instanceof Invocation)
 			scope.compilationUnitScope().registerInferredInvocation((Invocation) site);
 	}
@@ -671,7 +670,7 @@ private boolean addConstraintsToC_OneExpr(Expression expri, Set<ConstraintFormul
 						t = ConstraintExpressionFormula.findGroundTargetType(this, skope, lambda, withWildCards);
 					}
 					MethodBinding functionType;
-					if (t != null && (functionType = t.getSingleAbstractMethod(skope, true)) != null && (lambda = lambda.resolveExpressionExpecting(t, this.scope, this)) != null) {
+					if (t != null && (functionType = t.getSingleAbstractMethod(skope, true)) != null && (lambda = lambda.resolveExpressionExpecting(t, this.scope)) != null) {
 						TypeBinding r = functionType.returnType;
 						Expression[] resultExpressions = lambda.resultExpressions();
 						for (int i = 0, length = resultExpressions == null ? 0 : resultExpressions.length; i < length; i++) {
@@ -1111,17 +1110,10 @@ public boolean isResolved(BoundSet boundSet) {
 	public TypeBinding /*@Nullable*/[] getSolutions(TypeVariableBinding[] typeParameters, InvocationSite site, BoundSet boundSet) {
 		int len = typeParameters.length;
 		TypeBinding[] substitutions = new TypeBinding[len];
-		InferenceVariable[] outerVariables = null;
-		if (this.outerContext != null && this.outerContext.stepCompleted < TYPE_INFERRED)
-			outerVariables = this.outerContext.inferenceVariables;
 		for (int i = 0; i < typeParameters.length; i++) {
 			for (InferenceVariable variable : this.inferenceVariables) {
 				if (isSameSite(variable.site, site) && TypeBinding.equalsEquals(variable.typeParameter, typeParameters[i])) {
-					TypeBinding outerVar = null;
-					if (outerVariables != null && (outerVar = boundSet.getEquivalentOuterVariable(variable, outerVariables)) != null)
-						substitutions[i] = outerVar;
-					else
-						substitutions[i] = boundSet.getInstantiation(variable, this.environment);
+					substitutions[i] = boundSet.getInstantiation(variable, this.environment);
 					break;
 				}
 			}
diff --git a/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/ReferenceBinding.java b/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/ReferenceBinding.java
@@ -64,13 +64,11 @@
 import java.util.stream.Stream;
 import org.eclipse.jdt.core.compiler.CharOperation;
 import org.eclipse.jdt.internal.compiler.ast.ASTNode;
-import org.eclipse.jdt.internal.compiler.ast.LambdaExpression;
 import org.eclipse.jdt.internal.compiler.ast.MethodDeclaration;
 import org.eclipse.jdt.internal.compiler.ast.NullAnnotationMatching;
 import org.eclipse.jdt.internal.compiler.ast.RecordComponent;
 import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
 import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
-import org.eclipse.jdt.internal.compiler.impl.ReferenceContext;
 
 /*
 Not all fields defined by this type (& its subclasses) are initialized when it is created.
@@ -1521,18 +1519,6 @@ private boolean isCompatibleWith0(TypeBinding otherType, /*@Nullable*/ Scope cap
 					return isCompatibleWith(otherLowerBound);
 				}
 			}
-			if (otherType instanceof InferenceVariable) {
-				// may interpret InferenceVariable as a joker, but only when within an outer lambda inference:
-				if (captureScope != null) {
-					MethodScope methodScope = captureScope.methodScope();
-					if (methodScope != null) {
-						ReferenceContext referenceContext = methodScope.referenceContext;
-						if (referenceContext instanceof LambdaExpression
-								&& ((LambdaExpression)referenceContext).inferenceContext != null)
-							return true;
-					}
-				}
-			}
 			//$FALL-THROUGH$
 		case Binding.GENERIC_TYPE :
 		case Binding.TYPE :
diff --git a/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/Scope.java b/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/Scope.java
@@ -4620,7 +4620,7 @@ protected final MethodBinding mostSpecificMethodBinding(MethodBinding[] visible,
 					} else {
 						expressions = ((ReferenceExpression)invocationSite).createPseudoExpressions(argumentTypes);
 					}
-					InferenceContext18 ic18 = new InferenceContext18(this, expressions, invocationSite, null);
+					InferenceContext18 ic18 = new InferenceContext18(this, expressions, invocationSite);
 					if (!ic18.isMoreSpecificThan(mbj, mbk, levelj == VARARGS_COMPATIBLE, levelk == VARARGS_COMPATIBLE)) {
 						continue nextJ;
 					}

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,6 @@ public class AllocationExpression extends Expression implements IPolyExpression,`
`91`	`91`	`// hold on to this context from invocation applicability inference until invocation type inference (per method candidate):`
`92`	`92`	`private Map<ParameterizedGenericMethodBinding, InferenceContext18> inferenceContexts;`
`93`	`93`	`public HashMap<TypeBinding, MethodBinding> solutionsPerTargetType;`
`94`		`- private InferenceContext18 outerInferenceContext; // resolving within the context of an outer (lambda) inference?`
`95`	`94`	`public boolean argsContainCast;`
`96`	`95`	`public TypeBinding[] argumentTypes = Binding.NO_PARAMETERS;`
`97`	`96`	`public boolean argumentsHaveErrors = false;`
`@@ -855,7 +854,6 @@ public void cleanUpInferenceContexts() {`
`855`	`854`	`value.cleanUp();`
`856`	`855`	`}`
`857`	`856`	`this.inferenceContexts = null;`
`858`		`- this.outerInferenceContext = null;`
`859`	`857`	`this.solutionsPerTargetType = null;`
`860`	`858`	`}`
`861`	`859`
`@@ -866,7 +864,7 @@ public ExpressionContext getExpressionContext() {`
`866`	`864`	`}`
`867`	`865`	`@Override`
`868`	`866`	`public InferenceContext18 freshInferenceContext(Scope scope) {`
`869`		`- return new InferenceContext18(scope, this.arguments, this, this.outerInferenceContext);`
	`867`	`+ return new InferenceContext18(scope, this.arguments, this);`
`870`	`868`	`}`
`871`	`869`	`@Override`
`872`	`870`	`public int nameSourceStart() {`
Original file line number	Diff line number	Diff line change
`@@ -607,7 +607,7 @@ public Expression[] arguments() {`
`607`	`607`	`// -- interface InvocationSite: --`
`608`	`608`	`@Override`
`609`	`609`	`public InferenceContext18 freshInferenceContext(Scope scope) {`
`610`		`- return new InferenceContext18(scope, this.arguments, this, null);`
	`610`	`+ return new InferenceContext18(scope, this.arguments, this);`
`611`	`611`	`}`
`612`	`612`	`@Override`
`613`	`613`	`public int nameSourceEnd() {`
Original file line number	Diff line number	Diff line change
`@@ -1115,7 +1115,7 @@ public TypeBinding resolveTypeExpecting(BlockScope scope, TypeBinding expectedTy`
`1115`	`1115`	`return expressionType;`
`1116`	`1116`	`}`
`1117`	`1117`
`1118`		`-public Expression resolveExpressionExpecting(TypeBinding targetType, Scope scope, InferenceContext18 context) {`
	`1118`	`+public Expression resolveExpressionExpecting(TypeBinding targetType, Scope scope) {`
`1119`	`1119`	`return this; // subclasses should implement for a better resolved expression if required.`
`1120`	`1120`	`}`
`1121`	`1121`
Original file line number	Diff line number	Diff line change
`@@ -1028,7 +1028,7 @@ public InferenceContext18 getInferenceContext(ParameterizedMethodBinding method)`
`1028`	`1028`	`}`
`1029`	`1029`
`1030`	`1030`	`@Override`
`1031`		`- public ReferenceExpression resolveExpressionExpecting(TypeBinding targetType, Scope scope, InferenceContext18 inferenceContext) {`
	`1031`	`+ public ReferenceExpression resolveExpressionExpecting(TypeBinding targetType, Scope scope) {`
`1032`	`1032`	`if (this.exactMethodBinding != null) { // We may see inference variables in target type.`
`1033`	`1033`	`MethodBinding functionType = targetType.getSingleAbstractMethod(scope, true);`
`1034`	`1034`	`if (functionType == null \|\| functionType.problemId() == ProblemReasons.NoSuchSingleAbstractMethod)`
`@@ -1080,7 +1080,7 @@ public TypeBinding[] genericTypeArguments() {`
`1080`	`1080`	`public InferenceContext18 freshInferenceContext(Scope scope) {`
`1081`	`1081`	`if (this.expressionContext != ExpressionContext.VANILLA_CONTEXT) {`
`1082`	`1082`	`Expression[] arguments = createPseudoExpressions(this.freeParameters);`
`1083`		`- return new InferenceContext18(scope, arguments, this, null);`
	`1083`	`+ return new InferenceContext18(scope, arguments, this);`
`1084`	`1084`	`}`
`1085`	`1085`	`return null; // shouldn't happen, actually`
`1086`	`1086`	`}`