Attachment #160043 for bug #303448

View | Details | Raw Unified | Return to bug 303448
Collapse All | Expand All

Lines 47-52 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/ast/EqualExpression.java (+3 lines)
47	initsWhenTrue.markAsComparedEqualToNonNull(local); // from thereon it is set	47	initsWhenTrue.markAsComparedEqualToNonNull(local); // from thereon it is set
48	initsWhenFalse.markAsComparedEqualToNull(local); // from thereon it is set	48	initsWhenFalse.markAsComparedEqualToNull(local); // from thereon it is set
49	}	49	}
		50	if (flowContext.hideNullComparisonWarnings) {
		51	flowInfo.markedAsNullOrNonNullInAssertExpression(local);
		52	}
50	break;	53	break;
51	case FlowInfo.NON_NULL :	54	case FlowInfo.NON_NULL :
52	if (((this.bits & OperatorMASK) >> OperatorSHIFT) == EQUAL_EQUAL) {	55	if (((this.bits & OperatorMASK) >> OperatorSHIFT) == EQUAL_EQUAL) {

Lines 1-5 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/flow/ConditionalFlowInfo.java (-1 / +11 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2009 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 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 214-217 Link Here
214	return this.initsWhenTrue.unconditionalCopy().	214	return this.initsWhenTrue.unconditionalCopy().
215	mergedWith(this.initsWhenFalse.unconditionalInits());	215	mergedWith(this.initsWhenFalse.unconditionalInits());
216	}	216	}
		217
		218	public void markedAsNullOrNonNullInAssertExpression(LocalVariableBinding local) {
		219	this.initsWhenTrue.markedAsNullOrNonNullInAssertExpression(local);
		220	this.initsWhenFalse.markedAsNullOrNonNullInAssertExpression(local);
		221	}
		222
		223	public boolean isMarkedAsNullOrNonNullInAssertExpression(LocalVariableBinding local) {
		224	return (this.initsWhenTrue.isMarkedAsNullOrNonNullInAssertExpression(local)
		225	\|\| this.initsWhenFalse.isMarkedAsNullOrNonNullInAssertExpression(local));
		226	}
217	}	227	}

Lines 228-239 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/flow/FinallyFlowContext.java (-8 / +24 lines)
228	if (!this.hideNullComparisonWarnings) {	228	if (!this.hideNullComparisonWarnings) {
229	scope.problemReporter().localVariableRedundantCheckOnNonNull(local, reference);	229	scope.problemReporter().localVariableRedundantCheckOnNonNull(local, reference);
230	}	230	}
231	flowInfo.initsWhenFalse().setReachMode(FlowInfo.UNREACHABLE);	231	if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {
		232	flowInfo.initsWhenFalse().setReachMode(FlowInfo.UNREACHABLE);
		233	}
232	} else if (checkType == (CAN_ONLY_NULL_NON_NULL \| IN_COMPARISON_NULL)) {	234	} else if (checkType == (CAN_ONLY_NULL_NON_NULL \| IN_COMPARISON_NULL)) {
233	if (!this.hideNullComparisonWarnings) {	235	if (!this.hideNullComparisonWarnings) {
234	scope.problemReporter().localVariableNonNullComparedToNull(local, reference);	236	scope.problemReporter().localVariableNonNullComparedToNull(local, reference);
235	}	237	}
236	flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE);	238	if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {
		239	flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE);
		240	}
237	}	241	}
238	return;	242	return;
239	}	243	}
Lines 247-253 Link Here
247	if (!this.hideNullComparisonWarnings) {	251	if (!this.hideNullComparisonWarnings) {
248	scope.problemReporter().localVariableRedundantCheckOnNull(local, reference);	252	scope.problemReporter().localVariableRedundantCheckOnNull(local, reference);
249	}	253	}
250	flowInfo.initsWhenFalse().setReachMode(FlowInfo.UNREACHABLE);	254	if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {
		255	flowInfo.initsWhenFalse().setReachMode(FlowInfo.UNREACHABLE);
		256	}
251	return;	257	return;
252	case FlowContext.IN_COMPARISON_NON_NULL:	258	case FlowContext.IN_COMPARISON_NON_NULL:
253	if (((checkType & CHECK_MASK) == CAN_ONLY_NULL) && (reference.implicitConversion & TypeIds.UNBOXING) != 0) { // check for auto-unboxing first and report appropriate warning	259	if (((checkType & CHECK_MASK) == CAN_ONLY_NULL) && (reference.implicitConversion & TypeIds.UNBOXING) != 0) { // check for auto-unboxing first and report appropriate warning
Lines 257-263 Link Here
257	if (!this.hideNullComparisonWarnings) {	263	if (!this.hideNullComparisonWarnings) {
258	scope.problemReporter().localVariableNullComparedToNonNull(local, reference);	264	scope.problemReporter().localVariableNullComparedToNonNull(local, reference);
259	}	265	}
260	flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE);	266	if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {
		267	flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE);
		268	}
261	return;	269	return;
262	case FlowContext.IN_ASSIGNMENT:	270	case FlowContext.IN_ASSIGNMENT:
263	scope.problemReporter().localVariableRedundantNullAssignment(local, reference);	271	scope.problemReporter().localVariableRedundantNullAssignment(local, reference);
Lines 305-316 Link Here
305	if (!this.hideNullComparisonWarnings) {	313	if (!this.hideNullComparisonWarnings) {
306	scope.problemReporter().localVariableRedundantCheckOnNonNull(local, reference);	314	scope.problemReporter().localVariableRedundantCheckOnNonNull(local, reference);
307	}	315	}
308	flowInfo.initsWhenFalse().setReachMode(FlowInfo.UNREACHABLE);	316	if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {
		317	flowInfo.initsWhenFalse().setReachMode(FlowInfo.UNREACHABLE);
		318	}
309	} else {	319	} else {
310	if (!this.hideNullComparisonWarnings) {	320	if (!this.hideNullComparisonWarnings) {
311	scope.problemReporter().localVariableNonNullComparedToNull(local, reference);	321	scope.problemReporter().localVariableNonNullComparedToNull(local, reference);
312	}	322	}
313	flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE);	323	if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {
		324	flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE);
		325	}
314	}	326	}
315	return;	327	return;
316	}	328	}
Lines 329-335 Link Here
329	if (!this.hideNullComparisonWarnings) {	341	if (!this.hideNullComparisonWarnings) {
330	scope.problemReporter().localVariableRedundantCheckOnNull(local, reference);	342	scope.problemReporter().localVariableRedundantCheckOnNull(local, reference);
331	}	343	}
332	flowInfo.initsWhenFalse().setReachMode(FlowInfo.UNREACHABLE);	344	if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {
		345	flowInfo.initsWhenFalse().setReachMode(FlowInfo.UNREACHABLE);
		346	}
333	return;	347	return;
334	case FlowContext.IN_COMPARISON_NON_NULL:	348	case FlowContext.IN_COMPARISON_NON_NULL:
335	if (((checkType & CHECK_MASK) == CAN_ONLY_NULL) && (reference.implicitConversion & TypeIds.UNBOXING) != 0) { // check for auto-unboxing first and report appropriate warning	349	if (((checkType & CHECK_MASK) == CAN_ONLY_NULL) && (reference.implicitConversion & TypeIds.UNBOXING) != 0) { // check for auto-unboxing first and report appropriate warning
Lines 339-345 Link Here
339	if (!this.hideNullComparisonWarnings) {	353	if (!this.hideNullComparisonWarnings) {
340	scope.problemReporter().localVariableNullComparedToNonNull(local, reference);	354	scope.problemReporter().localVariableNullComparedToNonNull(local, reference);
341	}	355	}
342	flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE);	356	if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {
		357	flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE);
		358	}
343	return;	359	return;
344	case FlowContext.IN_ASSIGNMENT:	360	case FlowContext.IN_ASSIGNMENT:
345	scope.problemReporter().localVariableRedundantNullAssignment(local, reference);	361	scope.problemReporter().localVariableRedundantNullAssignment(local, reference);

Lines 550-561 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/flow/FlowContext.java (-4 / +12 lines)
550	if (!this.hideNullComparisonWarnings) {	550	if (!this.hideNullComparisonWarnings) {
551	scope.problemReporter().localVariableRedundantCheckOnNonNull(local, reference);	551	scope.problemReporter().localVariableRedundantCheckOnNonNull(local, reference);
552	}	552	}
553	flowInfo.initsWhenFalse().setReachMode(FlowInfo.UNREACHABLE);	553	if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {
		554	flowInfo.initsWhenFalse().setReachMode(FlowInfo.UNREACHABLE);
		555	}
554	} else {	556	} else {
555	if (!this.hideNullComparisonWarnings) {	557	if (!this.hideNullComparisonWarnings) {
556	scope.problemReporter().localVariableNonNullComparedToNull(local, reference);	558	scope.problemReporter().localVariableNonNullComparedToNull(local, reference);
557	}	559	}
558	flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE);	560	if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {
		561	flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE);
		562	}
559	}	563	}
560	return;	564	return;
561	}	565	}
Lines 577-583 Link Here
577	if (!this.hideNullComparisonWarnings) {	581	if (!this.hideNullComparisonWarnings) {
578	scope.problemReporter().localVariableRedundantCheckOnNull(local, reference);	582	scope.problemReporter().localVariableRedundantCheckOnNull(local, reference);
579	}	583	}
580	flowInfo.initsWhenFalse().setReachMode(FlowInfo.UNREACHABLE);	584	if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {
		585	flowInfo.initsWhenFalse().setReachMode(FlowInfo.UNREACHABLE);
		586	}
581	return;	587	return;
582	case FlowContext.IN_COMPARISON_NON_NULL:	588	case FlowContext.IN_COMPARISON_NON_NULL:
583	if (((checkType & CHECK_MASK) == CAN_ONLY_NULL) && (reference.implicitConversion & TypeIds.UNBOXING) != 0) { // check for auto-unboxing first and report appropriate warning	589	if (((checkType & CHECK_MASK) == CAN_ONLY_NULL) && (reference.implicitConversion & TypeIds.UNBOXING) != 0) { // check for auto-unboxing first and report appropriate warning
Lines 587-593 Link Here
587	if (!this.hideNullComparisonWarnings) {	593	if (!this.hideNullComparisonWarnings) {
588	scope.problemReporter().localVariableNullComparedToNonNull(local, reference);	594	scope.problemReporter().localVariableNullComparedToNonNull(local, reference);
589	}	595	}
590	flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE);	596	if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {
		597	flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE);
		598	}
591	return;	599	return;
592	case FlowContext.IN_ASSIGNMENT:	600	case FlowContext.IN_ASSIGNMENT:
593	scope.problemReporter().localVariableRedundantNullAssignment(local, reference);	601	scope.problemReporter().localVariableRedundantNullAssignment(local, reference);




 * @return a flow info carrying this unconditional flow info
 */
