Attachment 61787 Details for Bug 177863 – Fix + test case

[patch] Fix + test case

patch.txt (text/plain), 9.36 KB, created by Maxime Daniel

on 2007-03-23 04:02:35 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Maxime Daniel

Created: 2007-03-23 04:02:35 EDT

Size: 9.36 KB

patch

obsolete

>Index: org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/FinallyFlowContext.java
>===================================================================
>--- org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/FinallyFlowContext.java	(revision 154)
>+++ org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/FinallyFlowContext.java	(working copy)
>@@ -179,106 +179,106 @@
> 
> 	public void recordUsingNullReference(Scope scope, LocalVariableBinding local, 
> 			Expression reference, int checkType, FlowInfo flowInfo) {
>-		if ((flowInfo.tagBits & FlowInfo.UNREACHABLE) == 0)	{
>-		if (deferNullDiagnostic) { // within an enclosing loop, be conservative
>-			switch (checkType) {
>-				case CAN_ONLY_NULL_NON_NULL | IN_COMPARISON_NULL:
>-				case CAN_ONLY_NULL_NON_NULL | IN_COMPARISON_NON_NULL:
>-				case CAN_ONLY_NULL | IN_COMPARISON_NULL:
>-				case CAN_ONLY_NULL | IN_COMPARISON_NON_NULL:
>-				case CAN_ONLY_NULL | IN_ASSIGNMENT:
>-				case CAN_ONLY_NULL | IN_INSTANCEOF:
>-					if (flowInfo.cannotBeNull(local)) {
>-						if (checkType == (CAN_ONLY_NULL_NON_NULL | IN_COMPARISON_NON_NULL)) {
>-							scope.problemReporter().localVariableRedundantCheckOnNonNull(local, reference);
>-						} else {
>-							scope.problemReporter().localVariableNonNullComparedToNull(local, reference);
>+		if ((flowInfo.tagBits & FlowInfo.UNREACHABLE) == 0 && !flowInfo.isDefinitelyUnknown(local))	{
>+			if (deferNullDiagnostic) { // within an enclosing loop, be conservative
>+				switch (checkType) {
>+					case CAN_ONLY_NULL_NON_NULL | IN_COMPARISON_NULL:
>+					case CAN_ONLY_NULL_NON_NULL | IN_COMPARISON_NON_NULL:
>+					case CAN_ONLY_NULL | IN_COMPARISON_NULL:
>+					case CAN_ONLY_NULL | IN_COMPARISON_NON_NULL:
>+					case CAN_ONLY_NULL | IN_ASSIGNMENT:
>+					case CAN_ONLY_NULL | IN_INSTANCEOF:
>+						if (flowInfo.cannotBeNull(local)) {
>+							if (checkType == (CAN_ONLY_NULL_NON_NULL | IN_COMPARISON_NON_NULL)) {
>+								scope.problemReporter().localVariableRedundantCheckOnNonNull(local, reference);
>+							} else {
>+								scope.problemReporter().localVariableNonNullComparedToNull(local, reference);
>+							}
>+							return;
> 						}
>-						return;
>-					}
>-					if (flowInfo.canOnlyBeNull(local)) {
>-						switch(checkType & CONTEXT_MASK) {
>-							case FlowContext.IN_COMPARISON_NULL:
>-								scope.problemReporter().localVariableRedundantCheckOnNull(local, reference);
>-								return;
>-							case FlowContext.IN_COMPARISON_NON_NULL:
>-								scope.problemReporter().localVariableNullComparedToNonNull(local, reference);
>-								return;
>-							case FlowContext.IN_ASSIGNMENT:
>-								scope.problemReporter().localVariableRedundantNullAssignment(local, reference);
>-								return;
>-							case FlowContext.IN_INSTANCEOF:
>-								scope.problemReporter().localVariableNullInstanceof(local, reference);
>-								return;
>+						if (flowInfo.canOnlyBeNull(local)) {
>+							switch(checkType & CONTEXT_MASK) {
>+								case FlowContext.IN_COMPARISON_NULL:
>+									scope.problemReporter().localVariableRedundantCheckOnNull(local, reference);
>+									return;
>+								case FlowContext.IN_COMPARISON_NON_NULL:
>+									scope.problemReporter().localVariableNullComparedToNonNull(local, reference);
>+									return;
>+								case FlowContext.IN_ASSIGNMENT:
>+									scope.problemReporter().localVariableRedundantNullAssignment(local, reference);
>+									return;
>+								case FlowContext.IN_INSTANCEOF:
>+									scope.problemReporter().localVariableNullInstanceof(local, reference);
>+									return;
>+							}
> 						}
>-					}
>-					break;
>-				case MAY_NULL :
>-					if (flowInfo.cannotBeNull(local)) {
>-						return;
>-					}
>-					if (flowInfo.canOnlyBeNull(local)) {
>-						scope.problemReporter().localVariableNullReference(local, reference);
>-						return;
>-					}
>-					break;
>-				default:
>-					// never happens
>+						break;
>+					case MAY_NULL :
>+						if (flowInfo.cannotBeNull(local)) {
>+							return;
>+						}
>+						if (flowInfo.canOnlyBeNull(local)) {
>+							scope.problemReporter().localVariableNullReference(local, reference);
>+							return;
>+						}
>+						break;
>+					default:
>+						// never happens
>+				}
> 			}
>-		}
>-		else { // no enclosing loop, be as precise as possible right now
>-			switch (checkType) {
>-				case CAN_ONLY_NULL_NON_NULL | IN_COMPARISON_NULL:
>-				case CAN_ONLY_NULL_NON_NULL | IN_COMPARISON_NON_NULL:
>-					if (flowInfo.isDefinitelyNonNull(local)) {
>-						if (checkType == (CAN_ONLY_NULL_NON_NULL | IN_COMPARISON_NON_NULL)) {
>-							scope.problemReporter().localVariableRedundantCheckOnNonNull(local, reference);
>-						} else {
>-							scope.problemReporter().localVariableNonNullComparedToNull(local, reference);
>+			else { // no enclosing loop, be as precise as possible right now
>+				switch (checkType) {
>+					case CAN_ONLY_NULL_NON_NULL | IN_COMPARISON_NULL:
>+					case CAN_ONLY_NULL_NON_NULL | IN_COMPARISON_NON_NULL:
>+						if (flowInfo.isDefinitelyNonNull(local)) {
>+							if (checkType == (CAN_ONLY_NULL_NON_NULL | IN_COMPARISON_NON_NULL)) {
>+								scope.problemReporter().localVariableRedundantCheckOnNonNull(local, reference);
>+							} else {
>+								scope.problemReporter().localVariableNonNullComparedToNull(local, reference);
>+							}
>+							return;
> 						}
>-						return;
>-					}
>-				case CAN_ONLY_NULL | IN_COMPARISON_NULL:
>-				case CAN_ONLY_NULL | IN_COMPARISON_NON_NULL:
>-				case CAN_ONLY_NULL | IN_ASSIGNMENT:
>-				case CAN_ONLY_NULL | IN_INSTANCEOF:
>-					if (flowInfo.isDefinitelyNull(local)) {
>-						switch(checkType & CONTEXT_MASK) {
>-							case FlowContext.IN_COMPARISON_NULL:
>-								scope.problemReporter().localVariableRedundantCheckOnNull(local, reference);
>-								return;
>-							case FlowContext.IN_COMPARISON_NON_NULL:
>-								scope.problemReporter().localVariableNullComparedToNonNull(local, reference);
>-								return;
>-							case FlowContext.IN_ASSIGNMENT:
>-								scope.problemReporter().localVariableRedundantNullAssignment(local, reference);
>-								return;
>-							case FlowContext.IN_INSTANCEOF:
>-								scope.problemReporter().localVariableNullInstanceof(local, reference);
>-								return;
>+					case CAN_ONLY_NULL | IN_COMPARISON_NULL:
>+					case CAN_ONLY_NULL | IN_COMPARISON_NON_NULL:
>+					case CAN_ONLY_NULL | IN_ASSIGNMENT:
>+					case CAN_ONLY_NULL | IN_INSTANCEOF:
>+						if (flowInfo.isDefinitelyNull(local)) {
>+							switch(checkType & CONTEXT_MASK) {
>+								case FlowContext.IN_COMPARISON_NULL:
>+									scope.problemReporter().localVariableRedundantCheckOnNull(local, reference);
>+									return;
>+								case FlowContext.IN_COMPARISON_NON_NULL:
>+									scope.problemReporter().localVariableNullComparedToNonNull(local, reference);
>+									return;
>+								case FlowContext.IN_ASSIGNMENT:
>+									scope.problemReporter().localVariableRedundantNullAssignment(local, reference);
>+									return;
>+								case FlowContext.IN_INSTANCEOF:
>+									scope.problemReporter().localVariableNullInstanceof(local, reference);
>+									return;
>+							}
> 						}
>-					}
>-					break;
>-				case MAY_NULL :
>-					if (flowInfo.isDefinitelyNull(local)) {
>-						scope.problemReporter().localVariableNullReference(local, reference);
>-						return;
>-					}
>-					if (flowInfo.isPotentiallyNull(local)) {
>-						scope.problemReporter().localVariablePotentialNullReference(local, reference);
>-						return;
>-					}
>-					if (flowInfo.isDefinitelyNonNull(local)) {
>-						return; // shortcut: cannot be null
>-					}
>-					break;
>-				default:
>-					// never happens
>+						break;
>+					case MAY_NULL :
>+						if (flowInfo.isDefinitelyNull(local)) {
>+							scope.problemReporter().localVariableNullReference(local, reference);
>+							return;
>+						}
>+						if (flowInfo.isPotentiallyNull(local)) {
>+							scope.problemReporter().localVariablePotentialNullReference(local, reference);
>+							return;
>+						}
>+						if (flowInfo.isDefinitelyNonNull(local)) {
>+							return; // shortcut: cannot be null
>+						}
>+						break;
>+					default:
>+						// never happens
>+				}
> 			}
>+			recordNullReference(local, reference, checkType); 
>+			// prepare to re-check with try/catch flow info
> 		}
>-		recordNullReference(local, reference, checkType); 
>-		// prepare to re-check with try/catch flow info
>-		}
> 	}
> 	
> 	void removeFinalAssignmentIfAny(Reference reference) {
>Index: org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullReferenceTest.java
>===================================================================
>--- org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullReferenceTest.java	(revision 154)
>+++ org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullReferenceTest.java	(working copy)
>@@ -4834,6 +4834,25 @@
> 		"----------\n");
> }
> 
>+// null analysis -- try/finally
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=177863
>+public void test0532_try_finally() {
>+	this.runConformTest(
>+		new String[] {
>+			"X.java",
>+			"public class X {\n" + 
>+			"  public void foo() {\n" + 
>+			"    Object o = null;\n" + 
>+			"    try {\n" + 
>+			"    } finally {\n" + 
>+			"      o = Object.class.getClass();\n" + 
>+			"      o.getClass();\n" + 
>+			"    }\n" + 
>+			"  }\n" + 
>+			"}"},
>+		"");
>+}
>+
> // null analysis -- try/catch
> public void test0550_try_catch() {
> 	this.runConformTest(

Actions: View | Diff

Attachments on bug 177863: 61787