Attachment #190035 for bug #338234




/*******************************************************************************
 * Copyright (c) 2000, 2011 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

									scope.problemReporter().localVariableRedundantCheckOnNonNull(local, reference);
								}
								if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {
									flowInfo.initsWhenFalse().setReachMode(FlowInfo.UNREACHABLE_BY_NULLANALYSIS);
								}
							} else if (checkType == (CAN_ONLY_NULL_NON_NULL | IN_COMPARISON_NULL)) {
								if ((this.tagBits & FlowContext.HIDE_NULL_COMPARISON_WARNING) == 0) {
									scope.problemReporter().localVariableNonNullComparedToNull(local, reference);
								}
								if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {
									flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE_BY_NULLANALYSIS);
								}
							}
							return;

										scope.problemReporter().localVariableRedundantCheckOnNull(local, reference);
									}
									if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {
										flowInfo.initsWhenFalse().setReachMode(FlowInfo.UNREACHABLE_BY_NULLANALYSIS);
									}
									return;
								case FlowContext.IN_COMPARISON_NON_NULL:

										scope.problemReporter().localVariableNullComparedToNonNull(local, reference);
									}
									if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {
										flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE_BY_NULLANALYSIS);
									}
									return;
								case FlowContext.IN_ASSIGNMENT:

									scope.problemReporter().localVariableRedundantCheckOnNonNull(local, reference);
								}
								if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {
									flowInfo.initsWhenFalse().setReachMode(FlowInfo.UNREACHABLE_BY_NULLANALYSIS);
								}
							} else {
								if ((this.tagBits & FlowContext.HIDE_NULL_COMPARISON_WARNING) == 0) {
									scope.problemReporter().localVariableNonNullComparedToNull(local, reference);
								}
								if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {
									flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE_BY_NULLANALYSIS);
								}
							}
							return;

										scope.problemReporter().localVariableRedundantCheckOnNull(local, reference);
									}
									if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {
										flowInfo.initsWhenFalse().setReachMode(FlowInfo.UNREACHABLE_BY_NULLANALYSIS);
									}
									return;
								case FlowContext.IN_COMPARISON_NON_NULL:

										scope.problemReporter().localVariableNullComparedToNonNull(local, reference);
									}
									if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {
										flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE_BY_NULLANALYSIS);
									}
									return;
								case FlowContext.IN_ASSIGNMENT:




/*******************************************************************************
 * Copyright (c) 2000, 2011 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

						scope.problemReporter().localVariableRedundantCheckOnNonNull(local, reference);
					}
					if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {
						flowInfo.initsWhenFalse().setReachMode(FlowInfo.UNREACHABLE_BY_NULLANALYSIS);
					}
				} else {
					if ((this.tagBits & FlowContext.HIDE_NULL_COMPARISON_WARNING) == 0) {
						scope.problemReporter().localVariableNonNullComparedToNull(local, reference);
					}
					if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {
						flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE_BY_NULLANALYSIS);
					}
				}
				return;

							scope.problemReporter().localVariableRedundantCheckOnNull(local, reference);
						}
						if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {
							flowInfo.initsWhenFalse().setReachMode(FlowInfo.UNREACHABLE_BY_NULLANALYSIS);
						}
						return;
					case FlowContext.IN_COMPARISON_NON_NULL:

							scope.problemReporter().localVariableNullComparedToNonNull(local, reference);
						}
						if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {
							flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE_BY_NULLANALYSIS);
						}
						return;
					case FlowContext.IN_ASSIGNMENT:

Lines 1-5 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/flow/FlowInfo.java (-4 / +19 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2010 IBM Corporation and others.	2	* Copyright (c) 2000, 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 22-29 Link Here
22		22
23	public int tagBits; // REACHABLE by default	23	public int tagBits; // REACHABLE by default
24	public final static int REACHABLE = 0;	24	public final static int REACHABLE = 0;
25	public final static int UNREACHABLE = 1;	25	/* unreachable code as defined in the language spec
		26	* eg. while (true);
		27	* i++; --> unreachable code
		28	*/
		29	public final static int UNREACHABLE_OR_DEAD = 1;