abstract public UnconditionalFlowInfo unconditionalInitsWithoutSideEffect();

/**
 * Tell the flowInfo that a local variable got marked as non null or null
 * due to comparison with null inside an assert expression.
 * This is to prevent over-aggressive code generation for subsequent if statements
 * where this variable is being checked against null
 */
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=303448
abstract public void markedAsNullOrNonNullInAssertExpression(LocalVariableBinding local);

/** 
 * Returns true if the local variable being checked for was marked as null or not null
 * inside an assert expression due to comparison against null.
 */
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=303448
abstract public boolean isMarkedAsNullOrNonNullInAssertExpression(LocalVariableBinding local);
}

Lines 473-496 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/flow/LoopingFlowContext.java (-6 / +18 lines)
473	if (!this.hideNullComparisonWarnings) {	473	if (!this.hideNullComparisonWarnings) {
474	scope.problemReporter().localVariableRedundantCheckOnNonNull(local, reference);	474	scope.problemReporter().localVariableRedundantCheckOnNonNull(local, reference);
475	}	475	}
476	flowInfo.initsWhenFalse().setReachMode(FlowInfo.UNREACHABLE);	476	if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {
		477	flowInfo.initsWhenFalse().setReachMode(FlowInfo.UNREACHABLE);
		478	}
477	} else {	479	} else {
478	if (!this.hideNullComparisonWarnings) {	480	if (!this.hideNullComparisonWarnings) {
479	scope.problemReporter().localVariableNonNullComparedToNull(local, reference);	481	scope.problemReporter().localVariableNonNullComparedToNull(local, reference);
480	}	482	}
481	flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE);	483	if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {
		484	flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE);
		485	}
482	}	486	}
483	} else if (flowInfo.isDefinitelyNull(local)) {	487	} else if (flowInfo.isDefinitelyNull(local)) {
484	if (checkType == (CAN_ONLY_NULL_NON_NULL \| IN_COMPARISON_NULL)) {	488	if (checkType == (CAN_ONLY_NULL_NON_NULL \| IN_COMPARISON_NULL)) {
485	if (!this.hideNullComparisonWarnings) {	489	if (!this.hideNullComparisonWarnings) {
486	scope.problemReporter().localVariableRedundantCheckOnNull(local, reference);	490	scope.problemReporter().localVariableRedundantCheckOnNull(local, reference);
487	}	491	}
488	flowInfo.initsWhenFalse().setReachMode(FlowInfo.UNREACHABLE);	492	if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {
		493	flowInfo.initsWhenFalse().setReachMode(FlowInfo.UNREACHABLE);
		494	}
489	} else {	495	} else {
490	if (!this.hideNullComparisonWarnings) {	496	if (!this.hideNullComparisonWarnings) {
491	scope.problemReporter().localVariableNullComparedToNonNull(local, reference);	497	scope.problemReporter().localVariableNullComparedToNonNull(local, reference);
492	}	498	}
493	flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE);	499	if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {
		500	flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE);
		501	}
494	}	502	}
495	} else if (this.upstreamNullFlowInfo.isDefinitelyNonNull(local) && !flowInfo.isPotentiallyNull(local)) { // https://bugs.eclipse.org/bugs/show_bug.cgi?id=291418	503	} else if (this.upstreamNullFlowInfo.isDefinitelyNonNull(local) && !flowInfo.isPotentiallyNull(local)) { // https://bugs.eclipse.org/bugs/show_bug.cgi?id=291418
496	flowInfo.markAsDefinitelyNonNull(local);	504	flowInfo.markAsDefinitelyNonNull(local);
Lines 525-531 Link Here
525	if (!this.hideNullComparisonWarnings) {	533	if (!this.hideNullComparisonWarnings) {
526	scope.problemReporter().localVariableRedundantCheckOnNull(local, reference);	534	scope.problemReporter().localVariableRedundantCheckOnNull(local, reference);
527	}	535	}
528	flowInfo.initsWhenFalse().setReachMode(FlowInfo.UNREACHABLE);	536	if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {
		537	flowInfo.initsWhenFalse().setReachMode(FlowInfo.UNREACHABLE);
		538	}
529	return;	539	return;
530	case FlowContext.IN_COMPARISON_NON_NULL:	540	case FlowContext.IN_COMPARISON_NON_NULL:
531	if (((checkType & CHECK_MASK) == CAN_ONLY_NULL) && (reference.implicitConversion & TypeIds.UNBOXING) != 0) { // check for auto-unboxing first and report appropriate warning	541	if (((checkType & CHECK_MASK) == CAN_ONLY_NULL) && (reference.implicitConversion & TypeIds.UNBOXING) != 0) { // check for auto-unboxing first and report appropriate warning
Lines 535-541 Link Here
535	if (!this.hideNullComparisonWarnings) {	545	if (!this.hideNullComparisonWarnings) {
536	scope.problemReporter().localVariableNullComparedToNonNull(local, reference);	546	scope.problemReporter().localVariableNullComparedToNonNull(local, reference);
537	}	547	}
538	flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE);	548	if (!flowInfo.isMarkedAsNullOrNonNullInAssertExpression(local)) {
		549	flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE);
		550	}
539	return;	551	return;
540	case FlowContext.IN_ASSIGNMENT:	552	case FlowContext.IN_ASSIGNMENT:
541	scope.problemReporter().localVariableRedundantNullAssignment(local, reference);	553	scope.problemReporter().localVariableRedundantNullAssignment(local, reference);




/*******************************************************************************
 * Copyright (c) 2000, 2010 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


	// Constants
	public static final int BitCacheSize = 64; // 64 bits in a long.
	public int nullStatusChangedInAssert[];		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=303448

public FlowInfo addInitializationsFrom(FlowInfo inits) {
	if (this == DEAD_END)

			}
		}
	}
	combineNullStatusChangeInAssertInfo(otherInits);
	return this;
}


			}
		}
	}
	combineNullStatusChangeInAssertInfo(otherInits);
	if (thisHasNulls) {
		this.tagBits |= NULL_FLAG_MASK;
	}

			}
		}
	}
	copy.nullStatusChangedInAssert = this.nullStatusChangedInAssert;
	return copy;
}


			}
		}
	}
	combineNullStatusChangeInAssertInfo(otherInits);
	if (thisHasNulls) {
		this.tagBits |= NULL_FLAG_MASK;
	}

		copy.nullBit3 = this.nullBit3 & mask;
		copy.nullBit4 = this.nullBit4 & mask;
	}
	copy.nullStatusChangedInAssert = this.nullStatusChangedInAssert;
	// use extra vector
	if (this.extra == null) {
		return copy; // if vector not yet allocated, then not initialized

public UnconditionalFlowInfo unconditionalInitsWithoutSideEffect() {
	return this;
}

public void markedAsNullOrNonNullInAssertExpression(LocalVariableBinding local) {
	int position = local.id + this.maxFieldCount;
	int oldLength;
	if (this.nullStatusChangedInAssert == null) {
		this.nullStatusChangedInAssert = new int[position + 1];
	}
	else {
		if(position >= (oldLength = this.nullStatusChangedInAssert.length)) {
			System.arraycopy(this.nullStatusChangedInAssert, 0, (this.nullStatusChangedInAssert = new int[position + 1]), 0, oldLength); 
		}
	}
	this.nullStatusChangedInAssert[position] = 1;
}

public boolean isMarkedAsNullOrNonNullInAssertExpression(LocalVariableBinding local) {
	int position = local.id + this.maxFieldCount;
	if(this.nullStatusChangedInAssert == null || position >= this.nullStatusChangedInAssert.length) {
		return false;
	}
	if(this.nullStatusChangedInAssert[position] == 1) {
		return true;
	}
	return false;
}

/**
 * Combine the null status changes in assert expressions info
 * @param otherInits
 */
// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=303448
private void combineNullStatusChangeInAssertInfo(UnconditionalFlowInfo otherInits) {
	if (this.nullStatusChangedInAssert != null || otherInits.nullStatusChangedInAssert != null) {
		int mergedLength, length;
		if (this.nullStatusChangedInAssert != null) {
			if (otherInits.nullStatusChangedInAssert != null) {
				if(otherInits.nullStatusChangedInAssert.length > this.nullStatusChangedInAssert.length) {
					mergedLength = otherInits.nullStatusChangedInAssert.length;
					length = this.nullStatusChangedInAssert.length;
					System.arraycopy(this.nullStatusChangedInAssert, 0, (this.nullStatusChangedInAssert = new int[mergedLength]), 0, length);
					for(int i = 0; i < length; i ++) {
						this.nullStatusChangedInAssert[i] |= otherInits.nullStatusChangedInAssert[i];
					}
					System.arraycopy(otherInits.nullStatusChangedInAssert, length, this.nullStatusChangedInAssert, length, mergedLength - length);
				} else {
					for(int i = 0; i < otherInits.nullStatusChangedInAssert.length; i ++) {
						this.nullStatusChangedInAssert[i] |= otherInits.nullStatusChangedInAssert[i];
					}
				}
			}
		} else if (otherInits.nullStatusChangedInAssert != null) {
			this.nullStatusChangedInAssert = otherInits.nullStatusChangedInAssert;
		}
	}
}
}





		},
		"SUCCESS");
}

