Attachment 152933 Details for Bug 277643 – Proposed patch

[patch] Proposed patch

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

on 2009-11-24 05:33:03 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Srikanth Sankaran

Created: 2009-11-24 05:33:03 EST

Size: 6.41 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.81
>diff -u -r1.81 AllocationExpression.java
>--- compiler/org/eclipse/jdt/internal/compiler/ast/AllocationExpression.java	18 Sep 2009 14:05:29 -0000	1.81
>+++ compiler/org/eclipse/jdt/internal/compiler/ast/AllocationExpression.java	24 Nov 2009 10:33:59 -0000
>@@ -44,7 +44,8 @@
> 	ReferenceBinding[] thrownExceptions;
> 	if (((thrownExceptions = this.binding.thrownExceptions).length) != 0) {
> 		if ((this.bits & ASTNode.Unchecked) != 0 && this.genericTypeArguments == null) {
>-			thrownExceptions = currentScope.environment().convertToRawTypes(this.binding.original().thrownExceptions, true, true);
>+			// https://bugs.eclipse.org/bugs/show_bug.cgi?id=277643, align with javac on JLS 15.12.2.6
>+			thrownExceptions = currentScope.environment().convertToRawTypes(this.binding.thrownExceptions, true, true);
> 		}		
> 		// check exception handling
> 		flowContext.checkExceptionHandlers(
>Index: compiler/org/eclipse/jdt/internal/compiler/ast/ExplicitConstructorCall.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ExplicitConstructorCall.java,v
>retrieving revision 1.72
>diff -u -r1.72 ExplicitConstructorCall.java
>--- compiler/org/eclipse/jdt/internal/compiler/ast/ExplicitConstructorCall.java	18 Sep 2009 14:05:29 -0000	1.72
>+++ compiler/org/eclipse/jdt/internal/compiler/ast/ExplicitConstructorCall.java	24 Nov 2009 10:33:59 -0000
>@@ -82,7 +82,8 @@
> 			ReferenceBinding[] thrownExceptions;
> 			if ((thrownExceptions = this.binding.thrownExceptions) != Binding.NO_EXCEPTIONS) {
> 				if ((this.bits & ASTNode.Unchecked) != 0 && this.genericTypeArguments == null) {
>-					thrownExceptions = currentScope.environment().convertToRawTypes(this.binding.original().thrownExceptions, true, true);
>+					// https://bugs.eclipse.org/bugs/show_bug.cgi?id=277643, align with javac on JLS 15.12.2.6
>+					thrownExceptions = currentScope.environment().convertToRawTypes(this.binding.thrownExceptions, true, true);
> 				}				
> 				// check exceptions
> 				flowContext.checkExceptionHandlers(
>Index: compiler/org/eclipse/jdt/internal/compiler/ast/MessageSend.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/MessageSend.java,v
>retrieving revision 1.144
>diff -u -r1.144 MessageSend.java
>--- compiler/org/eclipse/jdt/internal/compiler/ast/MessageSend.java	19 Feb 2009 18:54:57 -0000	1.144
>+++ compiler/org/eclipse/jdt/internal/compiler/ast/MessageSend.java	24 Nov 2009 10:33:59 -0000
>@@ -70,7 +70,8 @@
> 	ReferenceBinding[] thrownExceptions;
> 	if ((thrownExceptions = this.binding.thrownExceptions) != Binding.NO_EXCEPTIONS) {
> 		if ((this.bits & ASTNode.Unchecked) != 0 && this.genericTypeArguments == null) {
>-			thrownExceptions = currentScope.environment().convertToRawTypes(this.binding.original().thrownExceptions, true, true);
>+			// https://bugs.eclipse.org/bugs/show_bug.cgi?id=277643, align with javac on JLS 15.12.2.6
>+			thrownExceptions = currentScope.environment().convertToRawTypes(this.binding.thrownExceptions, true, true);
> 		}
> 		// must verify that exceptions potentially thrown by this expression are caught in the method
> 		flowContext.checkExceptionHandlers(thrownExceptions, this, flowInfo.copy(), currentScope);
>@@ -487,7 +488,8 @@
> 	} else {
> 		TypeBinding returnType;
> 		if ((this.bits & ASTNode.Unchecked) != 0 && this.genericTypeArguments == null) {
>-			returnType = this.binding.original().returnType;
>+			// https://bugs.eclipse.org/bugs/show_bug.cgi?id=277643, align with javac on JLS 15.12.2.6
>+			returnType = this.binding.returnType;
> 			if (returnType != null) {
> 				returnType = scope.environment().convertToRawType(returnType.erasure(), true);
> 			}
>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.96
>diff -u -r1.96 QualifiedAllocationExpression.java
>--- compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedAllocationExpression.java	19 Feb 2009 18:54:57 -0000	1.96
>+++ compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedAllocationExpression.java	24 Nov 2009 10:34:00 -0000
>@@ -83,7 +83,8 @@
> 		ReferenceBinding[] thrownExceptions;
> 		if (((thrownExceptions = this.binding.thrownExceptions).length) != 0) {
> 			if ((this.bits & ASTNode.Unchecked) != 0 && this.genericTypeArguments == null) {
>-				thrownExceptions = currentScope.environment().convertToRawTypes(this.binding.original().thrownExceptions, true, true);
>+				// https://bugs.eclipse.org/bugs/show_bug.cgi?id=277643, align with javac on JLS 15.12.2.6
>+				thrownExceptions = currentScope.environment().convertToRawTypes(this.binding.thrownExceptions, true, true);
> 			}			
> 			// check exception handling
> 			flowContext.checkExceptionHandlers(
>Index: compiler/org/eclipse/jdt/internal/compiler/ast/TypeDeclaration.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/TypeDeclaration.java,v
>retrieving revision 1.161
>diff -u -r1.161 TypeDeclaration.java
>--- compiler/org/eclipse/jdt/internal/compiler/ast/TypeDeclaration.java	1 Oct 2009 18:26:29 -0000	1.161
>+++ compiler/org/eclipse/jdt/internal/compiler/ast/TypeDeclaration.java	24 Nov 2009 10:34:00 -0000
>@@ -393,8 +393,9 @@
> 	}
> 
> 	//============BINDING UPDATE==========================
>+	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=277643, align with javac on JLS 15.12.2.6
> 	ReferenceBinding[] thrownExceptions = eraseThrownExceptions
>-			? this.scope.environment().convertToRawTypes(inheritedConstructorBinding.original().thrownExceptions, true, true)
>+			? this.scope.environment().convertToRawTypes(inheritedConstructorBinding.thrownExceptions, true, true)
> 			: inheritedConstructorBinding.thrownExceptions;
> 
> 	SourceTypeBinding sourceType = this.binding;

Actions: View | Diff

Attachments on bug 277643: 137110 | 152933 | 152934 | 153032 | 153033