Attachment 179730 Details for Bug 325342 – same fix with suggested changes

[patch] same fix with suggested changes

patch325342.txt (text/plain), 37.71 KB, created by Ayushman Jain

on 2010-09-28 08:08:40 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ayushman Jain

Created: 2010-09-28 08:08:40 EDT

Size: 37.71 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.compiler.tool
>Index: src/org/eclipse/jdt/internal/compiler/tool/Options.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.compiler.tool/src/org/eclipse/jdt/internal/compiler/tool/Options.java,v
>retrieving revision 1.13
>diff -u -r1.13 Options.java
>--- src/org/eclipse/jdt/internal/compiler/tool/Options.java	24 Sep 2010 06:30:58 -0000	1.13
>+++ src/org/eclipse/jdt/internal/compiler/tool/Options.java	28 Sep 2010 11:47:44 -0000
>@@ -168,6 +168,7 @@
> 						|| token.equals("forbidden")//$NON-NLS-1$
> 						|| token.equals("hashCode")//$NON-NLS-1$
> 						|| token.equals("hiding")//$NON-NLS-1$
>+						|| token.equals("includeAssertNull")//$NON-NLS-1$
> 						|| token.equals("incomplete-switch")//$NON-NLS-1$
> 						|| token.equals("indirectStatic")//$NON-NLS-1$
> 						|| token.equals("interfaceNonInherited")//$NON-NLS-1$
>@@ -195,7 +196,6 @@
> 						|| token.equals("staticReceiver")//$NON-NLS-1$
> 						|| token.equals("super")//$NON-NLS-1$
> 						|| token.equals("suppress")//$NON-NLS-1$
>-						|| token.equals("suppressAssertNull")//$NON-NLS-1$
> 						|| token.equals("syncOverride")//$NON-NLS-1$
> 						|| token.equals("synthetic-access")//$NON-NLS-1$
> 						|| token.equals("syntheticAccess")//$NON-NLS-1$
>#P org.eclipse.jdt.core
>Index: batch/org/eclipse/jdt/internal/compiler/batch/Main.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java,v
>retrieving revision 1.354
>diff -u -r1.354 Main.java
>--- batch/org/eclipse/jdt/internal/compiler/batch/Main.java	24 Sep 2010 06:30:57 -0000	1.354
>+++ batch/org/eclipse/jdt/internal/compiler/batch/Main.java	28 Sep 2010 11:47:46 -0000
>@@ -3333,7 +3333,12 @@
> 			} else if (token.equals("intfRedundant") /*|| token.equals("redundantSuperinterface")*/) { //$NON-NLS-1$
> 				setSeverity(CompilerOptions.OPTION_ReportRedundantSuperinterface, severity, isEnabling);
> 				return;
>-			}
>+			} else if (token.equals("includeAssertNull")) { //$NON-NLS-1$
>+				this.options.put(
>+						CompilerOptions.OPTION_IncludeNullInfoFromAsserts,
>+						isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED);
>+				return;
>+			} 
> 			break;
> 		case 'j' :
> 			if (token.equals("javadoc")) {//$NON-NLS-1$
>@@ -3456,12 +3461,7 @@
> 			} else if (token.equals("super")) { //$NON-NLS-1$
> 				setSeverity(CompilerOptions.OPTION_ReportOverridingMethodWithoutSuperInvocation, severity, isEnabling);
> 				return;
>-			} else if (token.equals("suppressAssertNull")) { //$NON-NLS-1$
>-				this.options.put(
>-						CompilerOptions.OPTION_SuppressNullInfoFromAsserts,
>-						isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED);
>-				return;
>-			} 
>+			}
> 			break;
> 		case 't' :
> 			if (token.startsWith("tasks")) { //$NON-NLS-1$
>Index: batch/org/eclipse/jdt/internal/compiler/batch/messages.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties,v
>retrieving revision 1.928
>diff -u -r1.928 messages.properties
>--- batch/org/eclipse/jdt/internal/compiler/batch/messages.properties	24 Sep 2010 06:30:57 -0000	1.928
>+++ batch/org/eclipse/jdt/internal/compiler/batch/messages.properties	28 Sep 2010 11:47:46 -0000
>@@ -288,6 +288,8 @@
> \ hashCode missing hashCode() method when overriding equals()\n\
> \ hiding macro for fieldHiding, localHiding, typeHiding and\n\
> \ maskedCatchBlock\n\
>+\	 includeAssertNull raise null warnings for variables\n\
>+\							that got tainted in an assert expression\n\
> \ incomplete-switch same as enumSwitch\n\
> \ indirectStatic indirect reference to static member\n\
> \ intfAnnotation + annotation type used as super interface\n\
>@@ -313,8 +315,7 @@
> \ suppress + enable @SuppressWarnings\n\
> \ When used with -err:, it can also silent optional\n\
> \ errors and warnings\n\
>-\	 suppressAssertNull suppress null warnings for variables\n\
>-\							that got tainted in an assert expression\n\
>+
> \ syncOverride missing synchronized in synchr. method override\n\
> \ syntheticAccess synthetic access for innerclass\n\
> \ tasks(<tags separated by |>) tasks identified by tags inside comments\n\
>Index: compiler/org/eclipse/jdt/internal/compiler/ast/AssertStatement.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/AssertStatement.java,v
>retrieving revision 1.64
>diff -u -r1.64 AssertStatement.java
>--- compiler/org/eclipse/jdt/internal/compiler/ast/AssertStatement.java	24 Sep 2010 06:30:57 -0000	1.64
>+++ compiler/org/eclipse/jdt/internal/compiler/ast/AssertStatement.java	28 Sep 2010 11:47:46 -0000
>@@ -84,9 +84,9 @@
> 		// expression downstream
> 	} else {
> 		CompilerOptions compilerOptions = currentScope.compilerOptions();
>-		if (compilerOptions.suppressNullInfoFromAsserts) {
>+		if (!compilerOptions.includeNullInfoFromAsserts) {
> 			// keep just the initializations info, don't include assert's null info
>-			return flowInfo.mergedWith(assertInfo.nullInfoLessUnconditionalCopy());
>+			return flowInfo.addInitializationsFrom(assertInfo.nullInfoLessUnconditionalCopy());
> 		}
> 		return flowInfo.mergedWith(assertInfo.nullInfoLessUnconditionalCopy()).
> 			addInitializationsFrom(assertWhenTrueInfo.discardInitializationInfo());
>Index: compiler/org/eclipse/jdt/internal/compiler/flow/UnconditionalFlowInfo.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/UnconditionalFlowInfo.java,v
>retrieving revision 1.69
>diff -u -r1.69 UnconditionalFlowInfo.java
>--- compiler/org/eclipse/jdt/internal/compiler/flow/UnconditionalFlowInfo.java	21 Sep 2010 06:32:55 -0000	1.69
>+++ compiler/org/eclipse/jdt/internal/compiler/flow/UnconditionalFlowInfo.java	28 Sep 2010 11:47:46 -0000
>@@ -1466,6 +1466,7 @@
> 				throw new AssertionFailedException("COVERAGE 28"); //$NON-NLS-1$
> 			}
> 		}
>+		combineNullStatusChangeInAssertInfo(otherInits);
> 		return this;
> 	}
> 	if ((this.tagBits & UNREACHABLE) != 0) {
>@@ -1474,6 +1475,7 @@
> 				throw new AssertionFailedException("COVERAGE 29"); //$NON-NLS-1$
> 			}
> 		}
>+		otherInits.combineNullStatusChangeInAssertInfo(this);
> 		return (UnconditionalFlowInfo) otherInits.copy(); // make sure otherInits won't be affected
> 	}
> 
>@@ -1761,6 +1763,7 @@
> 	copy.potentialInits = this.potentialInits;
> 	copy.tagBits = this.tagBits & ~NULL_FLAG_MASK;
> 	copy.maxFieldCount = this.maxFieldCount;
>+	copy.nullStatusChangedInAssert = this.nullStatusChangedInAssert;
> 	if (this.extra != null) {
> 		int length;
> 		copy.extra = new long[extraLength][];
>Index: compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java,v
>retrieving revision 1.232
>diff -u -r1.232 CompilerOptions.java
>--- compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java	24 Sep 2010 06:30:56 -0000	1.232
>+++ compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java	28 Sep 2010 11:47:46 -0000
>@@ -131,7 +131,7 @@
> 	public static final String OPTION_ReportDeadCodeInTrivialIfStatement = "org.eclipse.jdt.core.compiler.problem.deadCodeInTrivialIfStatement"; //$NON-NLS-1$
> 	public static final String OPTION_ReportTasks = "org.eclipse.jdt.core.compiler.problem.tasks"; //$NON-NLS-1$
> 	public static final String OPTION_ReportUnusedObjectAllocation = "org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation"; //$NON-NLS-1$
>-	public static final String OPTION_SuppressNullInfoFromAsserts = "org.eclipse.jdt.core.compiler.problem.suppressNullInfoFromAsserts"; //$NON-NLS-1$
>+	public static final String OPTION_IncludeNullInfoFromAsserts = "org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts"; //$NON-NLS-1$
> 	// Backward compatibility
> 	public static final String OPTION_ReportInvalidAnnotation = "org.eclipse.jdt.core.compiler.problem.invalidAnnotation"; //$NON-NLS-1$
> 	public static final String OPTION_ReportMissingAnnotation = "org.eclipse.jdt.core.compiler.problem.missingAnnotation"; //$NON-NLS-1$
>@@ -352,8 +352,8 @@
> 	public boolean generateClassFiles;
> 	/** Indicate if method bodies should be ignored */
> 	public boolean ignoreMethodBodies;
>-	/** Suppress null related warnings for variables tainted inside an assert statement (java 1.5 and above)*/
>-	public boolean suppressNullInfoFromAsserts;
>+	/** Raise null related warnings for variables tainted inside an assert statement (java 1.5 and above)*/
>+	public boolean includeNullInfoFromAsserts;
> 
> 	// keep in sync with warningTokenToIrritant and warningTokenFromIrritant
> 	public final static String[] warningTokens = {
>@@ -916,7 +916,7 @@
> 		optionsMap.put(OPTION_ReportDeadCodeInTrivialIfStatement, this.reportDeadCodeInTrivialIfStatement ? ENABLED : DISABLED);
> 		optionsMap.put(OPTION_ReportTasks, getSeverityString(Tasks));
> 		optionsMap.put(OPTION_ReportUnusedObjectAllocation, getSeverityString(UnusedObjectAllocation));
>-		optionsMap.put(OPTION_SuppressNullInfoFromAsserts, this.suppressNullInfoFromAsserts ? ENABLED : DISABLED);
>+		optionsMap.put(OPTION_IncludeNullInfoFromAsserts, this.includeNullInfoFromAsserts ? ENABLED : DISABLED);
> 		return optionsMap;
> 	}
> 
>@@ -1063,7 +1063,7 @@
> 		this.ignoreMethodBodies = false;
> 		
> 		// allow null info from asserts to be considered downstream by default
>-		this.suppressNullInfoFromAsserts = false;
>+		this.includeNullInfoFromAsserts = false;
> 	}
> 
> 	public void set(Map optionsMap) {
>@@ -1270,11 +1270,11 @@
> 				this.reportMissingOverrideAnnotationForInterfaceMethodImplementation = false;
> 			}
> 		}
>-		if ((optionValue = optionsMap.get(OPTION_SuppressNullInfoFromAsserts)) != null) {
>+		if ((optionValue = optionsMap.get(OPTION_IncludeNullInfoFromAsserts)) != null) {
> 			if (ENABLED.equals(optionValue)) {
>-				this.suppressNullInfoFromAsserts = true;
>+				this.includeNullInfoFromAsserts = true;
> 			} else if (DISABLED.equals(optionValue)) {
>-				this.suppressNullInfoFromAsserts = false;
>+				this.includeNullInfoFromAsserts = false;
> 			}
> 		}
> 		if ((optionValue = optionsMap.get(OPTION_ReportMethodWithConstructorName)) != null) updateSeverity(MethodWithConstructorName, optionValue);
>@@ -1519,7 +1519,7 @@
> 		buf.append("\n\t- missing @Override annotation for interface method implementation: ").append(this.reportMissingOverrideAnnotationForInterfaceMethodImplementation ? ENABLED : DISABLED); //$NON-NLS-1$
> 		buf.append("\n\t- missing @Deprecated annotation: ").append(getSeverityString(MissingDeprecatedAnnotation)); //$NON-NLS-1$
> 		buf.append("\n\t- incomplete enum switch: ").append(getSeverityString(IncompleteEnumSwitch)); //$NON-NLS-1$
>-		buf.append("\n\t- suppress null related warnings for variables tainted in assert statements: ").append(this.suppressNullInfoFromAsserts ? ENABLED : DISABLED); //$NON-NLS-1$
>+		buf.append("\n\t- raise null related warnings for variables tainted in assert statements: ").append(this.includeNullInfoFromAsserts ? ENABLED : DISABLED); //$NON-NLS-1$
> 		buf.append("\n\t- suppress warnings: ").append(this.suppressWarnings ? ENABLED : DISABLED); //$NON-NLS-1$
> 		buf.append("\n\t- suppress optional errors: ").append(this.suppressOptionalErrors ? ENABLED : DISABLED); //$NON-NLS-1$
> 		buf.append("\n\t- unhandled warning token: ").append(getSeverityString(UnhandledWarningToken)); //$NON-NLS-1$
>Index: model/org/eclipse/jdt/core/JavaCore.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java,v
>retrieving revision 1.653
>diff -u -r1.653 JavaCore.java
>--- model/org/eclipse/jdt/core/JavaCore.java	24 Sep 2010 06:30:56 -0000	1.653
>+++ model/org/eclipse/jdt/core/JavaCore.java	28 Sep 2010 11:47:47 -0000
>@@ -1427,20 +1427,20 @@
> 	 */
> 	public static final String COMPILER_PB_SUPPRESS_WARNINGS = PLUGIN_ID + ".compiler.problem.suppressWarnings"; //$NON-NLS-1$
> 	/**
>-	 * Compiler option ID: Suppress null related warnings arising because of assert statements.
>-	 * When enabled, the compiler will not flag null warnings on variables that got marked as maybe or definitely
>+	 * Compiler option ID: Suppress null related errors/warnings arising because of assert statements.
>+	 * When enabled, the compiler will not flag null errors/warnings on variables that got marked as maybe or definitely
> 	 * <code>null</code> in an assert statement upstream.
>-	 * When disabled, the compiler will flag all null related warnings that have been enabled by the user,
>+	 * When disabled, the compiler will flag all null related errors/warnings that have been enabled by the user,
> 	 * irrespective of whether a variable occurred in an assert statement.
> 	 * <dl>
>-	 * <dt>Option id:</dt><dd><code>"org.eclipse.jdt.core.compiler.problem.suppressNullInfoFromAsserts"</code></dd>
>+	 * <dt>Option id:</dt><dd><code>"org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts"</code></dd>
> 	 * <dt>Possible values:</dt><dd><code>{ "enabled", "disabled" }</code></dd>
> 	 * <dt>Default:</dt><dd><code>"disabled"</code></dd>
> 	 * </dl>
> 	 * @since 3.7
> 	 * @category CompilerOptionID
> 	 */
>-	public static final String COMPILER_PB_SUPPRESS_NULL_INFO_ASSERTS = PLUGIN_ID + ".compiler.problem.suppressNullInfoFromAsserts"; //$NON-NLS-1$
>+	public static final String COMPILER_PB_INCLUDE_ASSERTS_IN_NULL_ANALYSIS = PLUGIN_ID + ".compiler.problem.includeNullInfoFromAsserts"; //$NON-NLS-1$
> 	/**
> 	 * Compiler option ID: Further Determining the Effect of <code>@SuppressWarnings</code> if also
> 	 * {@link #COMPILER_PB_SUPPRESS_WARNINGS} is enabled.
>@@ -1488,7 +1488,9 @@
> 	 * Compiler option ID: Reporting Null Dereference.
> 	 * When enabled, the compiler will issue an error or a warning whenever a
> 	 * variable that is statically known to hold a null value is used to
>-	 * access a field or method.
>+	 * access a field or method.
>+	 * This diagnostic is further tuned in the presence of assert statements
>+	 * by the option {@link #COMPILER_PB_INCLUDE_ASSERTS_IN_NULL_ANALYSIS}
> 	 * <dl>
> 	 * <dt>Option id:</dt><dd><code>"org.eclipse.jdt.core.compiler.problem.nullReference"</code></dd>
> 	 * <dt>Possible values:</dt><dd><code>{ "error", "warning", "ignore" }</code></dd>
>@@ -1504,6 +1506,8 @@
> 	 * variable that has formerly been tested against null but is not (no more)
> 	 * statically known to hold a non-null value is used to access a field or
> 	 * method.
>+	* This diagnostic is further tuned in the presence of assert statements
>+	 * by the option {@link #COMPILER_PB_INCLUDE_ASSERTS_IN_NULL_ANALYSIS}
> 	 * <dl>
> 	 * <dt>Option id:</dt><dd><code>"org.eclipse.jdt.core.compiler.problem.potentialNullReference"</code></dd>
> 	 * <dt>Possible values:</dt><dd><code>{ "error", "warning", "ignore" }</code></dd>
>@@ -1518,6 +1522,8 @@
> 	 * When enabled, the compiler will issue an error or a warning whenever a
> 	 * variable that is statically known to hold a null or a non-null value
> 	 * is tested against null.
>+	 * This diagnostic is further tuned in the presence of assert statements
>+	 * by the option {@link #COMPILER_PB_INCLUDE_ASSERTS_IN_NULL_ANALYSIS}
> 	 * <dl>
> 	 * <dt>Option id:</dt><dd><code>"org.eclipse.jdt.core.compiler.problem.redundantNullCheck"</code></dd>
> 	 * <dt>Possible values:</dt><dd><code>{ "error", "warning", "ignore" }</code></dd>
>#P org.eclipse.jdt.core.tests.compiler
>Index: src/org/eclipse/jdt/core/tests/compiler/regression/BatchCompilerTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/BatchCompilerTest.java,v
>retrieving revision 1.211
>diff -u -r1.211 BatchCompilerTest.java
>--- src/org/eclipse/jdt/core/tests/compiler/regression/BatchCompilerTest.java	24 Sep 2010 06:30:50 -0000	1.211
>+++ src/org/eclipse/jdt/core/tests/compiler/regression/BatchCompilerTest.java	28 Sep 2010 11:47:50 -0000
>@@ -1652,86 +1652,65 @@
> "{0} {1}\n" +
> "{2}\n" +
> " \n" +
>- " Warning options:\n" +
>- " -deprecation + deprecation outside deprecated code\n" +
>- " -nowarn -warn:none disable all warnings\n" +
>- " -warn:<warnings separated by ,> enable exactly the listed warnings\n" +
>- " -warn:+<warnings separated by ,> enable additional warnings\n" +
>- " -warn:-<warnings separated by ,> disable specific warnings\n" +
>- " allDeadCode dead code including trivial if(DEBUG) check\n" +
>- " allDeprecation deprecation including inside deprecated code\n" +
>- " allJavadoc invalid or missing javadoc\n" +
>- " allOver-ann all missing @Override annotations\n" +
>- " assertIdentifier + ''assert'' used as identifier\n" +
>- " boxing autoboxing conversion\n" +
>- " charConcat + char[] in String concat\n" +
>- " compareIdentical + comparing identical expressions\n" +
>- " conditionAssign possible accidental boolean assignment\n" +
>- " constructorName + method with constructor name\n" +
>- " deadCode + dead code excluding trivial if (DEBUG) check\n" +
>- " dep-ann missing @Deprecated annotation\n" +
>- " deprecation + deprecation outside deprecated code\n" +
>- " discouraged + use of types matching a discouraged access rule\n" +
>- " emptyBlock undocumented empty block\n" +
>+ " Warning options:\n" + 
>+ " -deprecation + deprecation outside deprecated code\n" + 
>+ " -nowarn -warn:none disable all warnings\n" + 
>+ " -warn:<warnings separated by ,> enable exactly the listed warnings\n" + 
>+ " -warn:+<warnings separated by ,> enable additional warnings\n" + 
>+ " -warn:-<warnings separated by ,> disable specific warnings\n" + 
>+ " allDeadCode dead code including trivial if(DEBUG) check\n" + 
>+ " allDeprecation deprecation including inside deprecated code\n" + 
>+ " allJavadoc invalid or missing javadoc\n" + 
>+ " allOver-ann all missing @Override annotations\n" + 
>+ " assertIdentifier + ''assert'' used as identifier\n" + 
>+ " boxing autoboxing conversion\n" + 
>+ " charConcat + char[] in String concat\n" + 
>+ " compareIdentical + comparing identical expressions\n" + 
>+ " conditionAssign possible accidental boolean assignment\n" + 
>+ " constructorName + method with constructor name\n" + 
>+ " deadCode + dead code excluding trivial if (DEBUG) check\n" + 
>+ " dep-ann missing @Deprecated annotation\n" + 
>+ " deprecation + deprecation outside deprecated code\n" + 
>+ " discouraged + use of types matching a discouraged access rule\n" + 
>+ " emptyBlock undocumented empty block\n" + 
> " enumIdentifier ''enum'' used as identifier\n" + 
>- " enumSwitch incomplete enum switch\n" +
>- " fallthrough possible fall-through case\n" +
>- " fieldHiding field hiding another variable\n" +
>- " finalBound type parameter with final bound\n" +
>- " finally + finally block not completing normally\n" +
>- " forbidden + use of types matching a forbidden access rule\n" +
>+ " enumSwitch incomplete enum switch\n" + 
>+ " fallthrough possible fall-through case\n" + 
>+ " fieldHiding field hiding another variable\n" + 
>+ " finalBound type parameter with final bound\n" + 
>+ " finally + finally block not completing normally\n" + 
>+ " forbidden + use of types matching a forbidden access rule\n" + 
> " hashCode missing hashCode() method when overriding equals()\n" + 
>- " hiding macro for fieldHiding, localHiding, typeHiding and\n" +
>- " maskedCatchBlock\n" +
>- " incomplete-switch same as enumSwitch\n" +
>- " indirectStatic indirect reference to static member\n" +
>- " intfAnnotation + annotation type used as super interface\n" +
>- " intfNonInherited + interface non-inherited method compatibility\n" +
>+ " hiding macro for fieldHiding, localHiding, typeHiding and\n" + 
>+ " maskedCatchBlock\n" + 
>+ "	 includeAssertNull raise null warnings for variables\n" + 
>+ "							that got tainted in an assert expression\n" + 
>+ " incomplete-switch same as enumSwitch\n" + 
>+ " indirectStatic indirect reference to static member\n" + 
>+ " intfAnnotation + annotation type used as super interface\n" + 
>+ " intfNonInherited + interface non-inherited method compatibility\n" + 
> " intfRedundant find redundant superinterfaces\n" + 
>- " javadoc invalid javadoc\n" +
>- " localHiding local variable hiding another variable\n" +
>- " maskedCatchBlock + hidden catch block\n" +
>- " nls string literal lacking non-nls tag //$NON-NLS-<n>$\n" +
>- " noEffectAssign + assignment without effect\n" +
>- " null potential missing or redundant null check\n" +
>- " nullDereference + missing null check\n" +
>- " over-ann missing @Override annotation (superclass)\n" +
>- " paramAssign assignment to a parameter\n" +
>- " pkgDefaultMethod + attempt to override package-default method\n" +
>- " raw + usage of raw type\n" +
>- " semicolon unnecessary semicolon, empty statement\n" +
>- " serial + missing serialVersionUID\n" +
>- " specialParamHiding constructor or setter parameter hiding a field\n" +
>- " static-access macro for indirectStatic and staticReceiver\n" +
>- " staticReceiver + non-static reference to static member\n" +
>- " super overriding a method without making a super invocation\n" +
>+ " javadoc invalid javadoc\n" + 
>+ " localHiding local variable hiding another variable\n" + 
>+ " maskedCatchBlock + hidden catch block\n" + 
>+ " nls string literal lacking non-nls tag //$NON-NLS-<n>$\n" + 
>+ " noEffectAssign + assignment without effect\n" + 
>+ " null potential missing or redundant null check\n" + 
>+ " nullDereference + missing null check\n" + 
>+ " over-ann missing @Override annotation (superclass)\n" + 
>+ " paramAssign assignment to a parameter\n" + 
>+ " pkgDefaultMethod + attempt to override package-default method\n" + 
>+ " raw + usage of raw type\n" + 
>+ " semicolon unnecessary semicolon, empty statement\n" + 
>+ " serial + missing serialVersionUID\n" + 
>+ " specialParamHiding constructor or setter parameter hiding a field\n" + 
>+ " static-access macro for indirectStatic and staticReceiver\n" + 
>+ " staticReceiver + non-static reference to static member\n" + 
>+ " super overriding a method without making a super invocation\n" + 
> " suppress + enable @SuppressWarnings\n" + 
>- " When used with -err:, it can also silent optional\n" +
>- " errors and warnings\n" +
>- "	 suppressAssertNull suppress null warnings for variables\n" +
>- "							that got tainted in an assert expression\n" +
>- " syncOverride missing synchronized in synchr. method override\n" +
>- " syntheticAccess synthetic access for innerclass\n" +
>- " tasks(<tags separated by |>) tasks identified by tags inside comments\n" +
>- " typeHiding + type parameter hiding another type\n" +
>- " unchecked + unchecked type operation\n" +
>- " unnecessaryElse unnecessary else clause\n" +
>- " unqualifiedField unqualified reference to field\n" +
>- " unused macro for unusedAllocation, unusedArgument,\n" +
>- " unusedImport, unusedLabel, unusedLocal,\n" +
>- " unusedPrivate, unusedThrown, and unusedTypeArgs\n" +
>- " unusedAllocation allocating an object that is not used\n" +
>- " unusedArgument unread method parameter\n" +
>- " unusedImport + unused import declaration\n" +
>- " unusedLabel + unused label\n" +
>- " unusedLocal + unread local variable\n" +
>- " unusedPrivate + unused private member declaration\n" +
>- " unusedThrown unused declared thrown exception\n" +
>- " unusedTypeArgs + unused type arguments for method\n" +
>- " uselessTypeCheck unnecessary cast/instanceof operation\n" +
>- " varargsCast + varargs argument need explicit cast\n" +
>- " warningToken + unsupported or unnecessary @SuppressWarnings\n" +
>-		"\n";
>+ " When used with -err:, it can also silent optional\n" + 
>+ " errors and warnings\n" + 
>+ "\n";
> 	String expandedExpectedOutput =
> 		MessageFormat.format(expectedOutput, new String[] {
> 				MAIN.bind("compiler.name"),
>@@ -1819,6 +1798,7 @@
> 			"		<option key=\"org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally\" value=\"warning\"/>\n" + 
> 			"		<option key=\"org.eclipse.jdt.core.compiler.problem.forbiddenReference\" value=\"warning\"/>\n" + 
> 			"		<option key=\"org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock\" value=\"warning\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts\" value=\"disabled\"/>\n" + 
> 			"		<option key=\"org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod\" value=\"warning\"/>\n" + 
> 			"		<option key=\"org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch\" value=\"ignore\"/>\n" + 
> 			"		<option key=\"org.eclipse.jdt.core.compiler.problem.indirectStaticAccess\" value=\"ignore\"/>\n" + 
>@@ -1856,7 +1836,6 @@
> 			"		<option key=\"org.eclipse.jdt.core.compiler.problem.redundantSuperinterface\" value=\"ignore\"/>\n" + 
> 			"		<option key=\"org.eclipse.jdt.core.compiler.problem.specialParameterHidingField\" value=\"disabled\"/>\n" + 
> 			"		<option key=\"org.eclipse.jdt.core.compiler.problem.staticAccessReceiver\" value=\"warning\"/>\n" + 
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.suppressNullInfoFromAsserts\" value=\"disabled\"/>\n" + 
> 			"		<option key=\"org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors\" value=\"disabled\"/>\n" + 
> 			"		<option key=\"org.eclipse.jdt.core.compiler.problem.suppressWarnings\" value=\"enabled\"/>\n" + 
> 			"		<option key=\"org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation\" value=\"ignore\"/>\n" + 
>@@ -11129,7 +11108,9 @@
> }
> 
> // https://bugs.eclipse.org/bugs/show_bug.cgi?id=325342
>-// -warn option - regression tests to check option suppressAssertNull
>+// -warn option - regression tests to check option includeAssertNull
>+// No null problems arising from asserts should be reported here
>+// since includeAssertNull is not enabled
> public void test293_warn_options() {
> 	this.runConformTest(
> 		new String[] {
>@@ -11165,15 +11146,30 @@
> 		},
> 		"\"" + OUTPUT_DIR + File.separator + "X.java\""
> 		+ " -sourcepath \"" + OUTPUT_DIR + "\""
>-		+ " -warn:null,suppressAssertNull -1.5 -proc:none -d \"" + OUTPUT_DIR + "\"",
>+		+ " -warn:null,includeAssertNull -1.5 -proc:none -d \"" + OUTPUT_DIR + "\"",
> 		"",
>-		"----------\n" +
>-		"1. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/X.java (at line 10)\n" + 
>+		"----------\n" + 
>+		"1. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/X.java (at line 4)\n" + 
>+		"	if (a!=null) {\n" + 
>+		"	 ^\n" + 
>+		"Null comparison always yields false: The variable a can only be null at this location\n" + 
>+		"----------\n" + 
>+		"2. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/X.java (at line 10)\n" + 
> 		"	if (a== null) {}\n" + 
> 		"	 ^\n" + 
> 		"Redundant null check: The variable a can only be null at this location\n" + 
> 		"----------\n" + 
>-		"1 problem (1 warning)",
>+		"3. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/X.java (at line 12)\n" + 
>+		"	if (b!=null) {\n" + 
>+		"	 ^\n" + 
>+		"Redundant null check: The variable b cannot be null at this location\n" + 
>+		"----------\n" + 
>+		"4. WARNING in ---OUTPUT_DIR_PLACEHOLDER---/X.java (at line 18)\n" + 
>+		"	if (c.equals(a)) {\n" + 
>+		"	 ^\n" + 
>+		"Null pointer access: The variable c can only be null at this location\n" + 
>+		"----------\n" + 
>+		"4 problems (4 warnings)", 
> 		true);
> }
> //https://bugs.eclipse.org/bugs/show_bug.cgi?id=280784
>Index: src/org/eclipse/jdt/core/tests/compiler/regression/NullReferenceTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullReferenceTest.java,v
>retrieving revision 1.105
>diff -u -r1.105 NullReferenceTest.java
>--- src/org/eclipse/jdt/core/tests/compiler/regression/NullReferenceTest.java	24 Sep 2010 06:30:50 -0000	1.105
>+++ src/org/eclipse/jdt/core/tests/compiler/regression/NullReferenceTest.java	28 Sep 2010 11:47:52 -0000
>@@ -57,6 +57,7 @@
> 	 defaultOptions.put(CompilerOptions.OPTION_ReportPotentialNullReference, CompilerOptions.ERROR);
> 	 defaultOptions.put(CompilerOptions.OPTION_ReportRedundantNullCheck, CompilerOptions.ERROR);
> 		defaultOptions.put(CompilerOptions.OPTION_ReportRawTypeReference, CompilerOptions.IGNORE);
>+		defaultOptions.put(CompilerOptions.OPTION_IncludeNullInfoFromAsserts, CompilerOptions.ENABLED);
> }
> return defaultOptions;
> }
>@@ -13496,11 +13497,11 @@
> 
> // https://bugs.eclipse.org/bugs/show_bug.cgi?id=325342
> // Null warnings because of assert statements should be suppressed
>-// when CompilerOptions.OPTION_SuppressNullInfoFromAsserts is enabled.
>+// when CompilerOptions.OPTION_IncludeNullInfoFromAsserts is disabled.
> public void testBug325342a() {
> 	if (this.complianceLevel >= ClassFileConstants.JDK1_5) {
> 		Map compilerOptions = getCompilerOptions();
>-		compilerOptions.put(CompilerOptions.OPTION_SuppressNullInfoFromAsserts, CompilerOptions.ENABLED);
>+		compilerOptions.put(CompilerOptions.OPTION_IncludeNullInfoFromAsserts, CompilerOptions.DISABLED);
> 		this.runNegativeTest(
> 			new String[] {
> 				"Test.java",
>@@ -13546,11 +13547,11 @@
> 
> // https://bugs.eclipse.org/bugs/show_bug.cgi?id=325342
> // Null warnings because of assert statements should not be suppressed
>-// when CompilerOptions.OPTION_SuppressNullInfoFromAsserts is disabled.
>+// when CompilerOptions.OPTION_IncludeNullInfoFromAsserts is enabled.
> public void testBug325342b() {
> 	if (this.complianceLevel >= ClassFileConstants.JDK1_5) {
> 		Map compilerOptions = getCompilerOptions();
>-		compilerOptions.put(CompilerOptions.OPTION_SuppressNullInfoFromAsserts, CompilerOptions.DISABLED);
>+		compilerOptions.put(CompilerOptions.OPTION_IncludeNullInfoFromAsserts, CompilerOptions.ENABLED);
> 		this.runNegativeTest(
> 			new String[] {
> 				"Test.java",
>#P org.eclipse.jdt.doc.isv
>Index: guide/jdt_api_options.htm
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.doc.isv/guide/jdt_api_options.htm,v
>retrieving revision 1.75
>diff -u -r1.75 jdt_api_options.htm
>--- guide/jdt_api_options.htm	2 Jun 2010 13:02:29 -0000	1.75
>+++ guide/jdt_api_options.htm	28 Sep 2010 11:47:56 -0000
>@@ -503,6 +503,26 @@
> </tr>
> 
> <tr>
>+<td colspan=2><a name = "INCLUDE_ASSERTS_IN_NULL_ANALYSIS"></a>Reporting Null related problems as a consequnce of assert statements (<a href="../reference/api/org/eclipse/jdt/core/JavaCore.html#COMPILER_PB_INCLUDE_ASSERTS_IN_NULL_ANALYSIS">COMPILER_PB_INCLUDE_ASSERTS_IN_NULL_ANALYSIS</a>)</td>
>+</tr>
>+<tr valign="top">
>+<td rowspan=2>When enabled, the compiler will raise null related errors/warnings for 
>+ a variable that got marked as potentially/definitely <code>null</code> or 
>+ not <code>null</code> inside an assert statement, and whose null state has not
>+ been modified by any other statement following the assert.
>+ This option has an effect only when the compiler compliance is 1.5 or greater.
>+ Note that this option is only relevant in the context of the warnings raised
>+ by the options <a href="#REDUNDANT_NULL_CHECK">COMPILER_PB_REDUNDANT_NULL_CHECK</a>,
>+ <a href="#NULL_REFERENCE">COMPILER_PB_NULL_REFERENCE</a>, and 
>+ <a href="#POTENTIAL_NULL_REFERENCE">COMPILER_PB_POTENTIAL_NULL_REFERENCE</a> as a consequence of
>+ an assert statement.</td>
>+<td><a href="../reference/api/org/eclipse/jdt/core/JavaCore.html#ENABLED">ENABLED</a></td>
>+</tr>
>+<tr valign="top">
>+<td><a href="../reference/api/org/eclipse/jdt/core/JavaCore.html#DISABLED">DISABLED</a></td>
>+</tr>
>+
>+<tr>
> <td colspan=2>Reporting Interface Method not Compatible with non-Inherited Methods (<a href="../reference/api/org/eclipse/jdt/core/JavaCore.html#COMPILER_PB_INCOMPATIBLE_NON_INHERITED_INTERFACE_METHOD">COMPILER_PB_INCOMPATIBLE_NON_INHERITED_INTERFACE_METHOD</a>)</td>
> </tr>
> <tr valign="top">
>@@ -861,12 +881,15 @@
> </tr>
> 
> <tr>
>-<td colspan=2>Reporting Null Dereference (<a href="../reference/api/org/eclipse/jdt/core/JavaCore.html#COMPILER_PB_NULL_REFERENCE">COMPILER_PB_NULL_REFERENCE</a>)</td>
>+<td colspan=2><a name = "NULL_REFERENCE"></a>Reporting Null Dereference (<a href="../reference/api/org/eclipse/jdt/core/JavaCore.html#COMPILER_PB_NULL_REFERENCE">COMPILER_PB_NULL_REFERENCE</a>)</td>
> </tr>
> <tr valign="top">
> <td rowspan=3>When enabled, the compiler will issue an error or a warning 
> whenever a variable that is statically known to hold a null value is used to
>- access a field or method.</td>
>+ access a field or method.
>+ Warnings/errors raised due to this option arising as a consequence of asserts can be
>+ controlled by <a href = "#INCLUDE_ASSERTS_IN_NULL_ANALYSIS">COMPILER_PB_INCLUDE_ASSERTS_IN_NULL_ANALYSIS</a>
>+ (java 1.5 and greater)</td>
> <td><a href="../reference/api/org/eclipse/jdt/core/JavaCore.html#ERROR">ERROR</a></td>
> </tr>
> <tr valign="top">
>@@ -892,13 +915,16 @@
> </tr>
> 
> <tr>
>-<td colspan=2>Reporting Potential Null Dereference (<a href="../reference/api/org/eclipse/jdt/core/JavaCore.html#COMPILER_PB_POTENTIAL_NULL_REFERENCE">COMPILER_PB_POTENTIAL_NULL_REFERENCE</a>)</td>
>+<td colspan=2><a name = "POTENTIAL_NULL_REFERENCE"></a>Reporting Potential Null Dereference (<a href="../reference/api/org/eclipse/jdt/core/JavaCore.html#COMPILER_PB_POTENTIAL_NULL_REFERENCE">COMPILER_PB_POTENTIAL_NULL_REFERENCE</a>)</td>
> </tr>
> <tr valign="top">
> <td rowspan=3>When enabled, the compiler will issue an error or a warning 
> whenever a variable that has formerly been tested against null but is not (no 
> more) statically known to hold a non-null value is used to access a field or 
>- method.</td>
>+ method.
>+ Warnings/errors raised due to this option arising as a consequence of asserts can be
>+ controlled by <a href = "#INCLUDE_ASSERTS_IN_NULL_ANALYSIS">COMPILER_PB_INCLUDE_ASSERTS_IN_NULL_ANALYSIS</a>
>+ (java 1.5 and greater)</td>
> <td><a href="../reference/api/org/eclipse/jdt/core/JavaCore.html#ERROR">ERROR</a></td>
> </tr>
> <tr valign="top">
>@@ -909,13 +935,16 @@
> </tr>
> 
> <tr>
>-<td colspan=2>Reporting Redundant Null Check (<a href=
>+<td colspan=2><a name = "REDUNDANT_NULL_CHECK"></a>Reporting Redundant Null Check (<a href=
> "../reference/api/org/eclipse/jdt/core/JavaCore.html#COMPILER_PB_REDUNDANT_NULL_CHECK">COMPILER_PB_REDUNDANT_NULL_CHECK</a>)</td>
> </tr>
> <tr valign="top">
> <td rowspan=3>When enabled, the compiler will issue an error or a warning 
> whenever a variable that is statically known to hold a null or a non-null 
>- value is tested against null.</td>
>+ value is tested against null.
>+ Warnings/errors raised due to this option arising as a consequence of asserts can be
>+ controlled by <a href = "#INCLUDE_ASSERTS_IN_NULL_ANALYSIS">COMPILER_PB_INCLUDE_ASSERTS_IN_NULL_ANALYSIS</a>
>+ (java 1.5 and greater)</td>
> <td><a href="../reference/api/org/eclipse/jdt/core/JavaCore.html#ERROR">ERROR</a></td>
> </tr>
> <tr valign="top">

Actions: View | Diff

Attachments on bug 325342: 179233 | 179470 | 179730 | 179836