// https://bugs.eclipse.org/bugs/show_bug.cgi?id=303448
// To check that code gen is not optimized for an if statement
// where a local variable's definite nullness or otherwise is known because of
// an earlier assert expression
public void testBug303448a() throws Exception {
	if (this.complianceLevel >= ClassFileConstants.JDK1_4) {
		this.runConformTest(
			new String[] {
				"X.java",
				"public class X {\n" +
				"	public void foo(String[] args, Object foo) {\n" +
				"		assert foo != null;" +
				"		if (foo!= null) {\n" +
				"			System.out.println(\"foo is not null\");\n" +
				"		} else {\n" +
				"			System.out.println(\"foo is null\");\n" +
				"		}\n" +
				"	}\n" +
				"}\n",
			},
			"",
			null,
			true,
			null,
			getCompilerOptions(),
			null); // custom requestor
	
		String expectedOutput = this.complianceLevel < ClassFileConstants.JDK1_5 ?
				"  // Method descriptor #49 ([Ljava/lang/String;Ljava/lang/Object;)V\n" + 
				"  // Stack: 2, Locals: 3\n" + 
				"  public void foo(java.lang.String[] args, java.lang.Object foo);\n" + 
				"     0  getstatic X.$assertionsDisabled : boolean [38]\n" + 
				"     3  ifne 18\n" + 
				"     6  aload_2 [foo]\n" + 
				"     7  ifnonnull 18\n" + 
				"    10  new java.lang.AssertionError [50]\n" + 
				"    13  dup\n" + 
				"    14  invokespecial java.lang.AssertionError() [52]\n" + 
				"    17  athrow\n" + 
				"    18  aload_2 [foo]\n" + 
				"    19  ifnull 33\n" + 
				"    22  getstatic java.lang.System.out : java.io.PrintStream [53]\n" + 
				"    25  ldc <String \"foo is not null\"> [59]\n" + 
				"    27  invokevirtual java.io.PrintStream.println(java.lang.String) : void [61]\n" + 
				"    30  goto 41\n" + 
				"    33  getstatic java.lang.System.out : java.io.PrintStream [53]\n" + 
				"    36  ldc <String \"foo is null\"> [66]\n" + 
				"    38  invokevirtual java.io.PrintStream.println(java.lang.String) : void [61]\n" + 
				"    41  return\n" + 
				"      Line numbers:\n" + 
				"        [pc: 0, line: 3]\n" + 
				"        [pc: 22, line: 4]\n" + 
				"        [pc: 33, line: 6]\n" + 
				"        [pc: 41, line: 8]\n" + 
				"      Local variable table:\n" + 
				"        [pc: 0, pc: 42] local: this index: 0 type: X\n" + 
				"        [pc: 0, pc: 42] local: args index: 1 type: java.lang.String[]\n" + 
				"        [pc: 0, pc: 42] local: foo index: 2 type: java.lang.Object\n"
			:	this.complianceLevel < ClassFileConstants.JDK1_6 ?
					"  // Method descriptor #26 ([Ljava/lang/String;Ljava/lang/Object;)V\n" + 
					"  // Stack: 2, Locals: 3\n" + 
					"  public void foo(java.lang.String[] args, java.lang.Object foo);\n" + 
					"     0  getstatic X.$assertionsDisabled : boolean [16]\n" + 
					"     3  ifne 18\n" + 
					"     6  aload_2 [foo]\n" + 
					"     7  ifnonnull 18\n" + 
					"    10  new java.lang.AssertionError [27]\n" + 
					"    13  dup\n" + 
					"    14  invokespecial java.lang.AssertionError() [29]\n" + 
					"    17  athrow\n" + 
					"    18  aload_2 [foo]\n" + 
					"    19  ifnull 33\n" + 
					"    22  getstatic java.lang.System.out : java.io.PrintStream [30]\n" + 
					"    25  ldc <String \"foo is not null\"> [36]\n" + 
					"    27  invokevirtual java.io.PrintStream.println(java.lang.String) : void [38]\n" + 
					"    30  goto 41\n" + 
					"    33  getstatic java.lang.System.out : java.io.PrintStream [30]\n" + 
					"    36  ldc <String \"foo is null\"> [44]\n" + 
					"    38  invokevirtual java.io.PrintStream.println(java.lang.String) : void [38]\n" + 
					"    41  return\n" + 
					"      Line numbers:\n" + 
					"        [pc: 0, line: 3]\n" + 
					"        [pc: 22, line: 4]\n" + 
					"        [pc: 33, line: 6]\n" + 
					"        [pc: 41, line: 8]\n" + 
					"      Local variable table:\n" + 
					"        [pc: 0, pc: 42] local: this index: 0 type: X\n" + 
					"        [pc: 0, pc: 42] local: args index: 1 type: java.lang.String[]\n" + 
					"        [pc: 0, pc: 42] local: foo index: 2 type: java.lang.Object\n"
				:	"  // Method descriptor #27 ([Ljava/lang/String;Ljava/lang/Object;)V\n" + 
					"  // Stack: 2, Locals: 3\n" + 
					"  public void foo(java.lang.String[] args, java.lang.Object foo);\n" + 
					"     0  getstatic X.$assertionsDisabled : boolean [16]\n" + 
					"     3  ifne 18\n" + 
					"     6  aload_2 [foo]\n" + 
					"     7  ifnonnull 18\n" + 
					"    10  new java.lang.AssertionError [28]\n" + 
					"    13  dup\n" + 
					"    14  invokespecial java.lang.AssertionError() [30]\n" + 
					"    17  athrow\n" + 
					"    18  aload_2 [foo]\n" + 
					"    19  ifnull 33\n" + 
					"    22  getstatic java.lang.System.out : java.io.PrintStream [31]\n" + 
					"    25  ldc <String \"foo is not null\"> [37]\n" + 
					"    27  invokevirtual java.io.PrintStream.println(java.lang.String) : void [39]\n" + 
					"    30  goto 41\n" + 
					"    33  getstatic java.lang.System.out : java.io.PrintStream [31]\n" + 
					"    36  ldc <String \"foo is null\"> [45]\n" + 
					"    38  invokevirtual java.io.PrintStream.println(java.lang.String) : void [39]\n" + 
					"    41  return\n" + 
					"      Line numbers:\n" + 
					"        [pc: 0, line: 3]\n" + 
					"        [pc: 22, line: 4]\n" + 
					"        [pc: 33, line: 6]\n" + 
					"        [pc: 41, line: 8]\n" + 
					"      Local variable table:\n" + 
					"        [pc: 0, pc: 42] local: this index: 0 type: X\n" + 
					"        [pc: 0, pc: 42] local: args index: 1 type: java.lang.String[]\n" + 
					"        [pc: 0, pc: 42] local: foo index: 2 type: java.lang.Object\n" + 
					"      Stack map table: number of frames 3\n" + 
					"        [pc: 18, same]\n" + 
					"        [pc: 33, same]\n" + 
					"        [pc: 41, same]\n" ;
		
		File f = new File(OUTPUT_DIR + File.separator + "X.class");
		byte[] classFileBytes = org.eclipse.jdt.internal.compiler.util.Util.getFileByteContent(f);
		ClassFileBytesDisassembler disassembler = ToolFactory.createDefaultClassFileBytesDisassembler();
		String result = disassembler.disassemble(classFileBytes, "\n", ClassFileBytesDisassembler.DETAILED);
		int index = result.indexOf(expectedOutput);
		if (index == -1 || expectedOutput.length() == 0) {
			System.out.println(Util.displayString(result, 3));
		}
		if (index == -1) {
			assertEquals("Wrong contents", expectedOutput, result);
		}
	}
}

