Attachment 65554 Details for Bug 184957 – Proposed fix

[patch] Proposed fix

patch_184957.txt (text/plain), 1.62 KB, created by Olivier Thomann

on 2007-05-01 21:02:55 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2007-05-01 21:02:55 EDT

Size: 1.62 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.68
>diff -u -r1.68 AllocationExpression.java
>--- compiler/org/eclipse/jdt/internal/compiler/ast/AllocationExpression.java	26 Apr 2007 21:03:26 -0000	1.68
>+++ compiler/org/eclipse/jdt/internal/compiler/ast/AllocationExpression.java	2 May 2007 00:48:36 -0000
>@@ -84,7 +84,7 @@
> 	ReferenceBinding allocatedType = this.codegenBinding.declaringClass;
> 
> 	codeStream.new_(allocatedType);
>-	if (valueRequired) {
>+	if (valueRequired || (implicitConversion & TypeIds.UNBOXING) != 0) {
> 		codeStream.dup();
> 	}
> 	// better highlight for allocation: display the type individually
>@@ -126,7 +126,21 @@
> 		}
> 		codeStream.invokespecial(syntheticAccessor);
> 	}
>-	codeStream.generateImplicitConversion(this.implicitConversion);
>+	if (valueRequired) {
>+		codeStream.generateImplicitConversion(implicitConversion);
>+	} else {
>+		boolean isUnboxing = (implicitConversion & TypeIds.UNBOXING) != 0;
>+		// conversion only generated if unboxing
>+		if (isUnboxing) codeStream.generateImplicitConversion(implicitConversion);
>+		switch (isUnboxing ? postConversionType(currentScope).id : this.resolvedType.id) {
>+			case T_long :
>+			case T_double :
>+				codeStream.pop2();
>+				break;
>+			default :
>+				codeStream.pop();
>+		}
>+	}
> 	codeStream.recordPositionsFrom(pc, this.sourceStart);
> }
>

Actions: View | Diff

Attachments on bug 184957: 65554 | 65555 | 65557 | 65558 | 65559 | 65619 | 65620 | 65913