Attachment 154955 Details for Bug 293917 – proposed fix v0.5 + regression test

[patch] proposed fix v0.5 + regression test

patchNullAnalysis.txt (text/plain), 72.06 KB, created by Ayushman Jain

on 2009-12-23 02:00:09 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Ayushman Jain

Created: 2009-12-23 02:00:09 EST

Size: 72.06 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: compiler/org/eclipse/jdt/internal/compiler/ast/EqualExpression.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/EqualExpression.java,v
>retrieving revision 1.76
>diff -u -r1.76 EqualExpression.java
>--- compiler/org/eclipse/jdt/internal/compiler/ast/EqualExpression.java	24 Sep 2009 20:46:00 -0000	1.76
>+++ compiler/org/eclipse/jdt/internal/compiler/ast/EqualExpression.java	23 Dec 2009 06:49:45 -0000
>@@ -59,6 +59,12 @@
> 				}
> 				break;
> 		}
>+		// set the optimize constant to optimize code gen
>+		if ((initsWhenTrue.tagBits & FlowInfo.UNREACHABLE)!=0) {
>+			this.optimizedBooleanConstant = BooleanConstant.fromValue(false);
>+		} else if ((initsWhenFalse.tagBits & FlowInfo.UNREACHABLE)!=0) {
>+			this.optimizedBooleanConstant = BooleanConstant.fromValue(true);
>+		}
> 		// we do not impact enclosing try context because this kind of protection
> 		// does not preclude the variable from being null in an enclosing scope
> 	}
>Index: compiler/org/eclipse/jdt/internal/compiler/ast/IfStatement.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/IfStatement.java,v
>retrieving revision 1.65
>diff -u -r1.65 IfStatement.java
>--- compiler/org/eclipse/jdt/internal/compiler/ast/IfStatement.java	15 Jul 2009 17:42:43 -0000	1.65
>+++ compiler/org/eclipse/jdt/internal/compiler/ast/IfStatement.java	23 Dec 2009 06:49:45 -0000
>@@ -138,13 +138,19 @@
> 			|| this.elseStatement.isEmptyBlock());
> 	if (hasThenPart) {
> 		BranchLabel falseLabel = null;
>-		// generate boolean condition
>-		this.condition.generateOptimizedBoolean(
>-			currentScope,
>-			codeStream,
>-			null,
>-			hasElsePart ? (falseLabel = new BranchLabel(codeStream)) : endifLabel,
>-			true/*cst == Constant.NotAConstant*/);
>+		// generate boolean condition only if needed
>+		if (cst != Constant.NotAConstant && cst.booleanValue() == true) {
>+			// No need to generate if condition statement when we know that only the then action
>+			// will be executed
>+			this.condition.generateCode(currentScope, codeStream, false);
>+		} else {
>+			this.condition.generateOptimizedBoolean(
>+				currentScope,
>+				codeStream,
>+				null,
>+				hasElsePart ? (falseLabel = new BranchLabel(codeStream)) : endifLabel,
>+				true/*cst == Constant.NotAConstant*/);
>+		}
> 		// May loose some local variable initializations : affecting the local variable attributes
> 		if (this.thenInitStateIndex != -1) {
> 			codeStream.removeNotDefinitelyAssignedVariables(currentScope, this.thenInitStateIndex);
>@@ -173,13 +179,19 @@
> 			this.elseStatement.generateCode(currentScope, codeStream);
> 		}
> 	} else if (hasElsePart) {
>-		// generate boolean condition
>-		this.condition.generateOptimizedBoolean(
>-			currentScope,
>-			codeStream,
>-			endifLabel,
>-			null,
>-			true/*cst == Constant.NotAConstant*/);
>+		// generate boolean condition only if needed
>+		if (cst != Constant.NotAConstant && cst.booleanValue() == false) {
>+			// No need to generate if condition statement when we know that only the else action
>+			// will be executed
>+			this.condition.generateCode(currentScope, codeStream, false);
>+		} else {
>+			this.condition.generateOptimizedBoolean(
>+				currentScope,
>+				codeStream,
>+				endifLabel,
>+				null,
>+				true/*cst == Constant.NotAConstant*/);
>+		}
> 		// generate else statement
> 		// May loose some local variable initializations : affecting the local variable attributes
> 		if (this.elseInitStateIndex != -1) {
>Index: compiler/org/eclipse/jdt/internal/compiler/flow/FinallyFlowContext.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/FinallyFlowContext.java,v
>retrieving revision 1.30
>diff -u -r1.30 FinallyFlowContext.java
>--- compiler/org/eclipse/jdt/internal/compiler/flow/FinallyFlowContext.java	19 Nov 2009 15:57:21 -0000	1.30
>+++ compiler/org/eclipse/jdt/internal/compiler/flow/FinallyFlowContext.java	23 Dec 2009 06:49:46 -0000
>@@ -192,8 +192,10 @@
> 						if (flowInfo.cannotBeNull(local)) {
> 							if (checkType == (CAN_ONLY_NULL_NON_NULL | IN_COMPARISON_NON_NULL)) {
> 								scope.problemReporter().localVariableRedundantCheckOnNonNull(local, reference);
>+								flowInfo.initsWhenFalse().setReachMode(FlowInfo.UNREACHABLE);
> 							} else if (checkType == (CAN_ONLY_NULL_NON_NULL | IN_COMPARISON_NULL)) {
> 								scope.problemReporter().localVariableNonNullComparedToNull(local, reference);
>+								flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE);
> 							}
> 							return;
> 						}
>@@ -201,9 +203,11 @@
> 							switch(checkType & CONTEXT_MASK) {
> 								case FlowContext.IN_COMPARISON_NULL:
> 									scope.problemReporter().localVariableRedundantCheckOnNull(local, reference);
>+									flowInfo.initsWhenFalse().setReachMode(FlowInfo.UNREACHABLE);
> 									return;
> 								case FlowContext.IN_COMPARISON_NON_NULL:
> 									scope.problemReporter().localVariableNullComparedToNonNull(local, reference);
>+									flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE);
> 									return;
> 								case FlowContext.IN_ASSIGNMENT:
> 									scope.problemReporter().localVariableRedundantNullAssignment(local, reference);
>@@ -234,8 +238,10 @@
> 						if (flowInfo.isDefinitelyNonNull(local)) {
> 							if (checkType == (CAN_ONLY_NULL_NON_NULL | IN_COMPARISON_NON_NULL)) {
> 								scope.problemReporter().localVariableRedundantCheckOnNonNull(local, reference);
>+								flowInfo.initsWhenFalse().setReachMode(FlowInfo.UNREACHABLE);
> 							} else {
> 								scope.problemReporter().localVariableNonNullComparedToNull(local, reference);
>+								flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE);	
> 							}
> 							return;
> 						}
>@@ -248,9 +254,11 @@
> 							switch(checkType & CONTEXT_MASK) {
> 								case FlowContext.IN_COMPARISON_NULL:
> 									scope.problemReporter().localVariableRedundantCheckOnNull(local, reference);
>+									flowInfo.initsWhenFalse().setReachMode(FlowInfo.UNREACHABLE);
> 									return;
> 								case FlowContext.IN_COMPARISON_NON_NULL:
> 									scope.problemReporter().localVariableNullComparedToNonNull(local, reference);
>+									flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE);
> 									return;
> 								case FlowContext.IN_ASSIGNMENT:
> 									scope.problemReporter().localVariableRedundantNullAssignment(local, reference);
>Index: compiler/org/eclipse/jdt/internal/compiler/flow/FlowContext.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/FlowContext.java,v
>retrieving revision 1.61
>diff -u -r1.61 FlowContext.java
>--- compiler/org/eclipse/jdt/internal/compiler/flow/FlowContext.java	7 Mar 2009 00:59:06 -0000	1.61
>+++ compiler/org/eclipse/jdt/internal/compiler/flow/FlowContext.java	23 Dec 2009 06:49:46 -0000
>@@ -543,8 +543,10 @@
> 			if (flowInfo.isDefinitelyNonNull(local)) {
> 				if (checkType == (CAN_ONLY_NULL_NON_NULL | IN_COMPARISON_NON_NULL)) {
> 					scope.problemReporter().localVariableRedundantCheckOnNonNull(local, reference);
>+					flowInfo.initsWhenFalse().setReachMode(FlowInfo.UNREACHABLE);
> 				} else {
> 					scope.problemReporter().localVariableNonNullComparedToNull(local, reference);
>+					flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE);
> 				}
> 				return;
> 			}
>@@ -560,9 +562,11 @@
> 				switch(checkType & CONTEXT_MASK) {
> 					case FlowContext.IN_COMPARISON_NULL:
> 						scope.problemReporter().localVariableRedundantCheckOnNull(local, reference);
>+						flowInfo.initsWhenFalse().setReachMode(FlowInfo.UNREACHABLE);
> 						return;
> 					case FlowContext.IN_COMPARISON_NON_NULL:
> 						scope.problemReporter().localVariableNullComparedToNonNull(local, reference);
>+						flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE);
> 						return;
> 					case FlowContext.IN_ASSIGNMENT:
> 						scope.problemReporter().localVariableRedundantNullAssignment(local, reference);
>Index: compiler/org/eclipse/jdt/internal/compiler/flow/LoopingFlowContext.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/LoopingFlowContext.java,v
>retrieving revision 1.45
>diff -u -r1.45 LoopingFlowContext.java
>--- compiler/org/eclipse/jdt/internal/compiler/flow/LoopingFlowContext.java	19 Nov 2009 14:29:15 -0000	1.45
>+++ compiler/org/eclipse/jdt/internal/compiler/flow/LoopingFlowContext.java	23 Dec 2009 06:49:47 -0000
>@@ -396,14 +396,18 @@
> 			if (flowInfo.isDefinitelyNonNull(local)) {
> 				if (checkType == (CAN_ONLY_NULL_NON_NULL | IN_COMPARISON_NON_NULL)) {
> 					scope.problemReporter().localVariableRedundantCheckOnNonNull(local, reference);
>+					flowInfo.initsWhenFalse().setReachMode(FlowInfo.UNREACHABLE);
> 				} else {
> 					scope.problemReporter().localVariableNonNullComparedToNull(local, reference);
>+					flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE);
> 				}
> 			} else if (flowInfo.isDefinitelyNull(local)) {
> 				if (checkType == (CAN_ONLY_NULL_NON_NULL | IN_COMPARISON_NULL)) {
> 					scope.problemReporter().localVariableRedundantCheckOnNull(local, reference);
>+					flowInfo.initsWhenFalse().setReachMode(FlowInfo.UNREACHABLE);
> 				} else {
> 					scope.problemReporter().localVariableNullComparedToNonNull(local, reference);
>+					flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE);
> 				}
> 			} else if (this.upstreamNullFlowInfo.isDefinitelyNonNull(local) && !flowInfo.isPotentiallyNull(local)) {    // https://bugs.eclipse.org/bugs/show_bug.cgi?id=291418
> 				flowInfo.markAsDefinitelyNonNull(local);
>@@ -428,9 +432,11 @@
> 				switch(checkType & CONTEXT_MASK) {
> 					case FlowContext.IN_COMPARISON_NULL:
> 						scope.problemReporter().localVariableRedundantCheckOnNull(local, reference);
>+						flowInfo.initsWhenFalse().setReachMode(FlowInfo.UNREACHABLE);
> 						return;
> 					case FlowContext.IN_COMPARISON_NON_NULL:
> 						scope.problemReporter().localVariableNullComparedToNonNull(local, reference);
>+						flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE);
> 						return;
> 					case FlowContext.IN_ASSIGNMENT:
> 						scope.problemReporter().localVariableRedundantNullAssignment(local, reference);
>#P org.eclipse.jdt.core.tests
>Index: Eclipse Java Tests Compiler/org/eclipse/jdt/tests/compiler/regression/ConformTest.java
>===================================================================
>RCS file: /home/cvs/numbat/org.eclipse.jdt.core.tests/Eclipse Java Tests Compiler/org/eclipse/jdt/tests/compiler/regression/ConformTest.java,v
>retrieving revision 1.152
>diff -u -r1.152 ConformTest.java
>--- Eclipse Java Tests Compiler/org/eclipse/jdt/tests/compiler/regression/ConformTest.java	27 Jun 2008 16:02:01 -0000	1.152
>+++ Eclipse Java Tests Compiler/org/eclipse/jdt/tests/compiler/regression/ConformTest.java	23 Dec 2009 06:50:00 -0000
>@@ -6531,42 +6531,35 @@
> 			"    40  aload 5 [data]\n" +
> 			"    42  invokevirtual java.lang.StringBuffer.append(java.lang.Object) : java.lang.StringBuffer [27]\n" +
> 			"    45  pop\n" +
>-			"    46  goto 62\n" +
>+			"    46  goto 54\n" +
> 			"    49  astore 6 [e]\n" +
> 			"    51  aload 6 [e]\n" +
>-			"    53  ifnull 59\n" +
>-			"    56  aload 6 [e]\n" +
>-			"    58  athrow\n" +
>-			"    59  aconst_null\n" +
>-			"    60  astore_3 [buffer]\n" +
>-			"    61  return\n" +
>-			"    62  iload_1 [delete]\n" +
>-			"    63  ifeq 93\n" +
>-			"    66  aload_3 [buffer]\n" +
>-			"    67  iconst_0\n" +
>-			"    68  aload_3 [buffer]\n" +
>-			"    69  invokevirtual java.lang.StringBuffer.length() : int [31]\n" +
>-			"    72  invokevirtual java.lang.StringBuffer.delete(int, int) : java.lang.StringBuffer [35]\n" +
>-			"    75  pop\n" +
>-			"    76  goto 93\n" +
>-			"    79  astore 4\n" +
>-			"    81  aconst_null\n" +
>-			"    82  astore_3 [buffer]\n" +
>-			"    83  goto 95\n" +
>-			"    86  astore 7\n" +
>-			"    88  aconst_null\n" +
>-			"    89  astore_3 [buffer]\n" +
>-			"    90  aload 7\n" +
>-			"    92  athrow\n" +
>-			"    93  aconst_null\n" +
>-			"    94  astore_3 [buffer]\n" +
>-			"    95  return\n" +
>+			"    53  athrow\n" +
>+			"    54  iload_1 [delete]\n" +
>+			"    55  ifeq 85\n" +
>+			"    58  aload_3 [buffer]\n" +
>+			"    59  iconst_0\n" +
>+			"    60  aload_3 [buffer]\n" +
>+			"    61  invokevirtual java.lang.StringBuffer.length() : int [31]\n" +
>+			"    64  invokevirtual java.lang.StringBuffer.delete(int, int) : java.lang.StringBuffer [35]\n" +
>+			"    67  pop\n" +
>+			"    68  goto 85\n" +
>+			"    71  astore 4\n" +
>+			"    73  aconst_null\n" +
>+			"    74  astore_3 [buffer]\n" +
>+			"    75  goto 87\n" +
>+			"    78  astore 7\n" +
>+			"    80  aconst_null\n" +
>+			"    81  astore_3 [buffer]\n" +
>+			"    82  aload 7\n" +
>+			"    84  athrow\n" +
>+			"    85  aconst_null\n" +
>+			"    86  astore_3 [buffer]\n" +
>+			"    87  return\n" +
> 			"      Exception Table:\n" +
> 			"        [pc: 34, pc: 46] -> 49 when : java.lang.Exception\n" +
>-			"        [pc: 13, pc: 59] -> 79 when : java.lang.Exception\n" +
>-			"        [pc: 62, pc: 76] -> 79 when : java.lang.Exception\n" +
>-			"        [pc: 13, pc: 59] -> 86 when : any\n" +
>-			"        [pc: 62, pc: 81] -> 86 when : any\n" +
>+			"        [pc: 13, pc: 68] -> 71 when : java.lang.Exception\n" +
>+			"        [pc: 13, pc: 73] -> 78 when : any\n" +
> 			"      Line numbers:\n" +
> 			"        [pc: 0, line: 4]\n" +
> 			"        [pc: 5, line: 5]\n" +
>@@ -6574,29 +6567,24 @@
> 			"        [pc: 24, line: 10]\n" +
> 			"        [pc: 34, line: 12]\n" +
> 			"        [pc: 49, line: 13]\n" +
>-			"        [pc: 51, line: 14]\n" +
>-			"        [pc: 56, line: 15]\n" +
>-			"        [pc: 59, line: 24]\n" +
>-			"        [pc: 61, line: 16]\n" +
>-			"        [pc: 62, line: 19]\n" +
>-			"        [pc: 66, line: 20]\n" +
>-			"        [pc: 79, line: 22]\n" +
>-			"        [pc: 81, line: 24]\n" +
>-			"        [pc: 86, line: 23]\n" +
>-			"        [pc: 88, line: 24]\n" +
>-			"        [pc: 90, line: 25]\n" +
>-			"        [pc: 93, line: 24]\n" +
>-			"        [pc: 95, line: 26]\n" +
>+			"        [pc: 51, line: 15]\n" +
>+			"        [pc: 54, line: 19]\n" +
>+			"        [pc: 58, line: 20]\n" +
>+			"        [pc: 71, line: 22]\n" +
>+			"        [pc: 73, line: 24]\n" +
>+			"        [pc: 78, line: 23]\n" +
>+			"        [pc: 80, line: 24]\n" +
>+			"        [pc: 82, line: 25]\n" +
>+			"        [pc: 85, line: 24]\n" +
>+			"        [pc: 87, line: 26]\n" +
> 			"      Local variable table:\n" +
>-			"        [pc: 0, pc: 96] local: this index: 0 type: X\n" +
>-			"        [pc: 0, pc: 96] local: delete index: 1 type: boolean\n" +
>-			"        [pc: 5, pc: 96] local: s index: 2 type: java.lang.String\n" +
>-			"        [pc: 13, pc: 96] local: buffer index: 3 type: java.lang.StringBuffer\n" +
>-			"        [pc: 24, pc: 59] local: datas index: 4 type: java.lang.String[]\n" +
>-			"        [pc: 62, pc: 79] local: datas index: 4 type: java.lang.String[]\n" +
>-			"        [pc: 34, pc: 59] local: data index: 5 type: java.lang.Object[]\n" +
>-			"        [pc: 62, pc: 79] local: data index: 5 type: java.lang.Object[]\n" +
>-			"        [pc: 51, pc: 59] local: e index: 6 type: java.lang.Exception\n"
>+			"        [pc: 0, pc: 88] local: this index: 0 type: X\n" +
>+			"        [pc: 0, pc: 88] local: delete index: 1 type: boolean\n" +
>+			"        [pc: 5, pc: 88] local: s index: 2 type: java.lang.String\n" +
>+			"        [pc: 13, pc: 88] local: buffer index: 3 type: java.lang.StringBuffer\n" +
>+			"        [pc: 24, pc: 71] local: datas index: 4 type: java.lang.String[]\n" +
>+			"        [pc: 34, pc: 71] local: data index: 5 type: java.lang.Object[]\n" +
>+			"        [pc: 51, pc: 54] local: e index: 6 type: java.lang.Exception\n"
> 		:	"  // Method descriptor #15 (Z)V\n" +
> 			"  // Stack: 4, Locals: 8\n" +
> 			"  private void foo(boolean delete);\n" +
>@@ -6627,42 +6615,35 @@
> 			"    40  aload 5 [data]\n" +
> 			"    42  invokevirtual java.lang.StringBuffer.append(java.lang.Object) : java.lang.StringBuffer [27]\n" +
> 			"    45  pop\n" +
>-			"    46  goto 62\n" +
>+			"    46  goto 54\n" +
> 			"    49  astore 6 [e]\n" +
> 			"    51  aload 6 [e]\n" +
>-			"    53  ifnull 59\n" +
>-			"    56  aload 6 [e]\n" +
>-			"    58  athrow\n" +
>-			"    59  aconst_null\n" +
>-			"    60  astore_3 [buffer]\n" +
>-			"    61  return\n" +
>-			"    62  iload_1 [delete]\n" +
>-			"    63  ifeq 93\n" +
>-			"    66  aload_3 [buffer]\n" +
>-			"    67  iconst_0\n" +
>-			"    68  aload_3 [buffer]\n" +
>-			"    69  invokevirtual java.lang.StringBuffer.length() : int [31]\n" +
>-			"    72  invokevirtual java.lang.StringBuffer.delete(int, int) : java.lang.StringBuffer [35]\n" +
>-			"    75  pop\n" +
>-			"    76  goto 93\n" +
>-			"    79  astore 4\n" +
>-			"    81  aconst_null\n" +
>-			"    82  astore_3 [buffer]\n" +
>-			"    83  goto 95\n" +
>-			"    86  astore 7\n" +
>-			"    88  aconst_null\n" +
>-			"    89  astore_3 [buffer]\n" +
>-			"    90  aload 7\n" +
>-			"    92  athrow\n" +
>-			"    93  aconst_null\n" +
>-			"    94  astore_3 [buffer]\n" +
>-			"    95  return\n" +
>+			"    53  athrow\n" +
>+			"    54  iload_1 [delete]\n" +
>+			"    55  ifeq 85\n" +
>+			"    58  aload_3 [buffer]\n" +
>+			"    59  iconst_0\n" +
>+			"    60  aload_3 [buffer]\n" +
>+			"    61  invokevirtual java.lang.StringBuffer.length() : int [31]\n" +
>+			"    64  invokevirtual java.lang.StringBuffer.delete(int, int) : java.lang.StringBuffer [35]\n" +
>+			"    67  pop\n" +
>+			"    68  goto 85\n" +
>+			"    71  astore 4\n" +
>+			"    73  aconst_null\n" +
>+			"    74  astore_3 [buffer]\n" +
>+			"    75  goto 87\n" +
>+			"    78  astore 7\n" +
>+			"    80  aconst_null\n" +
>+			"    81  astore_3 [buffer]\n" + 
>+			"    82  aload 7\n" +
>+			"    84  athrow\n" +
>+			"    85  aconst_null\n" +
>+			"    86  astore_3 [buffer]\n" +
>+			"    87  return\n" +
> 			"      Exception Table:\n" +
> 			"        [pc: 34, pc: 46] -> 49 when : java.lang.Exception\n" +
>-			"        [pc: 13, pc: 59] -> 79 when : java.lang.Exception\n" +
>-			"        [pc: 62, pc: 76] -> 79 when : java.lang.Exception\n" +
>-			"        [pc: 13, pc: 59] -> 86 when : any\n" +
>-			"        [pc: 62, pc: 81] -> 86 when : any\n" +
>+			"        [pc: 13, pc: 68] -> 71 when : java.lang.Exception\n" +
>+			"        [pc: 13, pc: 73] -> 78 when : any\n" +
> 			"      Line numbers:\n" +
> 			"        [pc: 0, line: 4]\n" +
> 			"        [pc: 5, line: 5]\n" +
>@@ -6670,36 +6651,32 @@
> 			"        [pc: 24, line: 10]\n" +
> 			"        [pc: 34, line: 12]\n" +
> 			"        [pc: 49, line: 13]\n" +
>-			"        [pc: 51, line: 14]\n" +
>-			"        [pc: 56, line: 15]\n" +
>-			"        [pc: 59, line: 24]\n" +
>-			"        [pc: 61, line: 16]\n" +
>-			"        [pc: 62, line: 19]\n" +
>-			"        [pc: 66, line: 20]\n" +
>-			"        [pc: 79, line: 22]\n" +
>-			"        [pc: 81, line: 24]\n" +
>-			"        [pc: 86, line: 23]\n" +
>-			"        [pc: 88, line: 24]\n" +
>-			"        [pc: 90, line: 25]\n" +
>-			"        [pc: 93, line: 24]\n" +
>-			"        [pc: 95, line: 26]\n" +
>+			"        [pc: 51, line: 15]\n" +
>+			"        [pc: 54, line: 19]\n" +
>+			"        [pc: 58, line: 20]\n" +
>+			"        [pc: 71, line: 22]\n" +
>+			"        [pc: 73, line: 24]\n" +
>+			"        [pc: 78, line: 23]\n" +
>+			"        [pc: 80, line: 24]\n" +
>+			"        [pc: 82, line: 25]\n" +
>+			"        [pc: 85, line: 24]\n" +
>+			"        [pc: 87, line: 26]\n" +
> 			"      Local variable table:\n" +
>-			"        [pc: 0, pc: 96] local: this index: 0 type: X\n" +
>-			"        [pc: 0, pc: 96] local: delete index: 1 type: boolean\n" +
>-			"        [pc: 5, pc: 96] local: s index: 2 type: java.lang.String\n" +
>-			"        [pc: 13, pc: 96] local: buffer index: 3 type: java.lang.StringBuffer\n" +
>-			"        [pc: 24, pc: 79] local: datas index: 4 type: java.lang.String[]\n" +
>-			"        [pc: 34, pc: 79] local: data index: 5 type: java.lang.Object[]\n" +
>-			"        [pc: 51, pc: 62] local: e index: 6 type: java.lang.Exception\n" +
>-			"      Stack map table: number of frames 8\n" +
>+			"        [pc: 0, pc: 88] local: this index: 0 type: X\n" +
>+			"        [pc: 0, pc: 88] local: delete index: 1 type: boolean\n" +
>+			"        [pc: 5, pc: 88] local: s index: 2 type: java.lang.String\n" +
>+			"        [pc: 13, pc: 88] local: buffer index: 3 type: java.lang.StringBuffer\n" +
>+			"        [pc: 24, pc: 71] local: datas index: 4 type: java.lang.String[]\n" +
>+			"        [pc: 34, pc: 71] local: data index: 5 type: java.lang.Object[]\n" +
>+			"        [pc: 51, pc: 54] local: e index: 6 type: java.lang.Exception\n" +
>+			"      Stack map table: number of frames 7\n" +
> 			"        [pc: 49, full, stack: {java.lang.Exception}, locals: {X, int, java.lang.String, java.lang.StringBuffer, java.lang.String[], java.lang.Object[]}]\n" +
>-			"        [pc: 59, append: {java.lang.Exception}]\n" +
>-			"        [pc: 62, chop 1 local(s)]\n" +
>-			"        [pc: 76, same]\n" +
>-			"        [pc: 79, full, stack: {java.lang.Exception}, locals: {X, int, java.lang.String, java.lang.StringBuffer}]\n" +
>-			"        [pc: 86, same_locals_1_stack_item, stack: {java.lang.Throwable}]\n" +
>-			"        [pc: 93, same]\n" +
>-			"        [pc: 95, same]\n";
>+			"        [pc: 54, same]\n" +
>+			"        [pc: 68, same]\n" +
>+			"        [pc: 71, full, stack: {java.lang.Exception}, locals: {X, int, java.lang.String, java.lang.StringBuffer}]\n" +
>+			"        [pc: 78, same_locals_1_stack_item, stack: {java.lang.Throwable}]\n" +
>+			"        [pc: 85, same]\n" +
>+			"        [pc: 87, same]\n";
> 
> 	File f = new File(OUTPUT_DIR + File.separator + "X.class");
> 	byte[] classFileBytes = org.eclipse.jdt.internal.compiler.util.Util.getFileByteContent(f);
>Index: Eclipse Java Tests Compiler/org/eclipse/jdt/tests/compiler/regression/InitializationTest.java
>===================================================================
>RCS file: /home/cvs/numbat/org.eclipse.jdt.core.tests/Eclipse Java Tests Compiler/org/eclipse/jdt/tests/compiler/regression/InitializationTest.java,v
>retrieving revision 1.126
>diff -u -r1.126 InitializationTest.java
>--- Eclipse Java Tests Compiler/org/eclipse/jdt/tests/compiler/regression/InitializationTest.java	17 Aug 2009 17:45:39 -0000	1.126
>+++ Eclipse Java Tests Compiler/org/eclipse/jdt/tests/compiler/regression/InitializationTest.java	23 Dec 2009 06:50:04 -0000
>@@ -4890,7 +4890,7 @@
> 
> // 45357
> public void test169() {
>-	this.runConformTest(
>+	this.runNegativeTest(
> 		new String[] {
> 			"X.java",
> 			"public class X {\n" +
>@@ -4921,7 +4921,15 @@
> 			"	}\n" +
> 			"}",
> 		},
>-		"SUCCESS");
>+		"----------\n" +
>+		"1. WARNING in X.java (at line 18)\n" +
>+		"	if (obj != null) {\n" +
>+		"			result = null;\n" +
>+		"			foo(); \n" +
>+		"		} else {\n" +
>+		"	                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" +
>+		"Dead code\n" +
>+		"----------\n");
> }
> 
> // 45433
>Index: Eclipse Java Tests Compiler/org/eclipse/jdt/tests/compiler/regression/NegativeTest.java
>===================================================================
>RCS file: /home/cvs/numbat/org.eclipse.jdt.core.tests/Eclipse Java Tests Compiler/org/eclipse/jdt/tests/compiler/regression/NegativeTest.java,v
>retrieving revision 1.328
>diff -u -r1.328 NegativeTest.java
>--- Eclipse Java Tests Compiler/org/eclipse/jdt/tests/compiler/regression/NegativeTest.java	17 Aug 2009 17:45:39 -0000	1.328
>+++ Eclipse Java Tests Compiler/org/eclipse/jdt/tests/compiler/regression/NegativeTest.java	23 Dec 2009 06:50:26 -0000
>@@ -9622,6 +9622,11 @@
> 		"	fireTableCellUpdated();\n" + 
> 		"	^^^^^^^^^^^^^^^^^^^^\n" + 
> 		"Cannot refer to an instance method while explicitly invoking a constructor\n" + 
>+		"----------\n" +
>+		"4. WARNING in p\\d\\One.java (at line 40)\n" +
>+		"	if (m == null) return;\n" +
>+		"	               ^^^^^^^\n" +
>+		"Dead code\n" +
> 		"----------\n");
> }
> public void test236() {
>#P org.eclipse.jdt.core.tests.compiler
>Index: src/org/eclipse/jdt/core/tests/compiler/regression/AssignmentTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AssignmentTest.java,v
>retrieving revision 1.62
>diff -u -r1.62 AssignmentTest.java
>--- src/org/eclipse/jdt/core/tests/compiler/regression/AssignmentTest.java	6 Oct 2009 13:18:00 -0000	1.62
>+++ src/org/eclipse/jdt/core/tests/compiler/regression/AssignmentTest.java	23 Dec 2009 06:50:40 -0000
>@@ -356,7 +356,14 @@
> 		"	   ^\n" +
> 		"Null comparison always yields false: The variable a can only be null at this location\n" +
> 		"----------\n" +
>-		"3. ERROR in X.java (at line 13)\n" +
>+		"3. WARNING in X.java (at line 10)\n" +
>+		"	{\n" +
>+		"		   b=\"World!\";\n" +
>+		"		}\n" +
>+		"	^^^^^^^^^^^^^^^^^^^^^^\n" +
>+		"Dead code\n" +
>+		"----------\n" +
>+		"4. ERROR in X.java (at line 13)\n" +
> 		"	System.out.println(a+b);\n" +
> 		"	                     ^\n" +
> 		"The local variable b may not have been initialized\n" +
>Index: src/org/eclipse/jdt/core/tests/compiler/regression/BooleanTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/BooleanTest.java,v
>retrieving revision 1.17
>diff -u -r1.17 BooleanTest.java
>--- src/org/eclipse/jdt/core/tests/compiler/regression/BooleanTest.java	27 Jun 2008 16:04:44 -0000	1.17
>+++ src/org/eclipse/jdt/core/tests/compiler/regression/BooleanTest.java	23 Dec 2009 06:50:46 -0000
>@@ -2266,20 +2266,17 @@
> 		"  X(boolean b1);\n" +
> 		"     0  aload_0 [this]\n" +
> 		"     1  invokespecial java.lang.Object() [8]\n" +
>-		"     4  iload_1 [b1]\n" +
>-		"     5  ifeq 8\n" +
>-		"     8  getstatic java.lang.System.out : java.io.PrintStream [11]\n" +
>-		"    11  iload_1 [b1]\n" +
>-		"    12  invokevirtual java.io.PrintStream.println(boolean) : void [17]\n" +
>-		"    15  return\n" +
>+		"     4  getstatic java.lang.System.out : java.io.PrintStream [11]\n" +
>+		"     7  iload_1 [b1]\n" +
>+		"     8  invokevirtual java.io.PrintStream.println(boolean) : void [17]\n" +
>+		"    11  return\n" +
> 		"      Line numbers:\n" +
> 		"        [pc: 0, line: 2]\n" +
>-		"        [pc: 4, line: 4]\n" +
>-		"        [pc: 8, line: 5]\n" +
>-		"        [pc: 15, line: 7]\n" +
>+		"        [pc: 4, line: 5]\n" +
>+		"        [pc: 11, line: 7]\n" +
> 		"      Local variable table:\n" +
>-		"        [pc: 0, pc: 16] local: this index: 0 type: X\n" +
>-		"        [pc: 0, pc: 16] local: b1 index: 1 type: boolean\n";
>+		"        [pc: 0, pc: 12] local: this index: 0 type: X\n" +
>+		"        [pc: 0, pc: 12] local: b1 index: 1 type: boolean\n";
> 
> 	File f = new File(OUTPUT_DIR + File.separator + "X.class");
> 	byte[] classFileBytes = org.eclipse.jdt.internal.compiler.util.Util.getFileByteContent(f);
>@@ -2362,21 +2359,19 @@
> 		"     0  aload_0 [this]\n" +
> 		"     1  invokespecial java.lang.Object() [8]\n" +
> 		"     4  iload_1 [b1]\n" +
>-		"     5  ifeq 12\n" +
>-		"     8  iload_1 [b1]\n" +
>-		"     9  ifeq 12\n" +
>-		"    12  getstatic java.lang.System.out : java.io.PrintStream [11]\n" +
>-		"    15  iload_1 [b1]\n" +
>-		"    16  invokevirtual java.io.PrintStream.println(boolean) : void [17]\n" +
>-		"    19  return\n" +
>+		"     5  ifeq 8\n" +
>+		"     8  getstatic java.lang.System.out : java.io.PrintStream [11]\n" +
>+		"    11  iload_1 [b1]\n" +
>+		"    12  invokevirtual java.io.PrintStream.println(boolean) : void [17]\n" +
>+		"    15  return\n" +
> 		"      Line numbers:\n" +
> 		"        [pc: 0, line: 2]\n" +
> 		"        [pc: 4, line: 4]\n" +
>-		"        [pc: 12, line: 5]\n" +
>-		"        [pc: 19, line: 7]\n" +
>+		"        [pc: 8, line: 5]\n" +
>+		"        [pc: 15, line: 7]\n" +
> 		"      Local variable table:\n" +
>-		"        [pc: 0, pc: 20] local: this index: 0 type: X\n" +
>-		"        [pc: 0, pc: 20] local: b1 index: 1 type: boolean\n";
>+		"        [pc: 0, pc: 16] local: this index: 0 type: X\n" +
>+		"        [pc: 0, pc: 16] local: b1 index: 1 type: boolean\n";
> 
> 	File f = new File(OUTPUT_DIR + File.separator + "X.class");
> 	byte[] classFileBytes = org.eclipse.jdt.internal.compiler.util.Util.getFileByteContent(f);
>Index: src/org/eclipse/jdt/core/tests/compiler/regression/ClassFileReaderTest_1_4.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/ClassFileReaderTest_1_4.java,v
>retrieving revision 1.15
>diff -u -r1.15 ClassFileReaderTest_1_4.java
>--- src/org/eclipse/jdt/core/tests/compiler/regression/ClassFileReaderTest_1_4.java	27 Jun 2008 16:04:45 -0000	1.15
>+++ src/org/eclipse/jdt/core/tests/compiler/regression/ClassFileReaderTest_1_4.java	23 Dec 2009 06:50:49 -0000
>@@ -385,21 +385,17 @@
> 			"  public static void main(java.lang.String[] args);\n" +
> 			"     0  bipush 6\n" +
> 			"     2  istore_1 [i]\n" +
>-			"     3  iload_1 [i]\n" +
>-			"     4  bipush 6\n" +
>-			"     6  if_icmpeq 9\n" +
>-			"     9  getstatic java.lang.System.out : java.io.PrintStream [16]\n" +
>-			"    12  iload_1 [i]\n" +
>-			"    13  invokevirtual java.io.PrintStream.println(int) : void [22]\n" +
>-			"    16  return\n" +
>+			"     3  getstatic java.lang.System.out : java.io.PrintStream [16]\n" +
>+			"     6  iload_1 [i]\n" +
>+			"     7  invokevirtual java.io.PrintStream.println(int) : void [22]\n" +
>+			"    10  return\n" +
> 			"      Line numbers:\n" +
> 			"        [pc: 0, line: 3]\n" +
>-			"        [pc: 3, line: 4]\n" +
>-			"        [pc: 9, line: 6]\n" +
>-			"        [pc: 16, line: 8]\n" +
>+			"        [pc: 3, line: 6]\n" +
>+			"        [pc: 10, line: 8]\n" +
> 			"      Local variable table:\n" +
>-			"        [pc: 0, pc: 17] local: args index: 0 type: java.lang.String[]\n" +
>-			"        [pc: 3, pc: 17] local: i index: 1 type: int\n";
>+			"        [pc: 0, pc: 11] local: args index: 0 type: java.lang.String[]\n" +
>+			"        [pc: 3, pc: 11] local: i index: 1 type: int\n";
> 		checkClassFile("A", source, expectedOutput);
> 	}
> 
>@@ -1950,20 +1946,16 @@
> 			"  static void foo();\n" +
> 			"     0  iconst_5\n" +
> 			"     1  istore_0 [i]\n" +
>-			"     2  iload_0 [i]\n" +
>-			"     3  bipush 6\n" +
>-			"     5  if_icmpne 8\n" +
>-			"     8  getstatic java.lang.System.out : java.io.PrintStream [21]\n" +
>-			"    11  iload_0 [i]\n" +
>-			"    12  invokevirtual java.io.PrintStream.println(int) : void [27]\n" +
>-			"    15  return\n" +
>+			"     2  getstatic java.lang.System.out : java.io.PrintStream [21]\n" +
>+			"     5  iload_0 [i]\n" +
>+			"     6  invokevirtual java.io.PrintStream.println(int) : void [27]\n" +
>+			"     9  return\n" +
> 			"      Line numbers:\n" +
> 			"        [pc: 0, line: 6]\n" +
>-			"        [pc: 2, line: 7]\n" +
>-			"        [pc: 8, line: 9]\n" +
>-			"        [pc: 15, line: 11]\n" +
>+			"        [pc: 2, line: 9]\n" +
>+			"        [pc: 9, line: 11]\n" +
> 			"      Local variable table:\n" +
>-			"        [pc: 2, pc: 16] local: i index: 0 type: int\n";
>+			"        [pc: 2, pc: 10] local: i index: 0 type: int\n";
> 		checkClassFile("X", source, expectedOutput);
> 	}
> 
>@@ -2015,20 +2007,16 @@
> 			"  static void bar();\n" +
> 			"     0  bipush 6\n" +
> 			"     2  istore_0 [i]\n" +
>-			"     3  iload_0 [i]\n" +
>-			"     4  bipush 6\n" +
>-			"     6  if_icmpeq 9\n" +
>-			"     9  getstatic java.lang.System.out : java.io.PrintStream [21]\n" +
>-			"    12  iload_0 [i]\n" +
>-			"    13  invokevirtual java.io.PrintStream.println(int) : void [27]\n" +
>-			"    16  return\n" +
>+			"     3  getstatic java.lang.System.out : java.io.PrintStream [21]\n" +
>+			"     6  iload_0 [i]\n" +
>+			"     7  invokevirtual java.io.PrintStream.println(int) : void [27]\n" +
>+			"    10  return\n" +
> 			"      Line numbers:\n" +
> 			"        [pc: 0, line: 6]\n" +
>-			"        [pc: 3, line: 7]\n" +
>-			"        [pc: 9, line: 8]\n" +
>-			"        [pc: 16, line: 10]\n" +
>+			"        [pc: 3, line: 8]\n" +
>+			"        [pc: 10, line: 10]\n" +
> 			"      Local variable table:\n" +
>-			"        [pc: 3, pc: 17] local: i index: 0 type: int\n";
>+			"        [pc: 3, pc: 11] local: i index: 0 type: int\n";
> 		checkClassFile("X", source, expectedOutput);
> 	}
> 
>@@ -2094,20 +2082,20 @@
> 			"     1  istore_0 [i]\n" +
> 			"     2  iload_0 [i]\n" +
> 			"     3  bipush 6\n" +
>-			"     5  if_icmpne 14\n" +
>+			"     5  if_icmpne 12\n" +
> 			"     8  invokestatic X.boom() : boolean [26]\n" +
>-			"    11  ifeq 14\n" +
>-			"    14  getstatic java.lang.System.out : java.io.PrintStream [28]\n" +
>-			"    17  iload_0 [i]\n" +
>-			"    18  invokevirtual java.io.PrintStream.println(int) : void [34]\n" +
>-			"    21  return\n" +
>+			"    11  pop\n" +
>+			"    12  getstatic java.lang.System.out : java.io.PrintStream [28]\n" +
>+			"    15  iload_0 [i]\n" +
>+			"    16  invokevirtual java.io.PrintStream.println(int) : void [34]\n" +
>+			"    19  return\n" +
> 			"      Line numbers:\n" +
> 			"        [pc: 0, line: 9]\n" +
> 			"        [pc: 2, line: 10]\n" +
>-			"        [pc: 14, line: 12]\n" +
>-			"        [pc: 21, line: 14]\n" +
>+			"        [pc: 12, line: 12]\n" +
>+			"        [pc: 19, line: 14]\n" +
> 			"      Local variable table:\n" +
>-			"        [pc: 2, pc: 22] local: i index: 0 type: int\n";
>+			"        [pc: 2, pc: 20] local: i index: 0 type: int\n";
> 		checkClassFile("X", source, expectedOutput);
> 	}
> 
>@@ -2173,20 +2161,20 @@
> 			"     2  istore_0 [i]\n" +
> 			"     3  iload_0 [i]\n" +
> 			"     4  bipush 6\n" +
>-			"     6  if_icmpeq 15\n" +
>+			"     6  if_icmpeq 13\n" +
> 			"     9  invokestatic X.boom() : boolean [26]\n" +
>-			"    12  ifne 15\n" +
>-			"    15  getstatic java.lang.System.out : java.io.PrintStream [28]\n" +
>-			"    18  iload_0 [i]\n" +
>-			"    19  invokevirtual java.io.PrintStream.println(int) : void [34]\n" +
>-			"    22  return\n" +
>+			"    12  pop\n" +
>+			"    13  getstatic java.lang.System.out : java.io.PrintStream [28]\n" +
>+			"    16  iload_0 [i]\n" +
>+			"    17  invokevirtual java.io.PrintStream.println(int) : void [34]\n" +
>+			"    20  return\n" +
> 			"      Line numbers:\n" +
> 			"        [pc: 0, line: 9]\n" +
> 			"        [pc: 3, line: 10]\n" +
>-			"        [pc: 15, line: 11]\n" +
>-			"        [pc: 22, line: 13]\n" +
>+			"        [pc: 13, line: 11]\n" +
>+			"        [pc: 20, line: 13]\n" +
> 			"      Local variable table:\n" +
>-			"        [pc: 3, pc: 23] local: i index: 0 type: int\n";
>+			"        [pc: 3, pc: 21] local: i index: 0 type: int\n";
> 		checkClassFile("X", source, expectedOutput);
> 	}
> 
>@@ -2508,20 +2496,20 @@
> 			"     1  istore_0 [i]\n" +
> 			"     2  iload_0 [i]\n" +
> 			"     3  bipush 6\n" +
>-			"     5  if_icmpne 14\n" +
>+			"     5  if_icmpne 12\n" +
> 			"     8  invokestatic X.boom() : boolean [26]\n" +
>-			"    11  ifeq 14\n" +
>-			"    14  getstatic java.lang.System.out : java.io.PrintStream [28]\n" +
>-			"    17  iload_0 [i]\n" +
>-			"    18  invokevirtual java.io.PrintStream.println(int) : void [34]\n" +
>-			"    21  return\n" +
>+			"    11  pop\n" +
>+			"    12  getstatic java.lang.System.out : java.io.PrintStream [28]\n" +
>+			"    15  iload_0 [i]\n" +
>+			"    16  invokevirtual java.io.PrintStream.println(int) : void [34]\n" +
>+			"    19  return\n" +
> 			"      Line numbers:\n" +
> 			"        [pc: 0, line: 9]\n" +
> 			"        [pc: 2, line: 10]\n" +
>-			"        [pc: 14, line: 12]\n" +
>-			"        [pc: 21, line: 14]\n" +
>+			"        [pc: 12, line: 12]\n" +
>+			"        [pc: 19, line: 14]\n" +
> 			"      Local variable table:\n" +
>-			"        [pc: 2, pc: 22] local: i index: 0 type: int\n";
>+			"        [pc: 2, pc: 20] local: i index: 0 type: int\n";
> 		checkClassFile("X", source, expectedOutput);
> 	}
> 
>@@ -2587,20 +2575,20 @@
> 			"     2  istore_0 [i]\n" +
> 			"     3  iload_0 [i]\n" +
> 			"     4  bipush 6\n" +
>-			"     6  if_icmpeq 15\n" +
>+			"     6  if_icmpeq 13\n" +
> 			"     9  invokestatic X.boom() : boolean [26]\n" +
>-			"    12  ifne 15\n" +
>-			"    15  getstatic java.lang.System.out : java.io.PrintStream [28]\n" +
>-			"    18  iload_0 [i]\n" +
>-			"    19  invokevirtual java.io.PrintStream.println(int) : void [34]\n" +
>-			"    22  return\n" +
>+			"    12  pop\n" +
>+			"    13  getstatic java.lang.System.out : java.io.PrintStream [28]\n" +
>+			"    16  iload_0 [i]\n" +
>+			"    17  invokevirtual java.io.PrintStream.println(int) : void [34]\n" +
>+			"    20  return\n" +
> 			"      Line numbers:\n" +
> 			"        [pc: 0, line: 9]\n" +
> 			"        [pc: 3, line: 10]\n" +
>-			"        [pc: 15, line: 11]\n" +
>-			"        [pc: 22, line: 13]\n" +
>+			"        [pc: 13, line: 11]\n" +
>+			"        [pc: 20, line: 13]\n" +
> 			"      Local variable table:\n" +
>-			"        [pc: 3, pc: 23] local: i index: 0 type: int\n";
>+			"        [pc: 3, pc: 21] local: i index: 0 type: int\n";
> 		checkClassFile("X", source, expectedOutput);
> 	}
> 
>Index: src/org/eclipse/jdt/core/tests/compiler/regression/ConstantTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/ConstantTest.java,v
>retrieving revision 1.30
>diff -u -r1.30 ConstantTest.java
>--- src/org/eclipse/jdt/core/tests/compiler/regression/ConstantTest.java	27 Jun 2008 16:04:44 -0000	1.30
>+++ src/org/eclipse/jdt/core/tests/compiler/regression/ConstantTest.java	23 Dec 2009 06:50:54 -0000
>@@ -382,17 +382,15 @@
> 		"    66  invokevirtual java.io.PrintStream.print(java.lang.String) : void [24]\n" +
> 		"    69  aconst_null\n" +
> 		"    70  astore_2 [s]\n" +
>-		"    71  aload_2 [s]\n" +
>-		"    72  ifnonnull 83\n" +
>-		"    75  getstatic java.lang.System.out : java.io.PrintStream [16]\n" +
>-		"    78  ldc <String \"4\"> [55]\n" +
>-		"    80  invokevirtual java.io.PrintStream.print(java.lang.String) : void [24]\n" +
>-		"    83  ldc <String \"aaa\"> [57]\n" +
>-		"    85  astore_3 [s2]\n" +
>-		"    86  getstatic java.lang.System.out : java.io.PrintStream [16]\n" +
>-		"    89  ldc <String \"5\"> [59]\n" +
>-		"    91  invokevirtual java.io.PrintStream.println(java.lang.String) : void [61]\n" +
>-		"    94  return\n" +
>+		"    71  getstatic java.lang.System.out : java.io.PrintStream [16]\n" +
>+		"    74  ldc <String \"4\"> [55]\n" +
>+		"    76  invokevirtual java.io.PrintStream.print(java.lang.String) : void [24]\n" +
>+		"    79  ldc <String \"aaa\"> [57]\n" +
>+		"    81  astore_3 [s2]\n" +
>+		"    82  getstatic java.lang.System.out : java.io.PrintStream [16]\n" +
>+		"    85  ldc <String \"5\"> [59]\n" +
>+		"    87  invokevirtual java.io.PrintStream.println(java.lang.String) : void [61]\n" +
>+		"    90  return\n" +
> 		"      Line numbers:\n" +
> 		"        [pc: 0, line: 3]\n" +
> 		"        [pc: 8, line: 4]\n" +
>@@ -401,14 +399,14 @@
> 		"        [pc: 61, line: 7]\n" +
> 		"        [pc: 69, line: 8]\n" +
> 		"        [pc: 71, line: 9]\n" +
>-		"        [pc: 83, line: 10]\n" +
>-		"        [pc: 86, line: 11]\n" +
>-		"        [pc: 94, line: 12]\n" +
>-		"      Local variable table:\n" +
>-		"        [pc: 0, pc: 95] local: args index: 0 type: java.lang.String[]\n" +
>-		"        [pc: 61, pc: 95] local: b index: 1 type: boolean\n" +
>-		"        [pc: 71, pc: 95] local: s index: 2 type: java.lang.String\n" +
>-		"        [pc: 86, pc: 95] local: s2 index: 3 type: java.lang.String\n";
>+		"        [pc: 79, line: 10]\n" +
>+		"        [pc: 82, line: 11]\n" +
>+		"        [pc: 90, line: 12]\n" +
>+		"      Local variable table:\n" +
>+		"        [pc: 0, pc: 91] local: args index: 0 type: java.lang.String[]\n" +
>+		"        [pc: 61, pc: 91] local: b index: 1 type: boolean\n" +
>+		"        [pc: 71, pc: 91] local: s index: 2 type: java.lang.String\n" +
>+		"        [pc: 82, pc: 91] local: s2 index: 3 type: java.lang.String\n";
> 
> 	String expectedOutput15 =
> 		"  // Method descriptor #15 ([Ljava/lang/String;)V\n" +
>@@ -447,17 +445,15 @@
> 		"    66  invokevirtual java.io.PrintStream.print(java.lang.String) : void [24]\n" +
> 		"    69  aconst_null\n" +
> 		"    70  astore_2 [s]\n" +
>-		"    71  aload_2 [s]\n" +
>-		"    72  ifnonnull 83\n" +
>-		"    75  getstatic java.lang.System.out : java.io.PrintStream [16]\n" +
>-		"    78  ldc <String \"4\"> [55]\n" +
>-		"    80  invokevirtual java.io.PrintStream.print(java.lang.String) : void [24]\n" +
>-		"    83  ldc <String \"aaa\"> [57]\n" +
>-		"    85  astore_3 [s2]\n" +
>-		"    86  getstatic java.lang.System.out : java.io.PrintStream [16]\n" +
>-		"    89  ldc <String \"5\"> [59]\n" +
>-		"    91  invokevirtual java.io.PrintStream.println(java.lang.String) : void [61]\n" +
>-		"    94  return\n" +
>+		"    71  getstatic java.lang.System.out : java.io.PrintStream [16]\n" +
>+		"    74  ldc <String \"4\"> [55]\n" +
>+		"    76  invokevirtual java.io.PrintStream.print(java.lang.String) : void [24]\n" +
>+		"    79  ldc <String \"aaa\"> [57]\n" +
>+		"    81  astore_3 [s2]\n" +
>+		"    82  getstatic java.lang.System.out : java.io.PrintStream [16]\n" +
>+		"    85  ldc <String \"5\"> [59]\n" +
>+		"    87  invokevirtual java.io.PrintStream.println(java.lang.String) : void [61]\n" +
>+		"    90  return\n" +
> 		"      Line numbers:\n" +
> 		"        [pc: 0, line: 3]\n" +
> 		"        [pc: 8, line: 4]\n" +
>@@ -466,14 +462,14 @@
> 		"        [pc: 61, line: 7]\n" +
> 		"        [pc: 69, line: 8]\n" +
> 		"        [pc: 71, line: 9]\n" +
>-		"        [pc: 83, line: 10]\n" +
>-		"        [pc: 86, line: 11]\n" +
>-		"        [pc: 94, line: 12]\n" +
>-		"      Local variable table:\n" +
>-		"        [pc: 0, pc: 95] local: args index: 0 type: java.lang.String[]\n" +
>-		"        [pc: 61, pc: 95] local: b index: 1 type: boolean\n" +
>-		"        [pc: 71, pc: 95] local: s index: 2 type: java.lang.String\n" +
>-		"        [pc: 86, pc: 95] local: s2 index: 3 type: java.lang.String\n";
>+		"        [pc: 79, line: 10]\n" +
>+		"        [pc: 82, line: 11]\n" +
>+		"        [pc: 90, line: 12]\n" +
>+		"      Local variable table:\n" +
>+		"        [pc: 0, pc: 91] local: args index: 0 type: java.lang.String[]\n" +
>+		"        [pc: 61, pc: 91] local: b index: 1 type: boolean\n" +
>+		"        [pc: 71, pc: 91] local: s index: 2 type: java.lang.String\n" +
>+		"        [pc: 82, pc: 91] local: s2 index: 3 type: java.lang.String\n";
> 
> 	if (this.complianceLevel >= ClassFileConstants.JDK1_5) {
> 		int index = actualOutput.indexOf(expectedOutput15);
>Index: src/org/eclipse/jdt/core/tests/compiler/regression/NullReferenceTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullReferenceTest.java,v
>retrieving revision 1.83
>diff -u -r1.83 NullReferenceTest.java
>--- src/org/eclipse/jdt/core/tests/compiler/regression/NullReferenceTest.java	19 Nov 2009 15:57:22 -0000	1.83
>+++ src/org/eclipse/jdt/core/tests/compiler/regression/NullReferenceTest.java	23 Dec 2009 06:51:08 -0000
>@@ -178,6 +178,11 @@
> 		"	if (o != null) { /* */ }\n" +
> 		"	    ^\n" +
> 		"Null comparison always yields false: The variable o can only be null at this location\n" +
>+		"----------\n" +
>+		"2. WARNING in X.java (at line 4)\n" + 
>+		"	if (o != null) { /* */ }\n" + 
>+		"	               ^^^^^^^^^\n" + 
>+		"Dead code\n" + 
> 		"----------\n",
> 	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
> }
>@@ -849,6 +854,11 @@
> 			"	if (i == null) {};\n" +
> 			"	    ^\n" +
> 			"Null comparison always yields false: The variable i cannot be null at this location\n" +
>+			"----------\n" +
>+			"2. WARNING in X.java (at line 4)\n" + 
>+			"	if (i == null) {};\n" + 
>+			"	               ^^\n" + 
>+			"Dead code\n" + 
> 			"----------\n",
> 		    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
> 	}
>@@ -911,6 +921,11 @@
> 			"	if (i == null) {}\n" +
> 			"	    ^\n" +
> 			"Null comparison always yields false: The variable i cannot be null at this location\n" +
>+			"----------\n" +
>+			"2. WARNING in X.java (at line 4)\n" + 
>+			"	if (i == null) {}\n" + 
>+			"	               ^^\n" + 
>+			"Dead code\n" + 
> 			"----------\n",
> 		    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
> 	}
>@@ -996,6 +1011,11 @@
> 		"	if (o == null) {};\n" +
> 		"	    ^\n" +
> 		"Null comparison always yields false: The variable o cannot be null at this location\n" +
>+		"----------\n" +
>+		"2. WARNING in X.java (at line 4)\n" + 
>+		"	if (o == null) {};\n" + 
>+		"	               ^^\n" + 
>+		"Dead code\n" + 
> 		"----------\n",
> 	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
> }
>@@ -1062,6 +1082,11 @@
> 		"	if (o == null) {/* empty */}\n" +
> 		"	    ^\n" +
> 		"Null comparison always yields false: The variable o cannot be null at this location\n" +
>+		"----------\n" +
>+		"2. WARNING in X.java (at line 4)\n" + 
>+		"	if (o == null) {/* empty */}\n" + 
>+		"	               ^^^^^^^^^^^^^\n" + 
>+		"Dead code\n" + 
> 		"----------\n",
> 	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
> }
>@@ -1116,6 +1141,11 @@
> 		"	if (o == null)  { /* */ }\n" +
> 		"	    ^\n" +
> 		"Null comparison always yields false: The variable o cannot be null at this location\n" +
>+		"----------\n" +
>+		"2. WARNING in X.java (at line 4)\n" + 
>+		"	if (o == null)  { /* */ }\n" + 
>+		"	                ^^^^^^^^^\n" + 
>+		"Dead code\n" + 
> 		"----------\n",
> 	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
> }
>@@ -1153,6 +1183,11 @@
> 		"	if (c == null) {};\n" +
> 		"	    ^\n" +
> 		"Null comparison always yields false: The variable c cannot be null at this location\n" +
>+		"----------\n" +
>+		"2. WARNING in X.java (at line 4)\n" + 
>+		"	if (c == null) {};\n" + 
>+		"	               ^^\n" + 
>+		"Dead code\n" + 
> 		"----------\n",
> 	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
> }
>@@ -1216,6 +1251,11 @@
> 		"	if (o == null) { /* */ }\n" +
> 		"	    ^\n" +
> 		"Null comparison always yields false: The variable o cannot be null at this location\n" +
>+		"----------\n" +
>+		"3. WARNING in X.java (at line 6)\n" + 
>+		"	if (o == null) { /* */ }\n" + 
>+		"	               ^^^^^^^^^\n" + 
>+		"Dead code\n" + 
> 		"----------\n",
> 	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
> }
>@@ -1243,6 +1283,11 @@
> 		"	if (o == null) { /* */ }\n" +
> 		"	    ^\n" +
> 		"Null comparison always yields false: The variable o cannot be null at this location\n" +
>+		"----------\n" +
>+		"3. WARNING in X.java (at line 6)\n" + 
>+		"	if (o == null) { /* */ }\n" + 
>+		"	               ^^^^^^^^^\n" + 
>+		"Dead code\n" + 
> 		"----------\n",
> 	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
> }
>@@ -1415,6 +1460,11 @@
> 		"	if (x == null) { /* */ }\n" +
> 		"	    ^\n" +
> 		"Null comparison always yields false: The variable x cannot be null at this location\n" +
>+		"----------\n" +
>+		"2. WARNING in X.java (at line 4)\n" + 
>+		"	if (x == null) { /* */ }\n" + 
>+		"	               ^^^^^^^^^\n" + 
>+		"Dead code\n" + 
> 		"----------\n",
> 	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
> }
>@@ -1776,6 +1826,13 @@
> 		"	if (o == null) {\n" +
> 		"	    ^\n" +
> 		"Null comparison always yields false: The variable o cannot be null at this location\n" +
>+		"----------\n" +
>+		"2. WARNING in X.java (at line 4)\n" + 
>+		"	if (o == null) {\n" + 
>+		"        // do nothing\n" + 
>+		"      }\n" + 
>+		"	               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
>+		"Dead code\n" + 
> 		"----------\n",
> 	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
> }
>@@ -1918,10 +1975,15 @@
> 		"	    ^\n" +
> 		"Null comparison always yields false: The variable o cannot be null at this location\n" +
> 		"----------\n" +
>-		"2. ERROR in X.java (at line 7)\n" +
>-		"	o.toString();\n" +
>-		"	^\n" +
>-		"Potential null pointer access: The variable o may be null at this location\n" +
>+		"2. WARNING in X.java (at line 5)\n" +
>+		"	if (o == null) { /* */ }\n" +
>+		"	               ^^^^^^^^^\n" +
>+		"Dead code\n" +
>+		"----------\n" +
>+		"3. ERROR in X.java (at line 6)\n" +
>+		"	if (o != null) { /* */ }\n" +
>+		"	    ^\n" +
>+		"Redundant null check: The variable o cannot be null at this location\n" +
> 		"----------\n",
> 	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
> }
>@@ -1945,6 +2007,11 @@
> 		"	if (o == null) { /* */ }\n" +
> 		"	    ^\n" +
> 		"Null comparison always yields false: The variable o cannot be null at this location\n" +
>+		"----------\n" +
>+		"2. WARNING in X.java (at line 6)\n" + 
>+		"	if (o == null) { /* */ }\n" + 
>+		"	               ^^^^^^^^^\n" + 
>+		"Dead code\n" + 
> 		"----------\n",
> 	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
> }
>@@ -2083,6 +2150,11 @@
> 		"	if (o == null) { /* */ }\n" +
> 		"	    ^\n" +
> 		"Null comparison always yields false: The variable o cannot be null at this location\n" +
>+		"----------\n" +
>+		"2. WARNING in X.java (at line 4)\n" + 
>+		"	if (o == null) { /* */ }\n" + 
>+		"	               ^^^^^^^^^\n" + 
>+		"Dead code\n" + 
> 		"----------\n",
> 	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
> }
>@@ -2121,6 +2193,11 @@
> 		"	if (o == null) { /* */ }\n" +
> 		"	    ^\n" +
> 		"Null comparison always yields false: The variable o cannot be null at this location\n" +
>+		"----------\n" +
>+		"2. WARNING in X.java (at line 5)\n" + 
>+		"	if (o == null) { /* */ }\n" + 
>+		"	               ^^^^^^^^^\n" + 
>+		"Dead code\n" + 
> 		"----------\n",
> 	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
> }
>@@ -2402,7 +2479,7 @@
> 			"      o.toString();\n" +
> 			"    }\n" +
> 			"    else {\n" +
>-			"      o.toString();\n" + // must complain anyway (could be quite distant from the if test)
>+			"      o.toString();\n" +
> 			"    }\n" +
> 			"    o.toString();\n" + // quiet
> 			"  }\n" +
>@@ -2413,19 +2490,21 @@
> 		"	    ^\n" +
> 		"Redundant null check: The variable o cannot be null at this location\n" +
> 		"----------\n" +
>-		"2. ERROR in X.java (at line 8)\n" +
>-		"	o.toString();\n" +
>-		"	^\n" +
>-		"Null pointer access: The variable o can only be null at this location\n" +
>+		"2. WARNING in X.java (at line 7)\n" +
>+		"	else {\n" + 
>+		"      o.toString();\n" + 
>+		"    }\n" + 
>+		"	     ^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
>+		"Dead code\n" + 
> 		"----------\n",
> 	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
> }
> 
> // null analysis - if/else
>-// TODO (maxime) https://bugs.eclipse.org/bugs/show_bug.cgi?id=129581
>-// this is a limit of the fix for bug 128014 - calls for a nuance
>-// between potential null and tainted null
>-public void _test0335_if_else() {
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=129581
>+// Test that no false null reference warning is issued for a variable
>+// that has been wrongly tainted by a redundant null check upstream.
>+public void test0335_if_else() {
> 	this.runNegativeTest(
> 		new String[] {
> 			"X.java",
>@@ -2473,10 +2552,12 @@
> 		"	    ^\n" +
> 		"Redundant null check: The variable o cannot be null at this location\n" +
> 		"----------\n" +
>-		"2. ERROR in X.java (at line 8)\n" +
>-		"	o.toString();\n" +
>-		"	^\n" +
>-		"Null pointer access: The variable o can only be null at this location\n" +
>+		"2. WARNING in X.java (at line 7)\n" + 
>+		"	else {\n" + 
>+		"        o.toString();\n" + 
>+		"      }\n" + 
>+		"	     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
>+		"Dead code\n" + 
> 		"----------\n",
> 	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
> }
>@@ -3147,6 +3228,11 @@
> 		"	if (o == null) { /* */ }\n" +
> 		"	    ^\n" +
> 		"Null comparison always yields false: The variable o cannot be null at this location\n" +
>+		"----------\n" +
>+		"2. WARNING in X.java (at line 7)\n" + 
>+		"	if (o == null) { /* */ }\n" + 
>+		"	               ^^^^^^^^^\n" + 
>+		"Dead code\n" + 
> 		"----------\n",
> 	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
> }
>@@ -3172,6 +3258,11 @@
> 		"	if (o == null) { /* */ }\n" +
> 		"	    ^\n" +
> 		"Null comparison always yields false: The variable o cannot be null at this location\n" +
>+		"----------\n" +
>+		"2. WARNING in X.java (at line 7)\n" + 
>+		"	if (o == null) { /* */ }\n" + 
>+		"	               ^^^^^^^^^\n" + 
>+		"Dead code\n" + 
> 		"----------\n",
> 	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
> }
>@@ -3241,6 +3332,11 @@
> 		"	if (o == null) { /* */ }\n" +
> 		"	    ^\n" +
> 		"Null comparison always yields false: The variable o cannot be null at this location\n" +
>+		"----------\n" +
>+		"2. WARNING in X.java (at line 6)\n" + 
>+		"	if (o == null) { /* */ }\n" + 
>+		"	               ^^^^^^^^^\n" + 
>+		"Dead code\n" + 
> 		"----------\n",
> 	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
> }
>@@ -4492,6 +4588,11 @@
> 		"	if (o == null) { /* */ }\n" +
> 		"	    ^\n" +
> 		"Null comparison always yields false: The variable o cannot be null at this location\n" +
>+		"----------\n" + 
>+		"2. WARNING in X.java (at line 7)\n" + 
>+		"	if (o == null) { /* */ }\n" + 
>+		"	               ^^^^^^^^^\n" + 
>+		"Dead code\n" + 
> 		"----------\n",
> 	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
> }
>@@ -4517,6 +4618,13 @@
> 		"	if (o == null) {\n" +
> 		"	    ^\n" +
> 		"Null comparison always yields false: The variable o cannot be null at this location\n" +
>+		"----------\n" +
>+		"2. WARNING in X.java (at line 7)\n" + 
>+		"	if (o == null) {\n" + 
>+		"      o = new Object();\n" + 
>+		"    }\n" + 
>+		"	               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
>+		"Dead code\n" + 
> 		"----------\n",
> 	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
> }
>@@ -5810,6 +5918,12 @@
> 		"	if (ex == null) {\n" +
> 		"	    ^^\n" +
> 		"Null comparison always yields false: The variable ex cannot be null at this location\n" +
>+		"----------\n" +
>+		"2. WARNING in X.java (at line 20)\n" + 
>+		"	if (ex == null) {\n" + 
>+		"    }\n" + 
>+		"	                ^^^^^^^\n" + 
>+		"Dead code\n" + 
> 		"----------\n",
> 	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
> }
>@@ -7587,6 +7701,11 @@
> 		"	if(o == null) { /* */ }\n" +
> 		"	   ^\n" +
> 		"Null comparison always yields false: The variable o cannot be null at this location\n" +
>+		"----------\n" +
>+		"2. WARNING in X.java (at line 12)\n" + 
>+		"	if(o == null) { /* */ }\n" + 
>+		"	              ^^^^^^^^^\n" + 
>+		"Dead code\n" + 
> 		"----------\n",
> 	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
> }
>@@ -7962,7 +8081,12 @@
> 			"	    ^^\n" +
> 			"Null comparison always yields false: The variable o1 cannot be null at this location\n" +
> 			"----------\n" +
>-			"2. ERROR in X.java (at line 5)\n" +
>+			"2. WARNING in X.java (at line 4)\n" + 
>+			"	if (o1 == null) { };\n" + 
>+			"	                ^^^\n" + 
>+			"Dead code\n" + 
>+			"----------\n" + 
>+			"3. ERROR in X.java (at line 5)\n" +
> 			"	if (o2 == null) { };\n" +
> 			"	    ^^\n" +
> 			"Redundant null check: The variable o2 can only be null at this location\n" +
>@@ -8011,6 +8135,11 @@
> 		"	if (o == null) { };\n" +
> 		"	    ^\n" +
> 		"Null comparison always yields false: The variable o cannot be null at this location\n" +
>+		"----------\n" +
>+		"2. WARNING in X.java (at line 4)\n" + 
>+		"	if (o == null) { };\n" + 
>+		"	               ^^^\n" + 
>+		"Dead code\n" + 
> 		"----------\n",
> 	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
> 	}
>@@ -8040,6 +8169,11 @@
> 		"	if (o == null) { };\n" +
> 		"	    ^\n" +
> 		"Null comparison always yields false: The variable o cannot be null at this location\n" +
>+		"----------\n" +
>+		"3. WARNING in X.java (at line 5)\n" + 
>+		"	if (o == null) { };\n" + 
>+		"	               ^^^\n" + 
>+		"Dead code\n" + 
> 		"----------\n",
> 	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
> 	}
>@@ -8208,20 +8342,17 @@
> 		"	    ^\n" +
> 		"Null comparison always yields false: The variable x cannot be null at this location\n" +
> 		"----------\n" +
>-		"3. ERROR in X.java (at line 6)\n" +
>-		"	x.foo(null); // 3\n" +
>-		"	^\n" +
>-		"Null pointer access: The variable x can only be null at this location\n" +
>+		"3. WARNING in X.java (at line 5)\n" +
>+		"	if (x == null) { // 2\n" +
>+		"        x.foo(null); // 3\n" +
>+		"      } else if (x instanceof X) { // 4\n" +
>+		"	               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" +
>+		"Dead code\n" +
> 		"----------\n" +
> 		"4. ERROR in X.java (at line 9)\n" +
> 		"	} else if (x != null) { // 6\n" +
> 		"	           ^\n" +
> 		"Redundant null check: The variable x cannot be null at this location\n" +
>-		"----------\n" +
>-		"5. ERROR in X.java (at line 12)\n" +
>-		"	x.foo(null); // 8\n" +
>-		"	^\n" +
>-		"Potential null pointer access: The variable x may be null at this location\n" +
> 		"----------\n",
> 	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
> }
>@@ -8375,6 +8506,17 @@
> 		"	if (other != null) {\n" +
> 		"	    ^^^^^\n" +
> 		"Redundant null check: The variable other cannot be null at this location\n" +
>+		"----------\n" +
>+		"2. ERROR in X.java (at line 11)\n" + 
>+		"	if (other == null) {\n" + 
>+		"	    ^^^^^\n" + 
>+		"Null comparison always yields false: The variable other cannot be null at this location\n" + 
>+		"----------\n" + 
>+		"3. WARNING in X.java (at line 11)\n" + 
>+		"	if (other == null) {\n" + 
>+		"      }\n" + 
>+		"	                   ^^^^^^^^^\n" + 
>+		"Dead code\n" + 
> 		"----------\n",
> 	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
> }
>@@ -8428,10 +8570,12 @@
> 		"	    ^\n" +
> 		"Null comparison always yields false: The variable x cannot be null at this location\n" +
> 		"----------\n" +
>-		"2. ERROR in X.java (at line 5)\n" +
>-		"	x.foo(this);\n" +
>-		"	^\n" +
>-		"Null pointer access: The variable x can only be null at this location\n" +
>+		"2. WARNING in X.java (at line 4)\n" +
>+		"	if (x == null) {\n" +
>+		"        x.foo(this);\n" +
>+		"      }\n" +
>+		"	               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" +
>+		"Dead code\n" +
> 		"----------\n",
> 	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
> }
>@@ -8680,6 +8824,11 @@
> 		"	if (o == null) return;\n" +
> 		"	    ^\n" +
> 		"Null comparison always yields false: The variable o cannot be null at this location\n" +
>+		"----------\n" +
>+		"2. WARNING in X.java (at line 13)\n" + 
>+		"	if (o == null) return;\n" + 
>+		"	               ^^^^^^^\n" + 
>+		"Dead code\n" + 
> 		"----------\n",
> 	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
> }
>@@ -8739,6 +8888,11 @@
> 		"	if (o == null) return;\n" +
> 		"	    ^\n" +
> 		"Null comparison always yields false: The variable o cannot be null at this location\n" +
>+		"----------\n" +
>+		"2. WARNING in X.java (at line 10)\n" + 
>+		"	if (o == null) return;\n" + 
>+		"	               ^^^^^^^\n" + 
>+		"Dead code\n" + 
> 		"----------\n",
> 	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
> }
>@@ -8890,6 +9044,13 @@
> 		"	if (a == null) {\n" +
> 		"	    ^\n" +
> 		"Null comparison always yields false: The variable a cannot be null at this location\n" +
>+		"----------\n" +
>+		"3. WARNING in X.java (at line 13)\n" + 
>+		"	if (a == null) {\n" + 
>+		"      System.out.println();\n" + 
>+		"    }\n" + 
>+		"	               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
>+		"Dead code\n" + 
> 		"----------\n",
> 	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
> }
>@@ -8947,6 +9108,11 @@
> 		"	if(a!=null)\n" +
> 		"	   ^\n" +
> 		"Null comparison always yields false: The variable a can only be null at this location\n" +
>+		"----------\n" +
>+		"3. WARNING in X.java (at line 9)\n" + 
>+		"	{ /* */ }\n" + 
>+		"	^^^^^^^^^\n" + 
>+		"Dead code\n" + 
> 		"----------\n",
> 	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
> }
>@@ -9043,7 +9209,14 @@
> 				  "}\n"
> 				  } /* testFiles */,
> 			"----------\n" +
>-			"1. WARNING in X.java (at line 8)\n" +
>+			"1. WARNING in X.java (at line 4)\n" +
>+			"	if (o != null) {\n" +
>+			"       o = null;\n" +
>+			"    }\n" +
>+			"	               ^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
>+			"Dead code\n" +
>+			"----------\n" +
>+			"2. WARNING in X.java (at line 8)\n" +
> 			"	o.toString();\n" +
> 			"	^\n" +
> 			"Null pointer access: The variable o can only be null at this location\n" +
>@@ -9105,18 +9278,25 @@
> 			  "  }\n" +
> 			  "}\n"},
> 		"----------\n" +
>-		"1. ERROR in X.java (at line 4)\r\n" +
>-		"	if (o != null) {\r\n" +
>+		"1. ERROR in X.java (at line 4)\n" +
>+		"	if (o != null) {\n" +
> 		"	    ^\n" +
>-		"Null comparison always yields false: The variable o can only be null at this location\n" +
>+		"Null comparison always yields false: The variable o can only be null at this location\n" + 
> 		"----------\n" +
>-		"2. ERROR in X.java (at line 8)\r\n" +
>-		"	o.toString();\r\n" +
>+		"2. WARNING in X.java (at line 4)\n" + 
>+		"	if (o != null) {\n" + 
>+		"       o = null;\n" + 
>+		"    }\n" + 
>+		"	               ^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
>+		"Dead code\n" + 
>+		"----------\n" +
>+		"3. ERROR in X.java (at line 8)\n" +
>+		"	o.toString();\n" +
> 		"	^\n" +
> 		"Null pointer access: The variable o can only be null at this location\n" +
> 		"----------\n" +
>-		"3. ERROR in X.java (at line 9)\r\n" +
>-		"	p.toString();\r\n" +
>+		"4. ERROR in X.java (at line 9)\n" +
>+		"	p.toString();\n" +
> 		"	^\n" +
> 		"Potential null pointer access: The variable p may be null at this location\n" +
> 		"----------\n",
>@@ -9152,8 +9332,15 @@
> 		customOptions /* custom options */,
> 		// compiler results
> 		"----------\n" +  /* expected compiler log */
>-		"1. ERROR in X.java (at line 8)\r\n" +
>-		"	o.toString();\r\n" +
>+		"1. WARNING in X.java (at line 4)\n" + 
>+		"	if (o != null) {\n" + 
>+		"       o = null;\n" + 
>+		"    }\n" + 
>+		"	               ^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
>+		"Dead code\n" + 
>+		"----------\n" +
>+		"2. ERROR in X.java (at line 8)\n" +
>+		"	o.toString();\n" +
> 		"	^\n" +
> 		"Null pointer access: The variable o can only be null at this location\n" +
> 		"----------\n",
>@@ -9190,13 +9377,20 @@
> 		customOptions /* custom options */,
> 		// compiler results
> 		"----------\n" +  /* expected compiler log */
>-		"1. ERROR in X.java (at line 4)\r\n" +
>-		"	if (o != null) {\r\n" +
>+		"1. ERROR in X.java (at line 4)\n" +
>+		"	if (o != null) {\n" +
> 		"	    ^\n" +
> 		"Null comparison always yields false: The variable o can only be null at this location\n" +
> 		"----------\n" +
>-		"2. WARNING in X.java (at line 8)\r\n" +
>-		"	o.toString();\r\n" +
>+		"2. WARNING in X.java (at line 4)\n" + 
>+		"	if (o != null) {\n" + 
>+		"       o = null;\n" + 
>+		"    }\n" + 
>+		"	               ^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
>+		"Dead code\n" + 
>+		"----------\n" +
>+		"3. WARNING in X.java (at line 8)\n" +
>+		"	o.toString();\n" +
> 		"	^\n" +
> 		"Null pointer access: The variable o can only be null at this location\n" +
> 		"----------\n",
>@@ -9233,13 +9427,20 @@
> 		customOptions /* custom options */,
> 		// compiler results
> 		"----------\n" +  /* expected compiler log */
>-		"1. ERROR in X.java (at line 4)\r\n" +
>-		"	if (o != null) {\r\n" +
>+		"1. ERROR in X.java (at line 4)\n" +
>+		"	if (o != null) {\n" +
> 		"	    ^\n" +
> 		"Null comparison always yields false: The variable o can only be null at this location\n" +
> 		"----------\n" +
>-		"2. ERROR in X.java (at line 9)\r\n" +
>-		"	p.toString();\r\n" +
>+		"2. WARNING in X.java (at line 4)\n" + 
>+		"	if (o != null) {\n" + 
>+		"       o = null;\n" + 
>+		"    }\n" + 
>+		"	               ^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
>+		"Dead code\n" + 
>+		"----------\n" +
>+		"3. ERROR in X.java (at line 9)\n" +
>+		"	p.toString();\n" +
> 		"	^\n" +
> 		"Potential null pointer access: The variable p may be null at this location\n" +
> 		"----------\n",
>@@ -9278,8 +9479,15 @@
> 			customOptions /* custom options */,
> 			// compiler results
> 			"----------\n" +  /* expected compiler log */
>-			"1. ERROR in X.java (at line 9)\r\n" +
>-			"	o.toString();\r\n" +
>+			"1. WARNING in X.java (at line 5)\n" + 
>+			"	if (o != null) {\n" + 
>+			"       o = null;\n" + 
>+			"    }\n" + 
>+			"	               ^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
>+			"Dead code\n" + 
>+			"----------\n" +
>+			"2. ERROR in X.java (at line 9)\n" +
>+			"	o.toString();\n" +
> 			"	^\n" +
> 			"Null pointer access: The variable o can only be null at this location\n" +
> 			"----------\n",
>@@ -9489,6 +9697,16 @@
> 		"	if (o65 == null) { /* */ }\n" +
> 		"	    ^^^\n" +
> 		"Null comparison always yields false: The variable o65 cannot be null at this location\n" +
>+		"----------\n" +
>+		"2. WARNING in X.java (at line 18)\n" + 
>+		"	if (o65 == null) { /* */ }\n" + 
>+		"	                 ^^^^^^^^^\n" + 
>+		"Dead code\n" + 
>+		"----------\n" + 
>+		"3. ERROR in X.java (at line 19)\n" + 
>+		"	if (o65 != null) { /* */ }\n" + 
>+		"	    ^^^\n" + 
>+		"Redundant null check: The variable o65 cannot be null at this location\n" + 
> 		"----------\n",
> 	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
> }
>@@ -9746,6 +9964,11 @@
> 		"	if (o == null) { /* */ }\n" +
> 		"	    ^\n" +
> 		"Null comparison always yields false: The variable o cannot be null at this location\n" +
>+		"----------\n" +
>+		"2. WARNING in X.java (at line 20)\n" + 
>+		"	if (o == null) { /* */ }\n" + 
>+		"	               ^^^^^^^^^\n" + 
>+		"Dead code\n" + 
> 		"----------\n",
> 	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
> }
>@@ -9783,6 +10006,11 @@
> 		"	if (o == null) { /* */ }\n" +
> 		"	    ^\n" +
> 		"Null comparison always yields false: The variable o cannot be null at this location\n" +
>+		"----------\n" +
>+		"2. WARNING in X.java (at line 21)\n" + 
>+		"	if (o == null) { /* */ }\n" + 
>+		"	               ^^^^^^^^^\n" + 
>+		"Dead code\n" + 
> 		"----------\n",
> 	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
> }
>@@ -9823,6 +10051,11 @@
> 		"	if (o == null) { /* */ }\n" +
> 		"	    ^\n" +
> 		"Null comparison always yields false: The variable o cannot be null at this location\n" +
>+		"----------\n" +
>+		"2. WARNING in X.java (at line 24)\n" + 
>+		"	if (o == null) { /* */ }\n" + 
>+		"	               ^^^^^^^^^\n" + 
>+		"Dead code\n" + 
> 		"----------\n",
> 	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
> }
>@@ -9863,6 +10096,11 @@
> 		"	if (o == null) { /* */ }\n" +
> 		"	    ^\n" +
> 		"Null comparison always yields false: The variable o cannot be null at this location\n" +
>+		"----------\n" +
>+		"2. WARNING in X.java (at line 24)\n" + 
>+		"	if (o == null) { /* */ }\n" + 
>+		"	               ^^^^^^^^^\n" + 
>+		"Dead code\n" + 
> 		"----------\n",
> 	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
> }
>@@ -10328,4 +10566,74 @@
> 				"----------\n");
> 	}
> }
>+
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=293917
>+// Test that a redundant null check doesn't affect the null status of
>+// a variable downstream.
>+public void testBug293917() {
>+	this.runNegativeTest(
>+		new String[] {
>+			"X.java",
>+			"public class X {\n" +
>+			"	public void foo(){\n" +
>+			"		String x = null, y = null;\n" +
>+			"		if (x == null) x = \"foo\";\n" +
>+			"		if (x != null) y = \"bar\";\n" +
>+			"		x.length();\n" +   // shouldn't warn here    
>+			"		y.length();\n" +   // shouldn't warn here
>+			"	}\n" +
>+			"}\n"},
>+		"----------\n" +
>+		"1. ERROR in X.java (at line 4)\n" + 
>+		"	if (x == null) x = \"foo\";\n" + 
>+		"	    ^\n" + 
>+		"Redundant null check: The variable x can only be null at this location\n" + 
>+		"----------\n" + 
>+		"2. ERROR in X.java (at line 5)\n" + 
>+		"	if (x != null) y = \"bar\";\n" + 
>+		"	    ^\n" + 
>+		"Redundant null check: The variable x cannot be null at this location\n" + 
>+		"----------\n",
>+	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
>+}
>+
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=190623
>+//Test that a redundant null check doesn't affect the null status of
>+//a variable downstream.
>+public void testBug190623() {
>+	this.runNegativeTest(
>+		new String[] {
>+			"X.java",
>+			"public class X {\n" +
>+			"    public static void main(String[] args) {\n" +
>+			"        Number n = getNumber();\n" +
>+			"        if (n instanceof Double) {\n" +
>+			"            Double d= (Double) n;\n" +
>+			"            if (d != null && d.isNaN()) {\n" +
>+			"                System.out.println(\"outside loop\");\n" +
>+			"            }\n" +
>+			"            for (int i= 0; i < 10; i++) {\n" +
>+			"                if (d != null && d.isNaN()) {\n" +
>+			"                    System.out.println(\"inside loop\");\n" +
>+			"                }\n" +
>+			"            }\n" +
>+			"        }\n" +
>+			"    }\n" +
>+			"    private static Number getNumber() {\n" +
>+			"        return new Double(Math.sqrt(-1));\n" +
>+			"    }\n" +
>+			"}\n"},
>+		"----------\n" +
>+		"1. ERROR in X.java (at line 6)\n" + 
>+		"	if (d != null && d.isNaN()) {\n" + 
>+		"	    ^\n" + 
>+		"Redundant null check: The variable d cannot be null at this location\n" + 
>+		"----------\n" + 
>+		"2. ERROR in X.java (at line 10)\n" + 
>+		"	if (d != null && d.isNaN()) {\n" + 
>+		"	    ^\n" + 
>+		"Redundant null check: The variable d cannot be null at this location\n" + 
>+		"----------\n",
>+	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
>+}
> }
>\ No newline at end of file
>Index: src/org/eclipse/jdt/core/tests/compiler/regression/StackMapAttributeTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/StackMapAttributeTest.java,v
>retrieving revision 1.41
>diff -u -r1.41 StackMapAttributeTest.java
>--- src/org/eclipse/jdt/core/tests/compiler/regression/StackMapAttributeTest.java	19 Jun 2009 16:11:34 -0000	1.41
>+++ src/org/eclipse/jdt/core/tests/compiler/regression/StackMapAttributeTest.java	23 Dec 2009 06:51:25 -0000
>@@ -6153,25 +6153,16 @@
> 		String expectedOutput =
> 			"  // Stack: 1, Locals: 2\n" + 
> 			"  private java.lang.Object bar();\n" + 
>-			"     0  aconst_null\n" + 
>-			"     1  astore_1 [o]\n" + 
>-			"     2  aload_1 [o]\n" + 
>-			"     3  ifnull 11\n" + 
>-			"     6  aload_1 [o]\n" + 
>-			"     7  invokevirtual java.lang.Object.toString() : java.lang.String [24]\n" + 
>-			"    10  pop\n" + 
>-			"    11  aconst_null\n" + 
>-			"    12  areturn\n" + 
>+			"    0  aconst_null\n" + 
>+			"    1  astore_1 [o]\n" + 
>+			"    2  aconst_null\n" + 
>+			"    3  areturn\n" + 
> 			"      Line numbers:\n" + 
> 			"        [pc: 0, line: 8]\n" + 
>-			"        [pc: 2, line: 9]\n" + 
>-			"        [pc: 6, line: 10]\n" + 
>-			"        [pc: 11, line: 12]\n" + 
>+			"        [pc: 2, line: 12]\n" + 
> 			"      Local variable table:\n" + 
>-			"        [pc: 0, pc: 13] local: this index: 0 type: X\n" + 
>-			"        [pc: 2, pc: 13] local: o index: 1 type: java.lang.Object\n" + 
>-			"      Stack map table: number of frames 1\n" + 
>-			"        [pc: 11, append: {java.lang.Object}]\n";
>+			"        [pc: 0, pc: 4] local: this index: 0 type: X\n" + 
>+			"        [pc: 2, pc: 4] local: o index: 1 type: java.lang.Object\n";
> 		checkDisassembledClassFile(OUTPUT_DIR + File.separator + "X.class", "X", expectedOutput);
> 	}
> 	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=251539
>@@ -6214,25 +6205,16 @@
> 		String expectedOutput =
> 			"  // Stack: 1, Locals: 2\n" + 
> 			"  private java.lang.Object bar();\n" + 
>-			"     0  aconst_null\n" + 
>-			"     1  astore_1 [o]\n" + 
>-			"     2  aload_1 [o]\n" + 
>-			"     3  ifnull 11\n" + 
>-			"     6  aload_1 [o]\n" + 
>-			"     7  invokevirtual java.lang.Object.toString() : java.lang.String [30]\n" + 
>-			"    10  pop\n" + 
>-			"    11  aconst_null\n" + 
>-			"    12  areturn\n" + 
>+			"    0  aconst_null\n" + 
>+			"    1  astore_1 [o]\n" + 
>+			"    2  aconst_null\n" + 
>+			"    3  areturn\n" + 
> 			"      Line numbers:\n" + 
> 			"        [pc: 0, line: 12]\n" + 
>-			"        [pc: 2, line: 13]\n" + 
>-			"        [pc: 6, line: 14]\n" + 
>-			"        [pc: 11, line: 16]\n" + 
>+			"        [pc: 2, line: 16]\n" + 
> 			"      Local variable table:\n" + 
>-			"        [pc: 0, pc: 13] local: this index: 0 type: X\n" + 
>-			"        [pc: 2, pc: 13] local: o index: 1 type: java.lang.Object\n" + 
>-			"      Stack map table: number of frames 1\n" + 
>-			"        [pc: 11, append: {java.lang.Object}]\n";
>+			"        [pc: 0, pc: 4] local: this index: 0 type: X\n" + 
>+			"        [pc: 2, pc: 4] local: o index: 1 type: java.lang.Object\n";
> 		checkDisassembledClassFile(OUTPUT_DIR + File.separator + "X.class", "X", expectedOutput);
> 	}
> 	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=260031

Actions: View | Diff

Attachments on bug 293917: 154955 | 156262 | 156644