// https://bugs.eclipse.org/bugs/show_bug.cgi?id=303448
// To check that code gen is not optimized for an if statement
// where a local variable's definite nullness or otherwise is known because of
// an earlier assert expression
public void testBug303448b() throws Exception {
	if (this.complianceLevel >= ClassFileConstants.JDK1_4) {
		this.runConformTest(
			new String[] {
				"X.java",
				"public class X {\n" +
				"	public void foo() {\n" +
				"		Object foo = null;\n" +
				"		Object foo2 = null;\n" +
				"		assert (foo != null && foo2 != null);\n" +
				"		if (foo != null) {\n" +
				"			System.out.println(\"foo is not null\");\n" +
				"		} else {\n" +
				"			System.out.println(\"foo is null\");\n" +
				"		}\n" +
				"		if (foo2 != null) {\n" +
				"			System.out.println(\"foo2 is not null\");\n" +
				"		} else {\n" +
				"			System.out.println(\"foo2 is null\");\n" +
				"		}\n" +
				"	}\n" +
				"}\n",
			},
			"",
			null,
			true,
			null,
			getCompilerOptions(),
			null); // custom requestor
	
		String expectedOutput = this.complianceLevel < ClassFileConstants.JDK1_5?
				"  // Method descriptor #11 ()V\n" + 
				"  // Stack: 2, Locals: 3\n" + 
				"  public void foo();\n" + 
				"     0  aconst_null\n" + 
				"     1  astore_1 [foo]\n" + 
				"     2  aconst_null\n" + 
				"     3  astore_2 [foo2]\n" + 
				"     4  getstatic X.$assertionsDisabled : boolean [38]\n" + 
				"     7  ifne 26\n" + 
				"    10  aload_1 [foo]\n" + 
				"    11  ifnull 18\n" + 
				"    14  aload_2 [foo2]\n" + 
				"    15  ifnonnull 26\n" + 
				"    18  new java.lang.AssertionError [49]\n" + 
				"    21  dup\n" + 
				"    22  invokespecial java.lang.AssertionError() [51]\n" + 
				"    25  athrow\n" + 
				"    26  aload_1 [foo]\n" + 
				"    27  ifnull 41\n" + 
				"    30  getstatic java.lang.System.out : java.io.PrintStream [52]\n" + 
				"    33  ldc <String \"foo is not null\"> [58]\n" + 
				"    35  invokevirtual java.io.PrintStream.println(java.lang.String) : void [60]\n" + 
				"    38  goto 49\n" + 
				"    41  getstatic java.lang.System.out : java.io.PrintStream [52]\n" + 
				"    44  ldc <String \"foo is null\"> [65]\n" + 
				"    46  invokevirtual java.io.PrintStream.println(java.lang.String) : void [60]\n" + 
				"    49  aload_2 [foo2]\n" + 
				"    50  ifnull 64\n" + 
				"    53  getstatic java.lang.System.out : java.io.PrintStream [52]\n" + 
				"    56  ldc <String \"foo2 is not null\"> [67]\n" + 
				"    58  invokevirtual java.io.PrintStream.println(java.lang.String) : void [60]\n" + 
				"    61  goto 72\n" + 
				"    64  getstatic java.lang.System.out : java.io.PrintStream [52]\n" + 
				"    67  ldc <String \"foo2 is null\"> [69]\n" + 
				"    69  invokevirtual java.io.PrintStream.println(java.lang.String) : void [60]\n" + 
				"    72  return\n" + 
				"      Line numbers:\n" + 
				"        [pc: 0, line: 3]\n" + 
				"        [pc: 2, line: 4]\n" + 
				"        [pc: 4, line: 5]\n" + 
				"        [pc: 26, line: 6]\n" + 
				"        [pc: 30, line: 7]\n" + 
				"        [pc: 41, line: 9]\n" + 
				"        [pc: 49, line: 11]\n" + 
				"        [pc: 53, line: 12]\n" + 
				"        [pc: 64, line: 14]\n" + 
				"        [pc: 72, line: 16]\n" + 
				"      Local variable table:\n" + 
				"        [pc: 0, pc: 73] local: this index: 0 type: X\n" + 
				"        [pc: 2, pc: 73] local: foo index: 1 type: java.lang.Object\n" + 
				"        [pc: 4, pc: 73] local: foo2 index: 2 type: java.lang.Object\n"
			: 	this.complianceLevel < ClassFileConstants.JDK1_6?
						"  // Method descriptor #8 ()V\n" + 
						"  // Stack: 2, Locals: 3\n" + 
						"  public void foo();\n" + 
						"     0  aconst_null\n" + 
						"     1  astore_1 [foo]\n" + 
						"     2  aconst_null\n" + 
						"     3  astore_2 [foo2]\n" + 
						"     4  getstatic X.$assertionsDisabled : boolean [16]\n" + 
						"     7  ifne 26\n" + 
						"    10  aload_1 [foo]\n" + 
						"    11  ifnull 18\n" + 
						"    14  aload_2 [foo2]\n" + 
						"    15  ifnonnull 26\n" + 
						"    18  new java.lang.AssertionError [26]\n" + 
						"    21  dup\n" + 
						"    22  invokespecial java.lang.AssertionError() [28]\n" + 
						"    25  athrow\n" + 
						"    26  aload_1 [foo]\n" + 
						"    27  ifnull 41\n" + 
						"    30  getstatic java.lang.System.out : java.io.PrintStream [29]\n" + 
						"    33  ldc <String \"foo is not null\"> [35]\n" + 
						"    35  invokevirtual java.io.PrintStream.println(java.lang.String) : void [37]\n" + 
						"    38  goto 49\n" + 
						"    41  getstatic java.lang.System.out : java.io.PrintStream [29]\n" + 
						"    44  ldc <String \"foo is null\"> [43]\n" + 
						"    46  invokevirtual java.io.PrintStream.println(java.lang.String) : void [37]\n" + 
						"    49  aload_2 [foo2]\n" + 
						"    50  ifnull 64\n" + 
						"    53  getstatic java.lang.System.out : java.io.PrintStream [29]\n" + 
						"    56  ldc <String \"foo2 is not null\"> [45]\n" + 
						"    58  invokevirtual java.io.PrintStream.println(java.lang.String) : void [37]\n" + 
						"    61  goto 72\n" + 
						"    64  getstatic java.lang.System.out : java.io.PrintStream [29]\n" + 
						"    67  ldc <String \"foo2 is null\"> [47]\n" + 
						"    69  invokevirtual java.io.PrintStream.println(java.lang.String) : void [37]\n" + 
						"    72  return\n" + 
						"      Line numbers:\n" + 
						"        [pc: 0, line: 3]\n" + 
						"        [pc: 2, line: 4]\n" + 
						"        [pc: 4, line: 5]\n" + 
						"        [pc: 26, line: 6]\n" + 
						"        [pc: 30, line: 7]\n" + 
						"        [pc: 41, line: 9]\n" + 
						"        [pc: 49, line: 11]\n" + 
						"        [pc: 53, line: 12]\n" + 
						"        [pc: 64, line: 14]\n" + 
						"        [pc: 72, line: 16]\n" + 
						"      Local variable table:\n" + 
						"        [pc: 0, pc: 73] local: this index: 0 type: X\n" + 
						"        [pc: 2, pc: 73] local: foo index: 1 type: java.lang.Object\n" + 
						"        [pc: 4, pc: 73] local: foo2 index: 2 type: java.lang.Object\n"
					:	"  // Method descriptor #8 ()V\n" + 
						"  // Stack: 2, Locals: 3\n" + 
						"  public void foo();\n" + 
						"     0  aconst_null\n" + 
						"     1  astore_1 [foo]\n" + 
						"     2  aconst_null\n" + 
						"     3  astore_2 [foo2]\n" + 
						"     4  getstatic X.$assertionsDisabled : boolean [16]\n" + 
						"     7  ifne 26\n" + 
						"    10  aload_1 [foo]\n" + 
						"    11  ifnull 18\n" + 
						"    14  aload_2 [foo2]\n" + 
						"    15  ifnonnull 26\n" + 
						"    18  new java.lang.AssertionError [27]\n" + 
						"    21  dup\n" + 
						"    22  invokespecial java.lang.AssertionError() [29]\n" + 
						"    25  athrow\n" + 
						"    26  aload_1 [foo]\n" + 
						"    27  ifnull 41\n" + 
						"    30  getstatic java.lang.System.out : java.io.PrintStream [30]\n" + 
						"    33  ldc <String \"foo is not null\"> [36]\n" + 
						"    35  invokevirtual java.io.PrintStream.println(java.lang.String) : void [38]\n" + 
						"    38  goto 49\n" + 
						"    41  getstatic java.lang.System.out : java.io.PrintStream [30]\n" + 
						"    44  ldc <String \"foo is null\"> [44]\n" + 
						"    46  invokevirtual java.io.PrintStream.println(java.lang.String) : void [38]\n" + 
						"    49  aload_2 [foo2]\n" + 
						"    50  ifnull 64\n" + 
						"    53  getstatic java.lang.System.out : java.io.PrintStream [30]\n" + 
						"    56  ldc <String \"foo2 is not null\"> [46]\n" + 
						"    58  invokevirtual java.io.PrintStream.println(java.lang.String) : void [38]\n" + 
						"    61  goto 72\n" + 
						"    64  getstatic java.lang.System.out : java.io.PrintStream [30]\n" + 
						"    67  ldc <String \"foo2 is null\"> [48]\n" + 
						"    69  invokevirtual java.io.PrintStream.println(java.lang.String) : void [38]\n" + 
						"    72  return\n" + 
						"      Line numbers:\n" + 
						"        [pc: 0, line: 3]\n" + 
						"        [pc: 2, line: 4]\n" + 
						"        [pc: 4, line: 5]\n" + 
						"        [pc: 26, line: 6]\n" + 
						"        [pc: 30, line: 7]\n" + 
						"        [pc: 41, line: 9]\n" + 
						"        [pc: 49, line: 11]\n" + 
						"        [pc: 53, line: 12]\n" + 
						"        [pc: 64, line: 14]\n" + 
						"        [pc: 72, line: 16]\n" + 
						"      Local variable table:\n" + 
						"        [pc: 0, pc: 73] local: this index: 0 type: X\n" + 
						"        [pc: 2, pc: 73] local: foo index: 1 type: java.lang.Object\n" + 
						"        [pc: 4, pc: 73] local: foo2 index: 2 type: java.lang.Object\n" + 
						"      Stack map table: number of frames 6\n" + 
						"        [pc: 18, append: {java.lang.Object, java.lang.Object}]\n" + 
						"        [pc: 26, same]\n" + 
						"        [pc: 41, same]\n" + 
						"        [pc: 49, same]\n" + 
						"        [pc: 64, same]\n" + 
						"        [pc: 72, same]\n";
		
		File f = new File(OUTPUT_DIR + File.separator + "X.class");
		byte[] classFileBytes = org.eclipse.jdt.internal.compiler.util.Util.getFileByteContent(f);
		ClassFileBytesDisassembler disassembler = ToolFactory.createDefaultClassFileBytesDisassembler();
		String result = disassembler.disassemble(classFileBytes, "\n", ClassFileBytesDisassembler.DETAILED);
		int index = result.indexOf(expectedOutput);
		if (index == -1 || expectedOutput.length() == 0) {
			System.out.println(Util.displayString(result, 3));
		}
		if (index == -1) {
			assertEquals("Wrong contents", expectedOutput, result);
		}
	}
}