26	public final static int NULL_FLAG_MASK = 2;	30	public final static int NULL_FLAG_MASK = 2;
		31	/* unreachable code as inferred by null analysis
		32	* eg. str = null;
		33	* if (str != null) {
		34	* // dead code
		35	* }
		36	*/
		37	public final static int UNREACHABLE_BY_NULLANALYSIS = 4;
		38	/*
		39	* code unreachable in any fashion
		40	*/
		41	public final static int UNREACHABLE = UNREACHABLE_OR_DEAD \| UNREACHABLE_BY_NULLANALYSIS;
27		42
28	public final static int UNKNOWN = 1;	43	public final static int UNKNOWN = 1;
29	public final static int NULL = 2;	44	public final static int NULL = 2;
Lines 456-464 Link Here
456	}	471	}
457		472
458	/**	473	/**
459	* Return REACHABLE if this flow info is reachable, UNREACHABLE	474	* Return REACHABLE if this flow info is reachable, UNREACHABLE\|UNREACHABLE_BY_NULLANALYSIS
460	* else.	475	* else.
461	* @return REACHABLE if this flow info is reachable, UNREACHABLE	476	* @return REACHABLE if this flow info is reachable, UNREACHABLE\|UNREACHABLE_BY_NULLANALYSIS
462	* else	477	* else
463	*/	478	*/
464	public int reachMode() {	479	public int reachMode() {




						scope.problemReporter().localVariableRedundantCheckOnNonNull(local, reference);
					}
					if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {
						flowInfo.initsWhenFalse().setReachMode(FlowInfo.UNREACHABLE_BY_NULLANALYSIS);
					}
				} else {
					if ((this.tagBits & FlowContext.HIDE_NULL_COMPARISON_WARNING) == 0) {
						scope.problemReporter().localVariableNonNullComparedToNull(local, reference);
					}
					if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {
						flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE_BY_NULLANALYSIS);
					}
				}
			} else if (flowInfo.isDefinitelyNull(local)) {

						scope.problemReporter().localVariableRedundantCheckOnNull(local, reference);
					}
					if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {
						flowInfo.initsWhenFalse().setReachMode(FlowInfo.UNREACHABLE_BY_NULLANALYSIS);
					}
				} else {
					if ((this.tagBits & FlowContext.HIDE_NULL_COMPARISON_WARNING) == 0) {
						scope.problemReporter().localVariableNullComparedToNonNull(local, reference);
					}
					if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {
						flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE_BY_NULLANALYSIS);
					}
				}
			} else if (this.upstreamNullFlowInfo.isDefinitelyNonNull(local) && !flowInfo.isPotentiallyNull(local) && !flowInfo.isPotentiallyUnknown(local)) {    

							scope.problemReporter().localVariableRedundantCheckOnNull(local, reference);
						}
						if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {
							flowInfo.initsWhenFalse().setReachMode(FlowInfo.UNREACHABLE_BY_NULLANALYSIS);
						}
						return;
					case FlowContext.IN_COMPARISON_NON_NULL:

							scope.problemReporter().localVariableNullComparedToNonNull(local, reference);
						}
						if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {
							flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE_BY_NULLANALYSIS);
						}
						return;
					case FlowContext.IN_ASSIGNMENT:




