Attachment 238326 Details for Bug 423582 – Patch under test

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch under test

polytypebinding.patch (text/plain), 3.75 KB, created by Srikanth Sankaran

on 2013-12-13 05:26:17 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Srikanth Sankaran

Created: 2013-12-13 05:26:17 EST

Size: 3.75 KB

patch

obsolete

>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/AllocationExpression.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/AllocationExpression.java
>index df28bc3..c49aad6 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/AllocationExpression.java
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/AllocationExpression.java
>@@ -309,7 +309,7 @@
> 			this.resolvedType = this.type.resolveType(scope, true /* check bounds*/);
> 			if (isDiamond && this.typeExpected == null && this.expressionContext == INVOCATION_CONTEXT && compilerOptions.sourceLevel >= ClassFileConstants.JDK1_8) {
> 				if (this.resolvedType != null && this.resolvedType.isValidBinding())
>-					return this.resolvedType = new PolyTypeBinding(this);
>+					return new PolyTypeBinding(this);
> 			}
> 		}
> 	} else {
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ConditionalExpression.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ConditionalExpression.java
>index 64b7a23..a5b3051 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ConditionalExpression.java
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ConditionalExpression.java
>@@ -461,7 +461,7 @@
> 			
> 			if (this.originalValueIfTrueType.kind() == Binding.POLY_TYPE || this.originalValueIfFalseType.kind() == Binding.POLY_TYPE) {
> 				this.isPolyExpression = true;
>-				return this.resolvedType = new PolyTypeBinding(this);
>+				return new PolyTypeBinding(this);
> 			}
> 		} else {
> 			if (this.originalValueIfTrueType.kind() == Binding.POLY_TYPE)
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/LambdaExpression.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/LambdaExpression.java
>index ecfd307..9a5fb75 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/LambdaExpression.java
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/LambdaExpression.java
>@@ -176,7 +176,7 @@
> 		this.enclosingScope = blockScope;
> 		
> 		if (this.expectedType == null && this.expressionContext == INVOCATION_CONTEXT) {
>-			return this.resolvedType = new PolyTypeBinding(this);
>+			return new PolyTypeBinding(this);
> 		} 
> 		
> 		MethodScope methodScope = blockScope.methodScope();
>@@ -958,6 +958,9 @@
> 	// Return the actual method binding devoid of synthetics. 
> 	public MethodBinding getMethodBinding() {
> 		if (this.actualMethodBinding == null) {
>+			if (this.binding == null) {
>+				this.resolveType((BlockScope)this.scope.parent);
>+			}
> 			this.actualMethodBinding = new MethodBinding(this.binding.modifiers, this.binding.selector, this.binding.returnType, 
> 					this.binding instanceof SyntheticMethodBinding ? this.descriptor.parameters : this.binding.parameters,  // retain any faults in parameter list.
> 							this.binding.thrownExceptions, this.binding.declaringClass);
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ReferenceExpression.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ReferenceExpression.java
>index 91b294d..6486736 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ReferenceExpression.java
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ReferenceExpression.java
>@@ -263,7 +263,7 @@
> 
>     	if (this.expectedType == null && this.expressionContext == INVOCATION_CONTEXT) {
>     		this.exactMethodBinding = isMethodReference() ? scope.getExactMethod(lhsType, this.selector, this) : scope.getExactConstructor(lhsType, this);
>-    		return this.resolvedType = new PolyTypeBinding(this);
>+    		return new PolyTypeBinding(this);
> 		}
> 		super.resolveType(scope);
>

Actions: View | Diff

Attachments on bug 423582: 238326