// https://bugs.eclipse.org/bugs/show_bug.cgi?id=303448
// To check that code gen is not optimized for an if statement
// where a local variable's definite nullness or otherwise is known because of
// an earlier assert expression (inside looping context)
public void testBug303448c() throws Exception {
	if (this.complianceLevel >= ClassFileConstants.JDK1_4) {
		this.runConformTest(
			new String[] {
				"X.java",
				"public class X {\n" +
				"	public void foo() {\n" +
				"		Object foo = null;\n" +
				"		Object foo2 = null;\n" +
				"		while(true){\n" +
				"		assert (foo != null && foo2 != null);\n" +
				"		if (foo != null) {\n" +
				"			System.out.println(\"foo is not null\");\n" +
				"		} else {\n" +
				"			System.out.println(\"foo is null\");\n" +
				"		}\n" +
				"		if (foo2 != null) {\n" +
				"			System.out.println(\"foo2 is not null\");\n" +
				"		} else {\n" +
				"			System.out.println(\"foo2 is null\");\n" +
				"		}\n" +
				"		}\n" +
				"	}\n" +
				"}\n",
			},
			"",
			null,
			true,
			null,
			getCompilerOptions(),
			null); // custom requestor
	
		String expectedOutput = this.complianceLevel < ClassFileConstants.JDK1_5?
				"  // Method descriptor #11 ()V\n" + 
				"  // Stack: 2, Locals: 3\n" + 
				"  public void foo();\n" + 
				"     0  aconst_null\n" + 
				"     1  astore_1 [foo]\n" + 
				"     2  aconst_null\n" + 
				"     3  astore_2 [foo2]\n" + 
				"     4  getstatic X.$assertionsDisabled : boolean [38]\n" + 
				"     7  ifne 26\n" + 
				"    10  aload_1 [foo]\n" + 
				"    11  ifnull 18\n" + 
				"    14  aload_2 [foo2]\n" + 
				"    15  ifnonnull 26\n" + 
				"    18  new java.lang.AssertionError [49]\n" + 
				"    21  dup\n" + 
				"    22  invokespecial java.lang.AssertionError() [51]\n" + 
				"    25  athrow\n" + 
				"    26  aload_1 [foo]\n" + 
				"    27  ifnull 41\n" + 
				"    30  getstatic java.lang.System.out : java.io.PrintStream [52]\n" + 
				"    33  ldc <String \"foo is not null\"> [58]\n" + 
				"    35  invokevirtual java.io.PrintStream.println(java.lang.String) : void [60]\n" + 
				"    38  goto 49\n" + 
				"    41  getstatic java.lang.System.out : java.io.PrintStream [52]\n" + 
				"    44  ldc <String \"foo is null\"> [65]\n" + 
				"    46  invokevirtual java.io.PrintStream.println(java.lang.String) : void [60]\n" + 
				"    49  aload_2 [foo2]\n" + 
				"    50  ifnull 64\n" + 
				"    53  getstatic java.lang.System.out : java.io.PrintStream [52]\n" + 
				"    56  ldc <String \"foo2 is not null\"> [67]\n" + 
				"    58  invokevirtual java.io.PrintStream.println(java.lang.String) : void [60]\n" + 
				"    61  goto 4\n" + 
				"    64  getstatic java.lang.System.out : java.io.PrintStream [52]\n" + 
				"    67  ldc <String \"foo2 is null\"> [69]\n" + 
				"    69  invokevirtual java.io.PrintStream.println(java.lang.String) : void [60]\n" + 
				"    72  goto 4\n" + 
				"      Line numbers:\n" + 
				"        [pc: 0, line: 3]\n" + 
				"        [pc: 2, line: 4]\n" + 
				"        [pc: 4, line: 6]\n" + 
				"        [pc: 26, line: 7]\n" + 
				"        [pc: 30, line: 8]\n" + 
				"        [pc: 41, line: 10]\n" + 
				"        [pc: 49, line: 12]\n" + 
				"        [pc: 53, line: 13]\n" + 
				"        [pc: 64, line: 15]\n" + 
				"        [pc: 72, line: 5]\n" + 
				"      Local variable table:\n" + 
				"        [pc: 0, pc: 75] local: this index: 0 type: X\n" + 
				"        [pc: 2, pc: 75] local: foo index: 1 type: java.lang.Object\n" + 
				"        [pc: 4, pc: 75] local: foo2 index: 2 type: java.lang.Object\n"
			: 	this.complianceLevel < ClassFileConstants.JDK1_6?
						"  // Method descriptor #8 ()V\n" + 
						"  // Stack: 2, Locals: 3\n" + 
						"  public void foo();\n" + 
						"     0  aconst_null\n" + 
						"     1  astore_1 [foo]\n" + 
						"     2  aconst_null\n" + 
						"     3  astore_2 [foo2]\n" + 
						"     4  getstatic X.$assertionsDisabled : boolean [16]\n" + 
						"     7  ifne 26\n" + 
						"    10  aload_1 [foo]\n" + 
						"    11  ifnull 18\n" + 
						"    14  aload_2 [foo2]\n" + 
						"    15  ifnonnull 26\n" + 
						"    18  new java.lang.AssertionError [26]\n" + 
						"    21  dup\n" + 
						"    22  invokespecial java.lang.AssertionError() [28]\n" + 
						"    25  athrow\n" + 
						"    26  aload_1 [foo]\n" + 
						"    27  ifnull 41\n" + 
						"    30  getstatic java.lang.System.out : java.io.PrintStream [29]\n" + 
						"    33  ldc <String \"foo is not null\"> [35]\n" + 
						"    35  invokevirtual java.io.PrintStream.println(java.lang.String) : void [37]\n" + 
						"    38  goto 49\n" + 
						"    41  getstatic java.lang.System.out : java.io.PrintStream [29]\n" + 
						"    44  ldc <String \"foo is null\"> [43]\n" + 
						"    46  invokevirtual java.io.PrintStream.println(java.lang.String) : void [37]\n" + 
						"    49  aload_2 [foo2]\n" + 
						"    50  ifnull 64\n" + 
						"    53  getstatic java.lang.System.out : java.io.PrintStream [29]\n" + 
						"    56  ldc <String \"foo2 is not null\"> [45]\n" + 
						"    58  invokevirtual java.io.PrintStream.println(java.lang.String) : void [37]\n" + 
						"    61  goto 4\n" + 
						"    64  getstatic java.lang.System.out : java.io.PrintStream [29]\n" + 
						"    67  ldc <String \"foo2 is null\"> [47]\n" + 
						"    69  invokevirtual java.io.PrintStream.println(java.lang.String) : void [37]\n" + 
						"    72  goto 4\n" + 
						"      Line numbers:\n" + 
						"        [pc: 0, line: 3]\n" + 
						"        [pc: 2, line: 4]\n" + 
						"        [pc: 4, line: 6]\n" + 
						"        [pc: 26, line: 7]\n" + 
						"        [pc: 30, line: 8]\n" + 
						"        [pc: 41, line: 10]\n" + 
						"        [pc: 49, line: 12]\n" + 
						"        [pc: 53, line: 13]\n" + 
						"        [pc: 64, line: 15]\n" + 
						"        [pc: 72, line: 5]\n" + 
						"      Local variable table:\n" + 
						"        [pc: 0, pc: 75] local: this index: 0 type: X\n" + 
						"        [pc: 2, pc: 75] local: foo index: 1 type: java.lang.Object\n" + 
						"        [pc: 4, pc: 75] local: foo2 index: 2 type: java.lang.Object\n"
					:	"  // Method descriptor #8 ()V\n" + 
						"  // Stack: 2, Locals: 3\n" + 
						"  public void foo();\n" + 
						"     0  aconst_null\n" + 
						"     1  astore_1 [foo]\n" + 
						"     2  aconst_null\n" + 
						"     3  astore_2 [foo2]\n" + 
						"     4  getstatic X.$assertionsDisabled : boolean [16]\n" + 
						"     7  ifne 26\n" + 
						"    10  aload_1 [foo]\n" + 
						"    11  ifnull 18\n" + 
						"    14  aload_2 [foo2]\n" + 
						"    15  ifnonnull 26\n" + 
						"    18  new java.lang.AssertionError [27]\n" + 
						"    21  dup\n" + 
						"    22  invokespecial java.lang.AssertionError() [29]\n" + 
						"    25  athrow\n" + 
						"    26  aload_1 [foo]\n" + 
						"    27  ifnull 41\n" + 
						"    30  getstatic java.lang.System.out : java.io.PrintStream [30]\n" + 
						"    33  ldc <String \"foo is not null\"> [36]\n" + 
						"    35  invokevirtual java.io.PrintStream.println(java.lang.String) : void [38]\n" + 
						"    38  goto 49\n" + 
						"    41  getstatic java.lang.System.out : java.io.PrintStream [30]\n" + 
						"    44  ldc <String \"foo is null\"> [44]\n" + 
						"    46  invokevirtual java.io.PrintStream.println(java.lang.String) : void [38]\n" + 
						"    49  aload_2 [foo2]\n" + 
						"    50  ifnull 64\n" + 
						"    53  getstatic java.lang.System.out : java.io.PrintStream [30]\n" + 
						"    56  ldc <String \"foo2 is not null\"> [46]\n" + 
						"    58  invokevirtual java.io.PrintStream.println(java.lang.String) : void [38]\n" + 
						"    61  goto 4\n" + 
						"    64  getstatic java.lang.System.out : java.io.PrintStream [30]\n" + 
						"    67  ldc <String \"foo2 is null\"> [48]\n" + 
						"    69  invokevirtual java.io.PrintStream.println(java.lang.String) : void [38]\n" + 
						"    72  goto 4\n" + 
						"      Line numbers:\n" + 
						"        [pc: 0, line: 3]\n" + 
						"        [pc: 2, line: 4]\n" + 
						"        [pc: 4, line: 6]\n" + 
						"        [pc: 26, line: 7]\n" + 
						"        [pc: 30, line: 8]\n" + 
						"        [pc: 41, line: 10]\n" + 
						"        [pc: 49, line: 12]\n" + 
						"        [pc: 53, line: 13]\n" + 
						"        [pc: 64, line: 15]\n" + 
						"        [pc: 72, line: 5]\n" + 
						"      Local variable table:\n" + 
						"        [pc: 0, pc: 75] local: this index: 0 type: X\n" + 
						"        [pc: 2, pc: 75] local: foo index: 1 type: java.lang.Object\n" + 
						"        [pc: 4, pc: 75] local: foo2 index: 2 type: java.lang.Object\n" + 
						"      Stack map table: number of frames 7\n" + 
						"        [pc: 4, append: {java.lang.Object, java.lang.Object}]\n" + 
						"        [pc: 18, same]\n" + 
						"        [pc: 26, same]\n" + 
						"        [pc: 41, same]\n" + 
						"        [pc: 49, same]\n" + 
						"        [pc: 64, same]\n" + 
						"        [pc: 72, same]\n";
		
		File f = new File(OUTPUT_DIR + File.separator + "X.class");
		byte[] classFileBytes = org.eclipse.jdt.internal.compiler.util.Util.getFileByteContent(f);
		ClassFileBytesDisassembler disassembler = ToolFactory.createDefaultClassFileBytesDisassembler();
		String result = disassembler.disassemble(classFileBytes, "\n", ClassFileBytesDisassembler.DETAILED);
		int index = result.indexOf(expectedOutput);
		if (index == -1 || expectedOutput.length() == 0) {
			System.out.println(Util.displayString(result, 3));
		}
		if (index == -1) {
			assertEquals("Wrong contents", expectedOutput, result);
		}
	}
}