final public boolean isDefinitelyAssigned(FieldBinding field) {
	// Mirrored in CodeStream.isDefinitelyAssigned(..)
	// do not want to complain in unreachable code
	if ((this.tagBits & UNREACHABLE_OR_DEAD) != 0) {
		return true;
	}
	return isDefinitelyAssigned(field.id);


final public boolean isDefinitelyAssigned(LocalVariableBinding local) {
	// do not want to complain in unreachable code if local declared in reachable code
	if ((this.tagBits & UNREACHABLE_OR_DEAD) != 0 && (local.declaration.bits & ASTNode.IsLocalDeclarationReachable) != 0) {
		return true;
	}
	return isDefinitelyAssigned(local.id + this.maxFieldCount);

		na1, na2, na3, na4,
		nb1, nb2, nb3, nb4,
		b1, b2, b3, b4;
  if ((otherInits.tagBits & FlowInfo.UNREACHABLE_BY_NULLANALYSIS) != 0) {
	  otherHasNulls = false; // skip merging, otherInits is unreachable by null analysis
  } else {
	if ((this.tagBits & FlowInfo.UNREACHABLE_BY_NULLANALYSIS) != 0) { // directly copy if this is unreachable by null analysis
		this.nullBit1 = otherInits.nullBit1;
		this.nullBit2 = otherInits.nullBit2;
		this.nullBit3 = otherInits.nullBit3;
		this.nullBit4 = otherInits.nullBit4;
		thisHadNulls = false;
		thisHasNulls = otherHasNulls;
	} else
	if (thisHadNulls) {
    	if (otherHasNulls) {
    		this.nullBit1 = (a2 = this.nullBit2) & (a3 = this.nullBit3)

    		this.nullBit3 != 0 ||
    		this.nullBit4 != 0;
	}
  }

	// treating extra storage
	if (this.extra != null || otherInits.extra != null) {

	}	
	if (reachMode == REACHABLE ) {
		this.tagBits &= ~UNREACHABLE;
	} else if (reachMode == UNREACHABLE_BY_NULLANALYSIS) {
		this.tagBits |= UNREACHABLE_BY_NULLANALYSIS; // don't interfere with definite assignment analysis
	} else {
		if ((this.tagBits & UNREACHABLE) == 0) {
			// reset optional inits when becoming unreachable




/*******************************************************************************
 * Copyright (c) 2005, 2011 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

public class FlowAnalysisTest extends AbstractRegressionTest {
static {
//	TESTS_NUMBERS = new int[] { 69 };
//	TESTS_NAMES = new String[] { "testBug338234" };
}

public FlowAnalysisTest(String name) {
	super(name);
}

		"Dead code\n" + 
		"----------\n");
}

// https://bugs.eclipse.org/bugs/show_bug.cgi?id=338234
// Warn uninitialized variable in deadcode if deadcode has been inferred
// by null analysis
public void testBug338234a() {
	this.runNegativeTest(
		new String[] {
			"X.java",
			"public class X {\n" +
			"    public static void main(String[] args) {\n" + 
			"        int i;\n" + 
			"        String str = null;\n" + 
			"        if (str != null)\n" + 
			"            i++;    \n" + 
			"    }\n" + 
			"}\n"
		},
		"----------\n" + 
		"1. WARNING in X.java (at line 6)\n" + 
		"	i++;    \n" + 
		"	^^^\n" + 
		"Dead code\n" + 
		"----------\n" + 
		"2. ERROR in X.java (at line 6)\n" + 
		"	i++;    \n" + 
		"	^\n" + 
		"The local variable i may not have been initialized\n" + 
		"----------\n");
}

// https://bugs.eclipse.org/bugs/show_bug.cgi?id=338234
// Don't warn uninitialized variable in deadcode if deadcode has not been inferred
// by null analysis
public void testBug338234b() {
	this.runConformTest(
		new String[] {
			"X.java",
			"public class X {\n" +
			"    public static void main(String[] args) {\n" + 
			"        int i;\n" + 
			"        l: {\n" +
			"			if(false)\n" +
			"				break l;\n" + 
			"        	return;\n" +
			"		 }\n" + 
			"        i++;    \n" + 
			"    }\n" + 
			"}\n"
		},
		"");
}

// https://bugs.eclipse.org/bugs/show_bug.cgi?id=338234
// Warn uninitialized field in deadcode if deadcode has been inferred
// by null analysis
public void testBug338234c() {
	this.runNegativeTest(
		new String[] {
			"X.java",
			"public class X {\n" +
			"    public final int field1;\n" +
			"    {\n" + 
			"        int i;\n" + 
			"        String str = null;\n" +
			"		 if(str != null)\n" +
			"			i = field1;\n" + 
			"    }\n" + 
			"}\n"
		},
		"----------\n" + 
		"1. ERROR in X.java (at line 1)\n" + 
		"	public class X {\n" + 
		"	             ^\n" + 
		"The blank final field field1 may not have been initialized\n" + 
		"----------\n" + 
		"2. WARNING in X.java (at line 7)\n" + 
		"	i = field1;\n" + 
		"	^^^^^^^^^^\n" + 
		"Dead code\n" + 
		"----------\n" + 
		"3. ERROR in X.java (at line 7)\n" + 
		"	i = field1;\n" + 
		"	    ^^^^^^\n" + 
		"The blank final field field1 may not have been initialized\n" + 
		"----------\n");
}
public static Class testClass() {
	return FlowAnalysisTest.class;
}

Lines 14060-14063 Link Here

(-)src/org/eclipse/jdt/core/tests/compiler/regression/NullReferenceTest.java (+24 lines)
14060	},	14060	},
14061	"");	14061	"");
14062	}	14062	}
		14063
		14064	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=338234
		14065	public void testBug338234() {
		14066	this.runNegativeTest(
		14067	new String[] {
		14068	"X.java",
		14069	"public class X {\n" +
		14070	" static int foo() {\n" +
		14071	" Object o = null;\n" +
		14072	" int i = 0;\n" +
		14073	" label: {\n" +
		14074	" if (o == null)\n" +
		14075	" break label;\n" +
		14076	" i++;" +
		14077	" }\n" +
		14078	" if (i != 0) {\n" +
		14079	" System.out.println(i);\n" +
		14080	" }\n" +
		14081	" return 0;\n" +
		14082	" }\n" +
		14083	"}\n"
		14084	},
		14085	"");
		14086	}
14063	}	14087	}

Return to bug 338234

Lines 731-737 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/flow/UnconditionalFlowInfo.java (-2 / +16 lines)
731	final public boolean isDefinitelyAssigned(FieldBinding field) {	731	final public boolean isDefinitelyAssigned(FieldBinding field) {
732	// Mirrored in CodeStream.isDefinitelyAssigned(..)	732	// Mirrored in CodeStream.isDefinitelyAssigned(..)
733	// do not want to complain in unreachable code	733	// do not want to complain in unreachable code
734	if ((this.tagBits & UNREACHABLE) != 0) {	734	if ((this.tagBits & UNREACHABLE_OR_DEAD) != 0) {
735	return true;	735	return true;
736	}	736	}
737	return isDefinitelyAssigned(field.id);	737	return isDefinitelyAssigned(field.id);
Lines 739-745 Link Here
739		739
740	final public boolean isDefinitelyAssigned(LocalVariableBinding local) {	740	final public boolean isDefinitelyAssigned(LocalVariableBinding local) {
741	// do not want to complain in unreachable code if local declared in reachable code	741	// do not want to complain in unreachable code if local declared in reachable code
742	if ((this.tagBits & UNREACHABLE) != 0 && (local.declaration.bits & ASTNode.IsLocalDeclarationReachable) != 0) {	742	if ((this.tagBits & UNREACHABLE_OR_DEAD) != 0 && (local.declaration.bits & ASTNode.IsLocalDeclarationReachable) != 0) {
743	return true;	743	return true;
744	}	744	}
745	return isDefinitelyAssigned(local.id + this.maxFieldCount);	745	return isDefinitelyAssigned(local.id + this.maxFieldCount);
Lines 1563-1568 Link Here
1563	na1, na2, na3, na4,	1563	na1, na2, na3, na4,
1564	nb1, nb2, nb3, nb4,	1564	nb1, nb2, nb3, nb4,
1565	b1, b2, b3, b4;	1565	b1, b2, b3, b4;
		1566	if ((otherInits.tagBits & FlowInfo.UNREACHABLE_BY_NULLANALYSIS) != 0) {
		1567	otherHasNulls = false; // skip merging, otherInits is unreachable by null analysis
		1568	} else {
		1569	if ((this.tagBits & FlowInfo.UNREACHABLE_BY_NULLANALYSIS) != 0) { // directly copy if this is unreachable by null analysis
		1570	this.nullBit1 = otherInits.nullBit1;
		1571	this.nullBit2 = otherInits.nullBit2;
		1572	this.nullBit3 = otherInits.nullBit3;
		1573	this.nullBit4 = otherInits.nullBit4;
		1574	thisHadNulls = false;
		1575	thisHasNulls = otherHasNulls;
		1576	} else
1566	if (thisHadNulls) {	1577	if (thisHadNulls) {
1567	if (otherHasNulls) {	1578	if (otherHasNulls) {
1568	this.nullBit1 = (a2 = this.nullBit2) & (a3 = this.nullBit3)	1579	this.nullBit1 = (a2 = this.nullBit2) & (a3 = this.nullBit3)
Lines 1636-1641 Link Here
1636	this.nullBit3 != 0 \|\|	1647	this.nullBit3 != 0 \|\|
1637	this.nullBit4 != 0;	1648	this.nullBit4 != 0;
1638	}	1649	}
		1650	}
1639		1651
1640	// treating extra storage	1652	// treating extra storage
1641	if (this.extra != null \|\| otherInits.extra != null) {	1653	if (this.extra != null \|\| otherInits.extra != null) {
Lines 1858-1863 Link Here
1858	}	1870	}
1859	if (reachMode == REACHABLE ) {	1871	if (reachMode == REACHABLE ) {
1860	this.tagBits &= ~UNREACHABLE;	1872	this.tagBits &= ~UNREACHABLE;
		1873	} else if (reachMode == UNREACHABLE_BY_NULLANALYSIS) {
		1874	this.tagBits \|= UNREACHABLE_BY_NULLANALYSIS; // don't interfere with definite assignment analysis
1861	} else {	1875	} else {
1862	if ((this.tagBits & UNREACHABLE) == 0) {	1876	if ((this.tagBits & UNREACHABLE) == 0) {
1863	// reset optional inits when becoming unreachable	1877	// reset optional inits when becoming unreachable

Lines 493-506 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/flow/LoopingFlowContext.java (-6 / +6 lines)
493	scope.problemReporter().localVariableRedundantCheckOnNonNull(local, reference);	493	scope.problemReporter().localVariableRedundantCheckOnNonNull(local, reference);
494	}	494	}
495	if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {	495	if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {
496	flowInfo.initsWhenFalse().setReachMode(FlowInfo.UNREACHABLE);	496	flowInfo.initsWhenFalse().setReachMode(FlowInfo.UNREACHABLE_BY_NULLANALYSIS);
497	}	497	}
498	} else {	498	} else {
499	if ((this.tagBits & FlowContext.HIDE_NULL_COMPARISON_WARNING) == 0) {	499	if ((this.tagBits & FlowContext.HIDE_NULL_COMPARISON_WARNING) == 0) {
500	scope.problemReporter().localVariableNonNullComparedToNull(local, reference);	500	scope.problemReporter().localVariableNonNullComparedToNull(local, reference);
501	}	501	}
502	if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {	502	if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {
503	flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE);	503	flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE_BY_NULLANALYSIS);
504	}	504	}
505	}	505	}
506	} else if (flowInfo.isDefinitelyNull(local)) {	506	} else if (flowInfo.isDefinitelyNull(local)) {
Lines 509-522 Link Here
509	scope.problemReporter().localVariableRedundantCheckOnNull(local, reference);	509	scope.problemReporter().localVariableRedundantCheckOnNull(local, reference);
510	}	510	}
511	if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {	511	if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {
512	flowInfo.initsWhenFalse().setReachMode(FlowInfo.UNREACHABLE);	512	flowInfo.initsWhenFalse().setReachMode(FlowInfo.UNREACHABLE_BY_NULLANALYSIS);
513	}	513	}
514	} else {	514	} else {
515	if ((this.tagBits & FlowContext.HIDE_NULL_COMPARISON_WARNING) == 0) {	515	if ((this.tagBits & FlowContext.HIDE_NULL_COMPARISON_WARNING) == 0) {
516	scope.problemReporter().localVariableNullComparedToNonNull(local, reference);	516	scope.problemReporter().localVariableNullComparedToNonNull(local, reference);
517	}	517	}
518	if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {	518	if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {
519	flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE);	519	flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE_BY_NULLANALYSIS);
520	}	520	}
521	}	521	}
522	} else if (this.upstreamNullFlowInfo.isDefinitelyNonNull(local) && !flowInfo.isPotentiallyNull(local) && !flowInfo.isPotentiallyUnknown(local)) {	522	} else if (this.upstreamNullFlowInfo.isDefinitelyNonNull(local) && !flowInfo.isPotentiallyNull(local) && !flowInfo.isPotentiallyUnknown(local)) {
Lines 554-560 Link Here
554	scope.problemReporter().localVariableRedundantCheckOnNull(local, reference);	554	scope.problemReporter().localVariableRedundantCheckOnNull(local, reference);
555	}	555	}
556	if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {	556	if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {
557	flowInfo.initsWhenFalse().setReachMode(FlowInfo.UNREACHABLE);	557	flowInfo.initsWhenFalse().setReachMode(FlowInfo.UNREACHABLE_BY_NULLANALYSIS);
558	}	558	}
559	return;	559	return;
560	case FlowContext.IN_COMPARISON_NON_NULL:	560	case FlowContext.IN_COMPARISON_NON_NULL:
Lines 566-572 Link Here
566	scope.problemReporter().localVariableNullComparedToNonNull(local, reference);	566	scope.problemReporter().localVariableNullComparedToNonNull(local, reference);
567	}	567	}
568	if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {	568	if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {
569	flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE);	569	flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE_BY_NULLANALYSIS);
570	}	570	}
571	return;	571	return;
572	case FlowContext.IN_ASSIGNMENT:	572	case FlowContext.IN_ASSIGNMENT: