View | Details | Raw Unified | Return to bug 313870 | Differences between
and this patch

Collapse All | Expand All

(-)compiler/org/eclipse/jdt/internal/compiler/flow/LoopingFlowContext.java (-2 / +2 lines)
Lines 1-5 Link Here
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 519-525 Link Here
519
						flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE);
519
						flowInfo.initsWhenTrue().setReachMode(FlowInfo.UNREACHABLE);
520
					}
520
					}
521
				}
521
				}
522
			} else if (this.upstreamNullFlowInfo.isDefinitelyNonNull(local) && !flowInfo.isPotentiallyNull(local)) {    // https://bugs.eclipse.org/bugs/show_bug.cgi?id=291418
522
			} else if (this.upstreamNullFlowInfo.isDefinitelyNonNull(local) && !flowInfo.isPotentiallyNull(local) && !flowInfo.isPotentiallyUnknown(local)) {    // https://bugs.eclipse.org/bugs/show_bug.cgi?id=291418
523
				flowInfo.markAsDefinitelyNonNull(local);
523
				flowInfo.markAsDefinitelyNonNull(local);
524
				if ((this.tagBits & FlowContext.HIDE_NULL_COMPARISON_WARNING) == 0) {
524
				if ((this.tagBits & FlowContext.HIDE_NULL_COMPARISON_WARNING) == 0) {
525
					recordNullReference(local, reference, checkType);
525
					recordNullReference(local, reference, checkType);

Return to bug 313870