// https://bugs.eclipse.org/bugs/show_bug.cgi?id=303448
// To check that code gen is not optimized for an if statement
// where a local variable's definite nullness or otherwise is known because of
// an earlier assert expression (inside finally context)
public void testBug303448d() throws Exception {
	if (this.complianceLevel >= ClassFileConstants.JDK1_4) {
		this.runConformTest(
			new String[] {
				"X.java",
				"public class X {\n" +
				"	public void foo() {\n" +
				"		Object foo = null;\n" +
				"		Object foo2 = null;\n" +
				"		try {} \n" +
				"		finally {\n" +
				"		assert (foo != null && foo2 != null);\n" +
				"		if (foo != null) {\n" +
				"			System.out.println(\"foo is not null\");\n" +
				"		} else {\n" +
				"			System.out.println(\"foo is null\");\n" +
				"		}\n" +
				"		if (foo2 != null) {\n" +
				"			System.out.println(\"foo2 is not null\");\n" +
				"		} else {\n" +
				"			System.out.println(\"foo2 is null\");\n" +
				"		}\n" +
				"		}\n" +
				"	}\n" +
				"}\n",
			},
			"",
			null,
			true,
			null,
			getCompilerOptions(),
			null); // custom requestor
	
		String expectedOutput = this.complianceLevel < ClassFileConstants.JDK1_5?
				"  // Method descriptor #11 ()V\n" + 
				"  // Stack: 2, Locals: 3\n" + 
				"  public void foo();\n" + 
				"     0  aconst_null\n" + 
				"     1  astore_1 [foo]\n" + 
				"     2  aconst_null\n" + 
				"     3  astore_2 [foo2]\n" + 
				"     4  getstatic X.$assertionsDisabled : boolean [38]\n" + 
				"     7  ifne 26\n" + 
				"    10  aload_1 [foo]\n" + 
				"    11  ifnull 18\n" + 
				"    14  aload_2 [foo2]\n" + 
				"    15  ifnonnull 26\n" + 
				"    18  new java.lang.AssertionError [49]\n" + 
				"    21  dup\n" + 
				"    22  invokespecial java.lang.AssertionError() [51]\n" + 
				"    25  athrow\n" + 
				"    26  aload_1 [foo]\n" + 
				"    27  ifnull 41\n" + 
				"    30  getstatic java.lang.System.out : java.io.PrintStream [52]\n" + 
				"    33  ldc <String \"foo is not null\"> [58]\n" + 
				"    35  invokevirtual java.io.PrintStream.println(java.lang.String) : void [60]\n" + 
				"    38  goto 49\n" + 
				"    41  getstatic java.lang.System.out : java.io.PrintStream [52]\n" + 
				"    44  ldc <String \"foo is null\"> [65]\n" + 
				"    46  invokevirtual java.io.PrintStream.println(java.lang.String) : void [60]\n" + 
				"    49  aload_2 [foo2]\n" + 
				"    50  ifnull 64\n" + 
				"    53  getstatic java.lang.System.out : java.io.PrintStream [52]\n" + 
				"    56  ldc <String \"foo2 is not null\"> [67]\n" + 
				"    58  invokevirtual java.io.PrintStream.println(java.lang.String) : void [60]\n" + 
				"    61  goto 72\n" + 
				"    64  getstatic java.lang.System.out : java.io.PrintStream [52]\n" + 
				"    67  ldc <String \"foo2 is null\"> [69]\n" + 
				"    69  invokevirtual java.io.PrintStream.println(java.lang.String) : void [60]\n" + 
				"    72  return\n" + 
				"      Line numbers:\n" + 
				"        [pc: 0, line: 3]\n" + 
				"        [pc: 2, line: 4]\n" + 
				"        [pc: 4, line: 7]\n" + 
				"        [pc: 26, line: 8]\n" + 
				"        [pc: 30, line: 9]\n" + 
				"        [pc: 41, line: 11]\n" + 
				"        [pc: 49, line: 13]\n" + 
				"        [pc: 53, line: 14]\n" + 
				"        [pc: 64, line: 16]\n" + 
				"        [pc: 72, line: 19]\n" + 
				"      Local variable table:\n" + 
				"        [pc: 0, pc: 73] local: this index: 0 type: X\n" + 
				"        [pc: 2, pc: 73] local: foo index: 1 type: java.lang.Object\n" + 
				"        [pc: 4, pc: 73] local: foo2 index: 2 type: java.lang.Object\n"
			: 	this.complianceLevel < ClassFileConstants.JDK1_6?
						"  // Method descriptor #8 ()V\n" + 
						"  // Stack: 2, Locals: 3\n" + 
						"  public void foo();\n" + 
						"     0  aconst_null\n" + 
						"     1  astore_1 [foo]\n" + 
						"     2  aconst_null\n" + 
						"     3  astore_2 [foo2]\n" + 
						"     4  getstatic X.$assertionsDisabled : boolean [16]\n" + 
						"     7  ifne 26\n" + 
						"    10  aload_1 [foo]\n" + 
						"    11  ifnull 18\n" + 
						"    14  aload_2 [foo2]\n" + 
						"    15  ifnonnull 26\n" + 
						"    18  new java.lang.AssertionError [26]\n" + 
						"    21  dup\n" + 
						"    22  invokespecial java.lang.AssertionError() [28]\n" + 
						"    25  athrow\n" + 
						"    26  aload_1 [foo]\n" + 
						"    27  ifnull 41\n" + 
						"    30  getstatic java.lang.System.out : java.io.PrintStream [29]\n" + 
						"    33  ldc <String \"foo is not null\"> [35]\n" + 
						"    35  invokevirtual java.io.PrintStream.println(java.lang.String) : void [37]\n" + 
						"    38  goto 49\n" + 
						"    41  getstatic java.lang.System.out : java.io.PrintStream [29]\n" + 
						"    44  ldc <String \"foo is null\"> [43]\n" + 
						"    46  invokevirtual java.io.PrintStream.println(java.lang.String) : void [37]\n" + 
						"    49  aload_2 [foo2]\n" + 
						"    50  ifnull 64\n" + 
						"    53  getstatic java.lang.System.out : java.io.PrintStream [29]\n" + 
						"    56  ldc <String \"foo2 is not null\"> [45]\n" + 
						"    58  invokevirtual java.io.PrintStream.println(java.lang.String) : void [37]\n" + 
						"    61  goto 72\n" + 
						"    64  getstatic java.lang.System.out : java.io.PrintStream [29]\n" + 
						"    67  ldc <String \"foo2 is null\"> [47]\n" + 
						"    69  invokevirtual java.io.PrintStream.println(java.lang.String) : void [37]\n" + 
						"    72  return\n" + 
						"      Line numbers:\n" + 
						"        [pc: 0, line: 3]\n" + 
						"        [pc: 2, line: 4]\n" + 
						"        [pc: 4, line: 7]\n" + 
						"        [pc: 26, line: 8]\n" + 
						"        [pc: 30, line: 9]\n" + 
						"        [pc: 41, line: 11]\n" + 
						"        [pc: 49, line: 13]\n" + 
						"        [pc: 53, line: 14]\n" + 
						"        [pc: 64, line: 16]\n" + 
						"        [pc: 72, line: 19]\n" + 
						"      Local variable table:\n" + 
						"        [pc: 0, pc: 73] local: this index: 0 type: X\n" + 
						"        [pc: 2, pc: 73] local: foo index: 1 type: java.lang.Object\n" + 
						"        [pc: 4, pc: 73] local: foo2 index: 2 type: java.lang.Object\n"
					:	"  // Method descriptor #8 ()V\n" + 
						"  // Stack: 2, Locals: 3\n" + 
						"  public void foo();\n" + 
						"     0  aconst_null\n" + 
						"     1  astore_1 [foo]\n" + 
						"     2  aconst_null\n" + 
						"     3  astore_2 [foo2]\n" + 
						"     4  getstatic X.$assertionsDisabled : boolean [16]\n" + 
						"     7  ifne 26\n" + 
						"    10  aload_1 [foo]\n" + 
						"    11  ifnull 18\n" + 
						"    14  aload_2 [foo2]\n" + 
						"    15  ifnonnull 26\n" + 
						"    18  new java.lang.AssertionError [27]\n" + 
						"    21  dup\n" + 
						"    22  invokespecial java.lang.AssertionError() [29]\n" + 
						"    25  athrow\n" + 
						"    26  aload_1 [foo]\n" + 
						"    27  ifnull 41\n" + 
						"    30  getstatic java.lang.System.out : java.io.PrintStream [30]\n" + 
						"    33  ldc <String \"foo is not null\"> [36]\n" + 
						"    35  invokevirtual java.io.PrintStream.println(java.lang.String) : void [38]\n" + 
						"    38  goto 49\n" + 
						"    41  getstatic java.lang.System.out : java.io.PrintStream [30]\n" + 
						"    44  ldc <String \"foo is null\"> [44]\n" + 
						"    46  invokevirtual java.io.PrintStream.println(java.lang.String) : void [38]\n" + 
						"    49  aload_2 [foo2]\n" + 
						"    50  ifnull 64\n" + 
						"    53  getstatic java.lang.System.out : java.io.PrintStream [30]\n" + 
						"    56  ldc <String \"foo2 is not null\"> [46]\n" + 
						"    58  invokevirtual java.io.PrintStream.println(java.lang.String) : void [38]\n" + 
						"    61  goto 72\n" + 
						"    64  getstatic java.lang.System.out : java.io.PrintStream [30]\n" + 
						"    67  ldc <String \"foo2 is null\"> [48]\n" + 
						"    69  invokevirtual java.io.PrintStream.println(java.lang.String) : void [38]\n" + 
						"    72  return\n" + 
						"      Line numbers:\n" + 
						"        [pc: 0, line: 3]\n" + 
						"        [pc: 2, line: 4]\n" + 
						"        [pc: 4, line: 7]\n" + 
						"        [pc: 26, line: 8]\n" + 
						"        [pc: 30, line: 9]\n" + 
						"        [pc: 41, line: 11]\n" + 
						"        [pc: 49, line: 13]\n" + 
						"        [pc: 53, line: 14]\n" + 
						"        [pc: 64, line: 16]\n" + 
						"        [pc: 72, line: 19]\n" + 
						"      Local variable table:\n" + 
						"        [pc: 0, pc: 73] local: this index: 0 type: X\n" + 
						"        [pc: 2, pc: 73] local: foo index: 1 type: java.lang.Object\n" + 
						"        [pc: 4, pc: 73] local: foo2 index: 2 type: java.lang.Object\n" + 
						"      Stack map table: number of frames 6\n" + 
						"        [pc: 18, append: {java.lang.Object, java.lang.Object}]\n" + 
						"        [pc: 26, same]\n" + 
						"        [pc: 41, same]\n" + 
						"        [pc: 49, same]\n" + 
						"        [pc: 64, same]\n" + 
						"        [pc: 72, same]\n";
		
		File f = new File(OUTPUT_DIR + File.separator + "X.class");
		byte[] classFileBytes = org.eclipse.jdt.internal.compiler.util.Util.getFileByteContent(f);
		ClassFileBytesDisassembler disassembler = ToolFactory.createDefaultClassFileBytesDisassembler();
		String result = disassembler.disassemble(classFileBytes, "\n", ClassFileBytesDisassembler.DETAILED);
		int index = result.indexOf(expectedOutput);
		if (index == -1 || expectedOutput.length() == 0) {
			System.out.println(Util.displayString(result, 3));
		}
		if (index == -1) {
			assertEquals("Wrong contents", expectedOutput, result);
		}
	}
}

