Attachment 195699 Details for Bug 345559 – Another patch

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

[patch] Another patch

patch.txt (text/plain), 5.63 KB, created by Srikanth Sankaran

on 2011-05-16 05:00:08 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Srikanth Sankaran

Created: 2011-05-16 05:00:08 EDT

Size: 5.63 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: compiler/org/eclipse/jdt/internal/compiler/ast/AllocationExpression.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/AllocationExpression.java,v
>retrieving revision 1.84.2.9
>diff -u -r1.84.2.9 AllocationExpression.java
>--- compiler/org/eclipse/jdt/internal/compiler/ast/AllocationExpression.java	11 May 2011 08:25:19 -0000	1.84.2.9
>+++ compiler/org/eclipse/jdt/internal/compiler/ast/AllocationExpression.java	16 May 2011 08:57:21 -0000
>@@ -17,7 +17,6 @@
>  *******************************************************************************/
> package org.eclipse.jdt.internal.compiler.ast;
> 
>-import org.eclipse.jdt.core.compiler.CharOperation;
> import org.eclipse.jdt.internal.compiler.ASTVisitor;
> import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
> import org.eclipse.jdt.internal.compiler.codegen.*;
>@@ -375,6 +374,10 @@
> 	}
> 	if (isDiamond) {
> 		TypeBinding [] inferredTypes = inferElidedTypes(((ParameterizedTypeBinding) this.resolvedType).genericType(), argumentTypes, scope);
>+		if (inferredTypes == null) {
>+			scope.problemReporter().cannotInferElidedTypes(this);
>+			return this.resolvedType = null;
>+		}
> 		this.resolvedType = this.type.resolvedType = scope.environment().createParameterizedType(((ParameterizedTypeBinding) this.resolvedType).genericType(), inferredTypes, ((ParameterizedTypeBinding) this.resolvedType).enclosingType());
>  	}
> 	ReferenceBinding allocationType = (ReferenceBinding) this.resolvedType;
>@@ -412,13 +415,7 @@
> 	if (factory instanceof ParameterizedGenericMethodBinding && factory.isValidBinding()) {
> 		return ((ParameterizedTypeBinding)factory.returnType).arguments;
> 	}
>-	scope.problemReporter().cannotInferElidedTypes(this);
>-	int arity = allocationType.typeVariables().length;
>-	TypeBinding [] inferredTypes = new TypeBinding[arity];
>-	for (int i = 0; i < arity; i++) {
>-		inferredTypes[i] = new ProblemReferenceBinding(CharOperation.NO_CHAR_CHAR, null, ProblemReasons.InferenceFailed);
>-	}
>-	return inferredTypes;
>+	return null;
> }
> 
> public void setActualReceiverType(ReferenceBinding receiverType) {
>Index: compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedAllocationExpression.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedAllocationExpression.java,v
>retrieving revision 1.101.2.9
>diff -u -r1.101.2.9 QualifiedAllocationExpression.java
>--- compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedAllocationExpression.java	12 May 2011 06:32:46 -0000	1.101.2.9
>+++ compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedAllocationExpression.java	16 May 2011 08:57:21 -0000
>@@ -400,6 +400,10 @@
> 			}
> 			if (isDiamond) {
> 				TypeBinding [] inferredTypes = inferElidedTypes(((ParameterizedTypeBinding) receiverType).genericType(), argumentTypes, scope);
>+				if (inferredTypes == null) {
>+					scope.problemReporter().cannotInferElidedTypes(this);
>+					return this.resolvedType = null;
>+				}
> 				receiverType = this.type.resolvedType = scope.environment().createParameterizedType(((ParameterizedTypeBinding) receiverType).genericType(), inferredTypes, ((ParameterizedTypeBinding) receiverType).enclosingType());
> 			}
> 			ReferenceBinding allocationType = (ReferenceBinding) receiverType;
>Index: compiler/org/eclipse/jdt/internal/compiler/lookup/ProblemReasons.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ProblemReasons.java,v
>retrieving revision 1.14.28.2
>diff -u -r1.14.28.2 ProblemReasons.java
>--- compiler/org/eclipse/jdt/internal/compiler/lookup/ProblemReasons.java	24 Apr 2011 11:01:15 -0000	1.14.28.2
>+++ compiler/org/eclipse/jdt/internal/compiler/lookup/ProblemReasons.java	16 May 2011 08:57:21 -0000
>@@ -31,5 +31,4 @@
> 	final int TypeArgumentsForRawGenericMethod = 13; // for generic method
> 	final int InvalidTypeForStaticImport = 14;
> 	final int InvalidTypeForAutoManagedResource = 15;
>-	final int InferenceFailed = 16;
> }
>Index: compiler/org/eclipse/jdt/internal/compiler/lookup/Scope.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/Scope.java,v
>retrieving revision 1.380.2.5
>diff -u -r1.380.2.5 Scope.java
>--- compiler/org/eclipse/jdt/internal/compiler/lookup/Scope.java	10 May 2011 10:22:36 -0000	1.380.2.5
>+++ compiler/org/eclipse/jdt/internal/compiler/lookup/Scope.java	16 May 2011 08:57:21 -0000
>@@ -4036,7 +4036,11 @@
> 		int sfi = 0;
> 		for (int i = 0, length = methods.length; i < length; i++) {
> 			MethodBinding method = methods[i];
>-			
>+			int paramLength = method.parameters.length;
>+			boolean isVarArgs = method.isVarargs();
>+			if (argumentTypes.length != paramLength)
>+				if (!isVarArgs || argumentTypes.length < paramLength - 1)
>+					continue; // incompatible
> 			TypeVariableBinding[] methodTypeVariables = method.typeVariables();
> 			int methodTypeVariablesArity = methodTypeVariables.length;
> 	        
>@@ -4114,6 +4118,8 @@
> 			staticFactories[sfi++] = new ParameterizedMethodBinding((ParameterizedTypeBinding) environment.convertToParameterizedType(staticFactory.declaringClass),
> 																												staticFactory);
> 		}
>+		if (sfi == 0)
>+			return null;
> 		if (sfi != methods.length) {
> 			System.arraycopy(staticFactories, 0, staticFactories = new MethodBinding[sfi], 0, sfi);
> 		}

Actions: View | Diff

Attachments on bug 345559: 195479 | 195691 | 195699 | 195879