Attachment 38021 Details for Bug 135602 – Proposed fix

[patch] Proposed fix

patch_135602.txt (text/plain), 1.74 KB, created by Olivier Thomann

on 2006-04-07 13:30:29 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2006-04-07 13:30:29 EDT

Size: 1.74 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: compiler/org/eclipse/jdt/internal/compiler/ast/DoStatement.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/DoStatement.java,v
>retrieving revision 1.51
>diff -u -r1.51 DoStatement.java
>--- compiler/org/eclipse/jdt/internal/compiler/ast/DoStatement.java	3 Apr 2006 13:51:36 -0000	1.51
>+++ compiler/org/eclipse/jdt/internal/compiler/ast/DoStatement.java	7 Apr 2006 17:22:33 -0000
>@@ -138,7 +138,8 @@
> 		if (action != null) actionLabel.tagBits |= BranchLabel.USED;
> 		actionLabel.place();
> 		breakLabel.initialize(codeStream);
>-		if (continueLabel != null) {
>+		boolean continueLabelNotNull = continueLabel != null;
>+		if (continueLabelNotNull) {
> 			continueLabel.initialize(codeStream);
> 		}
> 
>@@ -148,19 +149,19 @@
> 		}
> 		Constant cst = condition.optimizedBooleanConstant();
> 		boolean isConditionOptimizedFalse = cst != Constant.NotAConstant && cst.booleanValue() == false;		
>+		if (continueLabelNotNull) {
>+			continueLabel.place();
>+		}
> 		if (isConditionOptimizedFalse){
> 			condition.generateCode(currentScope, codeStream, false);
>-		} else {
>+		} else if (continueLabelNotNull) {
> 			// generate condition
>-			if (continueLabel != null) {
>-				continueLabel.place();
>-				condition.generateOptimizedBoolean(
>-					currentScope,
>-					codeStream,
>-					actionLabel,
>-					null,
>-					true);
>-			}
>+			condition.generateOptimizedBoolean(
>+				currentScope,
>+				codeStream,
>+				actionLabel,
>+				null,
>+				true);
> 		}
> 		// May loose some local variable initializations : affecting the local variable attributes
> 		if (mergedInitStateIndex != -1) {

Actions: View | Diff

Attachments on bug 135602: 38020 | 38021 | 38022