public static Class testClass() {
	return ConformTest.class;
}




			"	    ^^\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" +
			"	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" +

		"	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);
	}

		"	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);
	}

		"	if (foo == null) {}\n" + 
		"	    ^^^\n" + 
		"Null comparison always yields false: The variable foo cannot be null at this location\n" + 
		"----------\n" +  
		"2. ERROR in X.java (at line 8)\n" + 
		"	if (foo == null) {}\n" + 
		"	                 ^^\n" + 
		"Dead code\n" + 
		"----------\n" + 
		"3. ERROR in X.java (at line 8)\n" + 
		"	if (foo2 == null) {}\n" + 
		"	    ^^^^\n" + 
		"Redundant null check: The variable foo2 can only be null at this location\n" + 
		"----------\n" + 
		"3. ERROR in X.java (at line 11)\n" + 
		"	if (bar == null) {}\n" + 
		"	    ^^^\n" + 
		"Redundant null check: The variable bar can only be null at this location\n" + 
		"----------\n" + 
		"4. ERROR in X.java (at line 14)\n" + 
		"	if (bar2 == null) {}\n" + 
		"	    ^^^^\n" + 
		"Null comparison always yields false: The variable bar2 cannot be null at this location\n" + 
		"----------\n" + 
		"6. WARNING in X.java (at line 14)\n" + 
		"	if (bar2 == null) {}\n" + 
		"	                  ^^\n" + 
		"Dead code\n" + 
		"----------\n",
	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
	}

		"	    ^^^\n" + 
		"Null comparison always yields false: The variable foo cannot be null at this location\n" + 
		"----------\n" + 
		"2. ERROR in X.java (at line 11)\n" + 
		"	if (foo == null) {}\n" + 
		"	                 ^^\n" + 
		"Dead code\n" + 
		"----------\n" + 
		"3. ERROR in X.java (at line 11)\n" + 
		"	if (foo2 == null) {}\n" + 
		"	    ^^^^\n" + 
		"Redundant null check: The variable foo2 can only be null at this location\n" + 
		"----------\n" + 
		"3. ERROR in X.java (at line 13)\n" + 
		"	if (bar == null) {}\n" + 
		"	    ^^^\n" + 
		"Redundant null check: The variable bar can only be null at this location\n" + 
		"----------\n" + 
		"4. ERROR in X.java (at line 15)\n" + 
		"	if (bar2 == null) {}\n" + 
		"	    ^^^^\n" + 
		"Null comparison always yields false: The variable bar2 cannot be null at this location\n" + 
		"----------\n" + 
		"6. WARNING in X.java (at line 15)\n" + 
		"	if (bar2 == null) {}\n" + 
		"	                  ^^\n" + 
		"Dead code\n" + 
		"----------\n",
	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
	}

		"	    ^^^\n" + 
		"Null comparison always yields false: The variable foo cannot be null at this location\n" + 
		"----------\n" + 
		"2. ERROR in X.java (at line 9)\n" + 
		"	if (foo == null) {}\n" + 
		"	                 ^^\n" + 
		"Dead code\n" + 
		"----------\n" + 
		"3. ERROR in X.java (at line 9)\n" + 
		"	if (foo2 == null) {}\n" + 
		"	    ^^^^\n" + 
		"Redundant null check: The variable foo2 can only be null at this location\n" + 
		"----------\n" + 
		"3. ERROR in X.java (at line 12)\n" + 
		"	if (bar == null) {}\n" + 
		"	    ^^^\n" + 
		"Redundant null check: The variable bar can only be null at this location\n" + 
		"----------\n" + 
		"4. ERROR in X.java (at line 15)\n" + 
		"	if (bar2 == null) {}\n" + 
		"	    ^^^^\n" + 
		"Null comparison always yields false: The variable bar2 cannot be null at this location\n" + 
		"----------\n" + 
		"6. WARNING in X.java (at line 15)\n" + 
		"	if (bar2 == null) {}\n" + 
		"	                  ^^\n" + 
		"Dead code\n" + 
		"----------\n",
	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
	}

		"	    ^^^\n" +
		"Null comparison always yields false: The variable foo cannot be null at this location\n" +
		"----------\n" +
		"2. ERROR in X.java (at line 14)\n" +
		"	if (foo == null) {}\n" +
		"	                 ^^\n" +
		"Dead code\n" +
		"----------\n" +
		"3. ERROR in X.java (at line 14)\n" +
		"	if (foo2 == null) {}\n" +
		"	    ^^^^\n" +
		"Redundant null check: The variable foo2 can only be null at this location\n" +
		"----------\n" +
		"3. ERROR in X.java (at line 16)\n" +
		"	if (bar == null) {}\n" +
		"	    ^^^\n" +
		"Redundant null check: The variable bar can only be null at this location\n" +
		"----------\n" +
		"4. ERROR in X.java (at line 18)\n" +
		"	if (bar2 == null) {}\n" +
		"	    ^^^^\n" +
		"Null comparison always yields false: The variable bar2 cannot be null at this location\n" +
		"----------\n" +
		"6. WARNING in X.java (at line 18)\n" +
		"	if (bar2 == null) {}\n" +
		"	                  ^^\n" +
		"Dead code\n" +
		"----------\n",
	    JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
	}

Return to bug 303448

Lines 1-5 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/flow/UnconditionalFlowInfo.java (-1 / +62 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2009 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 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 84-89 Link Here
84		84
85	// Constants	85	// Constants
86	public static final int BitCacheSize = 64; // 64 bits in a long.	86	public static final int BitCacheSize = 64; // 64 bits in a long.
		87	public int nullStatusChangedInAssert[]; // https://bugs.eclipse.org/bugs/show_bug.cgi?id=303448
87		88
88	public FlowInfo addInitializationsFrom(FlowInfo inits) {	89	public FlowInfo addInitializationsFrom(FlowInfo inits) {
89	if (this == DEAD_END)	90	if (this == DEAD_END)
Lines 283-288 Link Here
283	}	284	}
284	}	285	}
285	}	286	}
		287	combineNullStatusChangeInAssertInfo(otherInits);
286	return this;	288	return this;
287	}	289	}
288		290
Lines 490-495 Link Here
490	}	492	}
491	}	493	}
492	}	494	}
		495	combineNullStatusChangeInAssertInfo(otherInits);
493	if (thisHasNulls) {	496	if (thisHasNulls) {
494	this.tagBits \|= NULL_FLAG_MASK;	497	this.tagBits \|= NULL_FLAG_MASK;
495	}	498	}
Lines 621-626 Link Here
621	}	624	}
622	}	625	}
623	}	626	}
		627	copy.nullStatusChangedInAssert = this.nullStatusChangedInAssert;
624	return copy;	628	return copy;
625	}	629	}
626		630
Lines 1571-1576 Link Here
1571	}	1575	}
1572	}	1576	}
1573	}	1577	}
		1578	combineNullStatusChangeInAssertInfo(otherInits);
1574	if (thisHasNulls) {	1579	if (thisHasNulls) {
1575	this.tagBits \|= NULL_FLAG_MASK;	1580	this.tagBits \|= NULL_FLAG_MASK;
1576	}	1581	}
Lines 1732-1737 Link Here
1732	copy.nullBit3 = this.nullBit3 & mask;	1737	copy.nullBit3 = this.nullBit3 & mask;
1733	copy.nullBit4 = this.nullBit4 & mask;	1738	copy.nullBit4 = this.nullBit4 & mask;
1734	}	1739	}
		1740	copy.nullStatusChangedInAssert = this.nullStatusChangedInAssert;
1735	// use extra vector	1741	// use extra vector
1736	if (this.extra == null) {	1742	if (this.extra == null) {
1737	return copy; // if vector not yet allocated, then not initialized	1743	return copy; // if vector not yet allocated, then not initialized
Lines 1774-1778 Link Here
1774	public UnconditionalFlowInfo unconditionalInitsWithoutSideEffect() {	1780	public UnconditionalFlowInfo unconditionalInitsWithoutSideEffect() {
1775	return this;	1781	return this;
1776	}	1782	}
		1783
		1784	public void markedAsNullOrNonNullInAssertExpression(LocalVariableBinding local) {
		1785	int position = local.id + this.maxFieldCount;
		1786	int oldLength;
		1787	if (this.nullStatusChangedInAssert == null) {
		1788	this.nullStatusChangedInAssert = new int[position + 1];
		1789	}
		1790	else {
		1791	if(position >= (oldLength = this.nullStatusChangedInAssert.length)) {
		1792	System.arraycopy(this.nullStatusChangedInAssert, 0, (this.nullStatusChangedInAssert = new int[position + 1]), 0, oldLength);
		1793	}
		1794	}
		1795	this.nullStatusChangedInAssert[position] = 1;
		1796	}
		1797
		1798	public boolean isMarkedAsNullOrNonNullInAssertExpression(LocalVariableBinding local) {
		1799	int position = local.id + this.maxFieldCount;
		1800	if(this.nullStatusChangedInAssert == null \|\| position >= this.nullStatusChangedInAssert.length) {
		1801	return false;
		1802	}
		1803	if(this.nullStatusChangedInAssert[position] == 1) {
		1804	return true;
		1805	}
		1806	return false;
		1807	}
		1808
		1809	/**
		1810	* Combine the null status changes in assert expressions info
		1811	* @param otherInits
		1812	*/
		1813	// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=303448
		1814	private void combineNullStatusChangeInAssertInfo(UnconditionalFlowInfo otherInits) {
		1815	if (this.nullStatusChangedInAssert != null \|\| otherInits.nullStatusChangedInAssert != null) {
		1816	int mergedLength, length;
		1817	if (this.nullStatusChangedInAssert != null) {
		1818	if (otherInits.nullStatusChangedInAssert != null) {
		1819	if(otherInits.nullStatusChangedInAssert.length > this.nullStatusChangedInAssert.length) {
		1820	mergedLength = otherInits.nullStatusChangedInAssert.length;
		1821	length = this.nullStatusChangedInAssert.length;
		1822	System.arraycopy(this.nullStatusChangedInAssert, 0, (this.nullStatusChangedInAssert = new int[mergedLength]), 0, length);
		1823	for(int i = 0; i < length; i ++) {
		1824	this.nullStatusChangedInAssert[i] \|= otherInits.nullStatusChangedInAssert[i];
		1825	}
		1826	System.arraycopy(otherInits.nullStatusChangedInAssert, length, this.nullStatusChangedInAssert, length, mergedLength - length);
		1827	} else {
		1828	for(int i = 0; i < otherInits.nullStatusChangedInAssert.length; i ++) {
		1829	this.nullStatusChangedInAssert[i] \|= otherInits.nullStatusChangedInAssert[i];
		1830	}
		1831	}
		1832	}
		1833	} else if (otherInits.nullStatusChangedInAssert != null) {
		1834	this.nullStatusChangedInAssert = otherInits.nullStatusChangedInAssert;
		1835	}
		1836	}
		1837	}
1777	}	1838	}
1778		1839

Lines 8232-8243 Link Here

(-)src/org/eclipse/jdt/core/tests/compiler/regression/NullReferenceTest.java (-69 / +14 lines)
8232	" ^^\n" +	8232	" ^^\n" +
8233	"Null comparison always yields false: The variable o1 cannot be null at this location\n" +	8233	"Null comparison always yields false: The variable o1 cannot be null at this location\n" +
8234	"----------\n" +	8234	"----------\n" +
8235	"2. WARNING in X.java (at line 4)\n" +	8235	"2. ERROR in X.java (at line 5)\n" +
8236	" if (o1 == null) { };\n" +
8237	" ^^^\n" +
8238	"Dead code\n" +
8239	"----------\n" +
8240	"3. ERROR in X.java (at line 5)\n" +
8241	" if (o2 == null) { };\n" +	8236	" if (o2 == null) { };\n" +
8242	" ^^\n" +	8237	" ^^\n" +
8243	"Redundant null check: The variable o2 can only be null at this location\n" +	8238	"Redundant null check: The variable o2 can only be null at this location\n" +
Lines 8286-8296 Link Here
8286	" if (o == null) { };\n" +	8281	" if (o == null) { };\n" +
8287	" ^\n" +	8282	" ^\n" +
8288	"Null comparison always yields false: The variable o cannot be null at this location\n" +	8283	"Null comparison always yields false: The variable o cannot be null at this location\n" +
8289	"----------\n" +
8290	"2. WARNING in X.java (at line 4)\n" +
8291	" if (o == null) { };\n" +
8292	" ^^^\n" +
8293	"Dead code\n" +
8294	"----------\n",	8284	"----------\n",
8295	JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);	8285	JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
8296	}	8286	}
Lines 8315-8325 Link Here
8315	" if (o == null) { };\n" +	8305	" if (o == null) { };\n" +
8316	" ^\n" +	8306	" ^\n" +
8317	"Null comparison always yields false: The variable o cannot be null at this location\n" +	8307	"Null comparison always yields false: The variable o cannot be null at this location\n" +
8318	"----------\n" +
8319	"2. WARNING in X.java (at line 5)\n" +
8320	" if (o == null) { };\n" +
8321	" ^^^\n" +
8322	"Dead code\n" +
8323	"----------\n",	8308	"----------\n",
8324	JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);	8309	JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
8325	}	8310	}
Lines 8354-8384 Link Here
8354	" if (foo == null) {}\n" +	8339	" if (foo == null) {}\n" +
8355	" ^^^\n" +	8340	" ^^^\n" +
8356	"Null comparison always yields false: The variable foo cannot be null at this location\n" +	8341	"Null comparison always yields false: The variable foo cannot be null at this location\n" +
8357	"----------\n" +	8342	"----------\n" +
8358	"2. WARNING in X.java (at line 5)\n" +	8343	"2. ERROR in X.java (at line 8)\n" +
8359	" if (foo == null) {}\n" +
8360	" ^^\n" +
8361	"Dead code\n" +
8362	"----------\n" +
8363	"3. ERROR in X.java (at line 8)\n" +
8364	" if (foo2 == null) {}\n" +	8344	" if (foo2 == null) {}\n" +
8365	" ^^^^\n" +	8345	" ^^^^\n" +
8366	"Redundant null check: The variable foo2 can only be null at this location\n" +	8346	"Redundant null check: The variable foo2 can only be null at this location\n" +
8367	"----------\n" +	8347	"----------\n" +
8368	"4. ERROR in X.java (at line 11)\n" +	8348	"3. ERROR in X.java (at line 11)\n" +
8369	" if (bar == null) {}\n" +	8349	" if (bar == null) {}\n" +
8370	" ^^^\n" +	8350	" ^^^\n" +
8371	"Redundant null check: The variable bar can only be null at this location\n" +	8351	"Redundant null check: The variable bar can only be null at this location\n" +
8372	"----------\n" +	8352	"----------\n" +
8373	"5. ERROR in X.java (at line 14)\n" +	8353	"4. ERROR in X.java (at line 14)\n" +
8374	" if (bar2 == null) {}\n" +	8354	" if (bar2 == null) {}\n" +
8375	" ^^^^\n" +	8355	" ^^^^\n" +
8376	"Null comparison always yields false: The variable bar2 cannot be null at this location\n" +	8356	"Null comparison always yields false: The variable bar2 cannot be null at this location\n" +
8377	"----------\n" +
8378	"6. WARNING in X.java (at line 14)\n" +
8379	" if (bar2 == null) {}\n" +
8380	" ^^\n" +
8381	"Dead code\n" +
8382	"----------\n",	8357	"----------\n",
8383	JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);	8358	JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
8384	}	8359	}
Lines 8454-8483 Link Here
8454	" ^^^\n" +	8429	" ^^^\n" +
8455	"Null comparison always yields false: The variable foo cannot be null at this location\n" +	8430	"Null comparison always yields false: The variable foo cannot be null at this location\n" +
8456	"----------\n" +	8431	"----------\n" +
8457	"2. WARNING in X.java (at line 9)\n" +	8432	"2. ERROR in X.java (at line 11)\n" +
8458	" if (foo == null) {}\n" +
8459	" ^^\n" +
8460	"Dead code\n" +
8461	"----------\n" +
8462	"3. ERROR in X.java (at line 11)\n" +
8463	" if (foo2 == null) {}\n" +	8433	" if (foo2 == null) {}\n" +
8464	" ^^^^\n" +	8434	" ^^^^\n" +
8465	"Redundant null check: The variable foo2 can only be null at this location\n" +	8435	"Redundant null check: The variable foo2 can only be null at this location\n" +
8466	"----------\n" +	8436	"----------\n" +
8467	"4. ERROR in X.java (at line 13)\n" +	8437	"3. ERROR in X.java (at line 13)\n" +
8468	" if (bar == null) {}\n" +	8438	" if (bar == null) {}\n" +
8469	" ^^^\n" +	8439	" ^^^\n" +
8470	"Redundant null check: The variable bar can only be null at this location\n" +	8440	"Redundant null check: The variable bar can only be null at this location\n" +
8471	"----------\n" +	8441	"----------\n" +
8472	"5. ERROR in X.java (at line 15)\n" +	8442	"4. ERROR in X.java (at line 15)\n" +
8473	" if (bar2 == null) {}\n" +	8443	" if (bar2 == null) {}\n" +
8474	" ^^^^\n" +	8444	" ^^^^\n" +
8475	"Null comparison always yields false: The variable bar2 cannot be null at this location\n" +	8445	"Null comparison always yields false: The variable bar2 cannot be null at this location\n" +
8476	"----------\n" +
8477	"6. WARNING in X.java (at line 15)\n" +
8478	" if (bar2 == null) {}\n" +
8479	" ^^\n" +
8480	"Dead code\n" +
8481	"----------\n",	8446	"----------\n",
8482	JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);	8447	JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
8483	}	8448	}
Lines 8515-8544 Link Here
8515	" ^^^\n" +	8480	" ^^^\n" +
8516	"Null comparison always yields false: The variable foo cannot be null at this location\n" +	8481	"Null comparison always yields false: The variable foo cannot be null at this location\n" +
8517	"----------\n" +	8482	"----------\n" +
8518	"2. WARNING in X.java (at line 6)\n" +	8483	"2. ERROR in X.java (at line 9)\n" +
8519	" if (foo == null) {}\n" +
8520	" ^^\n" +
8521	"Dead code\n" +
8522	"----------\n" +
8523	"3. ERROR in X.java (at line 9)\n" +
8524	" if (foo2 == null) {}\n" +	8484	" if (foo2 == null) {}\n" +
8525	" ^^^^\n" +	8485	" ^^^^\n" +
8526	"Redundant null check: The variable foo2 can only be null at this location\n" +	8486	"Redundant null check: The variable foo2 can only be null at this location\n" +
8527	"----------\n" +	8487	"----------\n" +
8528	"4. ERROR in X.java (at line 12)\n" +	8488	"3. ERROR in X.java (at line 12)\n" +
8529	" if (bar == null) {}\n" +	8489	" if (bar == null) {}\n" +
8530	" ^^^\n" +	8490	" ^^^\n" +
8531	"Redundant null check: The variable bar can only be null at this location\n" +	8491	"Redundant null check: The variable bar can only be null at this location\n" +
8532	"----------\n" +	8492	"----------\n" +
8533	"5. ERROR in X.java (at line 15)\n" +	8493	"4. ERROR in X.java (at line 15)\n" +
8534	" if (bar2 == null) {}\n" +	8494	" if (bar2 == null) {}\n" +
8535	" ^^^^\n" +	8495	" ^^^^\n" +
8536	"Null comparison always yields false: The variable bar2 cannot be null at this location\n" +	8496	"Null comparison always yields false: The variable bar2 cannot be null at this location\n" +
8537	"----------\n" +
8538	"6. WARNING in X.java (at line 15)\n" +
8539	" if (bar2 == null) {}\n" +
8540	" ^^\n" +
8541	"Dead code\n" +
8542	"----------\n",	8497	"----------\n",
8543	JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);	8498	JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
8544	}	8499	}
Lines 8579-8608 Link Here
8579	" ^^^\n" +	8534	" ^^^\n" +
8580	"Null comparison always yields false: The variable foo cannot be null at this location\n" +	8535	"Null comparison always yields false: The variable foo cannot be null at this location\n" +
8581	"----------\n" +	8536	"----------\n" +
8582	"2. WARNING in X.java (at line 12)\n" +	8537	"2. ERROR in X.java (at line 14)\n" +
8583	" if (foo == null) {}\n" +
8584	" ^^\n" +
8585	"Dead code\n" +
8586	"----------\n" +
8587	"3. ERROR in X.java (at line 14)\n" +
8588	" if (foo2 == null) {}\n" +	8538	" if (foo2 == null) {}\n" +
8589	" ^^^^\n" +	8539	" ^^^^\n" +
8590	"Redundant null check: The variable foo2 can only be null at this location\n" +	8540	"Redundant null check: The variable foo2 can only be null at this location\n" +
8591	"----------\n" +	8541	"----------\n" +
8592	"4. ERROR in X.java (at line 16)\n" +	8542	"3. ERROR in X.java (at line 16)\n" +
8593	" if (bar == null) {}\n" +	8543	" if (bar == null) {}\n" +
8594	" ^^^\n" +	8544	" ^^^\n" +
8595	"Redundant null check: The variable bar can only be null at this location\n" +	8545	"Redundant null check: The variable bar can only be null at this location\n" +
8596	"----------\n" +	8546	"----------\n" +
8597	"5. ERROR in X.java (at line 18)\n" +	8547	"4. ERROR in X.java (at line 18)\n" +
8598	" if (bar2 == null) {}\n" +	8548	" if (bar2 == null) {}\n" +
8599	" ^^^^\n" +	8549	" ^^^^\n" +
8600	"Null comparison always yields false: The variable bar2 cannot be null at this location\n" +	8550	"Null comparison always yields false: The variable bar2 cannot be null at this location\n" +
8601	"----------\n" +
8602	"6. WARNING in X.java (at line 18)\n" +
8603	" if (bar2 == null) {}\n" +
8604	" ^^\n" +
8605	"Dead code\n" +
8606	"----------\n",	8551	"----------\n",
8607	JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);	8552	JavacTestOptions.Excuse.EclipseWarningConfiguredAsError);
8608	}	8553	}

Lines 457-460 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/flow/FlowInfo.java (+16 lines)
457	* @return a flow info carrying this unconditional flow info	457	* @return a flow info carrying this unconditional flow info
458	*/	458	*/
459	abstract public UnconditionalFlowInfo unconditionalInitsWithoutSideEffect();	459	abstract public UnconditionalFlowInfo unconditionalInitsWithoutSideEffect();
		460
		461	/**
		462	* Tell the flowInfo that a local variable got marked as non null or null
		463	* due to comparison with null inside an assert expression.
		464	* This is to prevent over-aggressive code generation for subsequent if statements
		465	* where this variable is being checked against null
		466	*/
		467	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=303448
		468	abstract public void markedAsNullOrNonNullInAssertExpression(LocalVariableBinding local);
		469
		470	/**
		471	* Returns true if the local variable being checked for was marked as null or not null
		472	* inside an assert expression due to comparison against null.
		473	*/
		474	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=303448
		475	abstract public boolean isMarkedAsNullOrNonNullInAssertExpression(LocalVariableBinding local);
460	}	476	}