Attachment 179470 Details for Bug 325342 – proposed fix v1.1 + regression tests

[patch] proposed fix v1.1 + regression tests

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

on 2010-09-23 12:18:12 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ayushman Jain

Created: 2010-09-23 12:18:12 EDT

Size: 42.66 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.12
>diff -u -r1.12 Options.java
>--- src/org/eclipse/jdt/internal/compiler/tool/Options.java	25 Apr 2010 22:50:28 -0000	1.12
>+++ src/org/eclipse/jdt/internal/compiler/tool/Options.java	23 Sep 2010 16:16:17 -0000
>@@ -195,6 +195,7 @@
> 						|| 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.353
>diff -u -r1.353 Main.java
>--- batch/org/eclipse/jdt/internal/compiler/batch/Main.java	25 Apr 2010 20:10:08 -0000	1.353
>+++ batch/org/eclipse/jdt/internal/compiler/batch/Main.java	23 Sep 2010 16:16:23 -0000
>@@ -3456,7 +3456,12 @@
> 			} 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.927
>diff -u -r1.927 messages.properties
>--- batch/org/eclipse/jdt/internal/compiler/batch/messages.properties	21 Sep 2010 14:19:01 -0000	1.927
>+++ batch/org/eclipse/jdt/internal/compiler/batch/messages.properties	23 Sep 2010 16:16:23 -0000
>@@ -313,6 +313,8 @@
> \ 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.63
>diff -u -r1.63 AssertStatement.java
>--- compiler/org/eclipse/jdt/internal/compiler/ast/AssertStatement.java	12 Aug 2010 16:58:28 -0000	1.63
>+++ compiler/org/eclipse/jdt/internal/compiler/ast/AssertStatement.java	23 Sep 2010 16:16:23 -0000
>@@ -14,6 +14,7 @@
> import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
> import org.eclipse.jdt.internal.compiler.codegen.*;
> import org.eclipse.jdt.internal.compiler.flow.*;
>+import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
> import org.eclipse.jdt.internal.compiler.impl.Constant;
> import org.eclipse.jdt.internal.compiler.lookup.*;
> import org.eclipse.jdt.internal.compiler.ASTVisitor;
>@@ -82,6 +83,11 @@
> 		// change this if we need to carry null analysis results of the assert
> 		// expression downstream
> 	} else {
>+		CompilerOptions compilerOptions = currentScope.compilerOptions();
>+		if (compilerOptions.suppressNullInfoFromAsserts) {
>+			// keep just the initializations info, don't include assert's null info
>+			return flowInfo.mergedWith(assertInfo.nullInfoLessUnconditionalCopy());
>+		}
> 		return flowInfo.mergedWith(assertInfo.nullInfoLessUnconditionalCopy()).
> 			addInitializationsFrom(assertWhenTrueInfo.discardInitializationInfo());
> 		// keep the merge from the initial code for the definite assignment
>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.231
>diff -u -r1.231 CompilerOptions.java
>--- compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java	8 Sep 2010 12:55:49 -0000	1.231
>+++ compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java	23 Sep 2010 16:16:23 -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$
> 	// 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,6 +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;
> 
> 	// keep in sync with warningTokenToIrritant and warningTokenFromIrritant
> 	public final static String[] warningTokens = {
>@@ -914,6 +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);
> 		return optionsMap;
> 	}
> 
>@@ -1058,6 +1061,9 @@
> 		
> 		// ignore method bodies
> 		this.ignoreMethodBodies = false;
>+		
>+		// allow null info from asserts to be considered downstream by default
>+		this.suppressNullInfoFromAsserts = false;
> 	}
> 
> 	public void set(Map optionsMap) {
>@@ -1264,6 +1270,13 @@
> 				this.reportMissingOverrideAnnotationForInterfaceMethodImplementation = false;
> 			}
> 		}
>+		if ((optionValue = optionsMap.get(OPTION_SuppressNullInfoFromAsserts)) != null) {
>+			if (ENABLED.equals(optionValue)) {
>+				this.suppressNullInfoFromAsserts = true;
>+			} else if (DISABLED.equals(optionValue)) {
>+				this.suppressNullInfoFromAsserts = false;
>+			}
>+		}
> 		if ((optionValue = optionsMap.get(OPTION_ReportMethodWithConstructorName)) != null) updateSeverity(MethodWithConstructorName, optionValue);
> 		if ((optionValue = optionsMap.get(OPTION_ReportOverridingPackageDefaultMethod)) != null) updateSeverity(OverriddenPackageDefaultMethod, optionValue);
> 		if ((optionValue = optionsMap.get(OPTION_ReportDeprecation)) != null) updateSeverity(UsingDeprecatedAPI, optionValue);
>@@ -1506,6 +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- 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.652
>diff -u -r1.652 JavaCore.java
>--- model/org/eclipse/jdt/core/JavaCore.java	25 Jun 2010 14:58:36 -0000	1.652
>+++ model/org/eclipse/jdt/core/JavaCore.java	23 Sep 2010 16:16:24 -0000
>@@ -1427,6 +1427,21 @@
> 	 */
> 	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
>+	 * <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,
>+	 * 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>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$
>+	/**
> 	 * Compiler option ID: Further Determining the Effect of <code>@SuppressWarnings</code> if also
> 	 * {@link #COMPILER_PB_SUPPRESS_WARNINGS} is enabled.
> 	 * When enabled, the <code>@SuppressWarnings</code> annotation can additionally be used to suppress 
>#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.210
>diff -u -r1.210 BatchCompilerTest.java
>--- src/org/eclipse/jdt/core/tests/compiler/regression/BatchCompilerTest.java	25 Aug 2010 11:11:58 -0000	1.210
>+++ src/org/eclipse/jdt/core/tests/compiler/regression/BatchCompilerTest.java	23 Sep 2010 16:16:28 -0000
>@@ -1707,7 +1707,9 @@
> " 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" + 
>+ " 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" +
>@@ -1775,135 +1777,137 @@
> 				true);
> 		String logContents = Util.fileContent(logFileName);
> 		String expectedLogContents =
>-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
>-			"<!DOCTYPE compiler PUBLIC \"-//Eclipse.org//DTD Eclipse JDT 3.2.004 Compiler//EN\" \"http://www.eclipse.org/jdt/core/compiler_32_004.dtd\">\n" +
>-			"<compiler copyright=\"{2}\" name=\"{1}\" version=\"{3}\">\n" +
>-			"	<command_line>\n" +
>-			"		<argument value=\"---OUTPUT_DIR_PLACEHOLDER---{0}X.java\"/>\n" +
>-			"		<argument value=\"-1.5\"/>\n" +
>-			"		<argument value=\"-proceedOnError\"/>\n" +
>-			"		<argument value=\"-log\"/>\n" +
>-			"		<argument value=\"---OUTPUT_DIR_PLACEHOLDER---{0}log.xml\"/>\n" +
>-			"		<argument value=\"-d\"/>\n" +
>-			"		<argument value=\"---OUTPUT_DIR_PLACEHOLDER---\"/>\n" +
>-			"	</command_line>\n" +
>-			"	<options>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode\" value=\"disabled\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.codegen.targetPlatform\" value=\"1.5\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.codegen.unusedLocal\" value=\"optimize out\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.compliance\" value=\"1.5\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.debug.lineNumber\" value=\"generate\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.debug.localVariable\" value=\"do not generate\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.debug.sourceFile\" value=\"generate\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.doc.comment.support\" value=\"disabled\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.generateClassFiles\" value=\"enabled\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.maxProblemPerUnit\" value=\"100\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.annotationSuperInterface\" value=\"warning\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.assertIdentifier\" value=\"warning\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.autoboxing\" value=\"ignore\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.comparingIdentical\" value=\"warning\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.deadCode\" value=\"warning\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.deadCodeInTrivialIfStatement\" value=\"disabled\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.deprecation\" value=\"warning\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode\" value=\"disabled\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod\" value=\"disabled\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.discouragedReference\" value=\"warning\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.emptyStatement\" value=\"ignore\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.enumIdentifier\" value=\"warning\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.fallthroughCase\" value=\"ignore\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.fatalOptionalError\" value=\"disabled\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.fieldHiding\" value=\"ignore\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.finalParameterBound\" value=\"warning\"/>\n" +
>-			"		<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.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" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.invalidJavadoc\" value=\"ignore\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.invalidJavadocTags\" value=\"disabled\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef\" value=\"disabled\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef\" value=\"disabled\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility\" value=\"public\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.localVariableHiding\" value=\"ignore\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.methodWithConstructorName\" value=\"warning\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation\" value=\"ignore\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod\" value=\"ignore\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.missingJavadocComments\" value=\"ignore\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding\" value=\"disabled\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility\" value=\"public\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription\" value=\"return_tag\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.missingJavadocTags\" value=\"ignore\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding\" value=\"disabled\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility\" value=\"public\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation\" value=\"ignore\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation\" value=\"enabled\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.missingSerialVersion\" value=\"warning\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod\" value=\"ignore\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.noEffectAssignment\" value=\"warning\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion\" value=\"warning\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral\" value=\"ignore\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.nullReference\" value=\"warning\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.overridingMethodWithoutSuperInvocation\" value=\"ignore\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod\" value=\"warning\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.parameterAssignment\" value=\"ignore\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment\" value=\"ignore\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.potentialNullReference\" value=\"ignore\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.rawTypeReference\" value=\"warning\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.redundantNullCheck\" value=\"ignore\"/>\n" +
>-			"		<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.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" +
>+			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + 
>+			"<!DOCTYPE compiler PUBLIC \"-//Eclipse.org//DTD Eclipse JDT 3.2.004 Compiler//EN\" \"http://www.eclipse.org/jdt/core/compiler_32_004.dtd\">\n" + 
>+			"<compiler copyright=\"{2}\" name=\"{1}\" version=\"{3}\">\n" + 
>+			"	<command_line>\n" + 
>+			"		<argument value=\"---OUTPUT_DIR_PLACEHOLDER---{0}X.java\"/>\n" + 
>+			"		<argument value=\"-1.5\"/>\n" + 
>+			"		<argument value=\"-proceedOnError\"/>\n" + 
>+			"		<argument value=\"-log\"/>\n" + 
>+			"		<argument value=\"---OUTPUT_DIR_PLACEHOLDER---{0}log.xml\"/>\n" + 
>+			"		<argument value=\"-d\"/>\n" + 
>+			"		<argument value=\"---OUTPUT_DIR_PLACEHOLDER---\"/>\n" + 
>+			"	</command_line>\n" + 
>+			"	<options>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode\" value=\"disabled\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.codegen.targetPlatform\" value=\"1.5\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.codegen.unusedLocal\" value=\"optimize out\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.compliance\" value=\"1.5\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.debug.lineNumber\" value=\"generate\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.debug.localVariable\" value=\"do not generate\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.debug.sourceFile\" value=\"generate\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.doc.comment.support\" value=\"disabled\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.generateClassFiles\" value=\"enabled\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.maxProblemPerUnit\" value=\"100\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.annotationSuperInterface\" value=\"warning\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.assertIdentifier\" value=\"warning\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.autoboxing\" value=\"ignore\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.comparingIdentical\" value=\"warning\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.deadCode\" value=\"warning\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.deadCodeInTrivialIfStatement\" value=\"disabled\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.deprecation\" value=\"warning\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode\" value=\"disabled\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod\" value=\"disabled\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.discouragedReference\" value=\"warning\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.emptyStatement\" value=\"ignore\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.enumIdentifier\" value=\"warning\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.fallthroughCase\" value=\"ignore\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.fatalOptionalError\" value=\"disabled\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.fieldHiding\" value=\"ignore\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.finalParameterBound\" value=\"warning\"/>\n" + 
>+			"		<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.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" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.invalidJavadoc\" value=\"ignore\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.invalidJavadocTags\" value=\"disabled\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef\" value=\"disabled\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef\" value=\"disabled\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility\" value=\"public\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.localVariableHiding\" value=\"ignore\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.methodWithConstructorName\" value=\"warning\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation\" value=\"ignore\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod\" value=\"ignore\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.missingJavadocComments\" value=\"ignore\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding\" value=\"disabled\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility\" value=\"public\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription\" value=\"return_tag\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.missingJavadocTags\" value=\"ignore\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding\" value=\"disabled\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility\" value=\"public\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation\" value=\"ignore\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation\" value=\"enabled\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.missingSerialVersion\" value=\"warning\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod\" value=\"ignore\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.noEffectAssignment\" value=\"warning\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion\" value=\"warning\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral\" value=\"ignore\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.nullReference\" value=\"warning\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.overridingMethodWithoutSuperInvocation\" value=\"ignore\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod\" value=\"warning\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.parameterAssignment\" value=\"ignore\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment\" value=\"ignore\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.potentialNullReference\" value=\"ignore\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.rawTypeReference\" value=\"warning\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.redundantNullCheck\" value=\"ignore\"/>\n" + 
>+			"		<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" + 
> 			"		<option key=\"org.eclipse.jdt.core.compiler.problem.tasks\" value=\"warning\"/>\n" + 
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.typeParameterHiding\" value=\"warning\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation\" value=\"warning\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock\" value=\"ignore\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unhandledWarningToken\" value=\"warning\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unnecessaryElse\" value=\"ignore\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck\" value=\"ignore\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess\" value=\"ignore\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException\" value=\"ignore\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable\" value=\"enabled\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference\" value=\"enabled\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding\" value=\"disabled\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unusedImport\" value=\"warning\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unusedLabel\" value=\"warning\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unusedLocal\" value=\"warning\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation\" value=\"ignore\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unusedParameter\" value=\"ignore\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference\" value=\"enabled\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract\" value=\"disabled\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete\" value=\"disabled\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unusedPrivateMember\" value=\"warning\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unusedTypeArgumentsForMethodInvocation\" value=\"warning\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unusedWarningToken\" value=\"warning\"/>\n" +			"		<option key=\"org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast\" value=\"warning\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.processAnnotations\" value=\"disabled\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.source\" value=\"1.5\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.taskCaseSensitive\" value=\"enabled\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.taskPriorities\" value=\"\"/>\n" +
>-			"		<option key=\"org.eclipse.jdt.core.compiler.taskTags\" value=\"\"/>\n" +
>-			"	</options>\n" +
>-			"	<classpaths>NORMALIZED SECTION</classpaths>\n" +
>-			"	<sources>\n" +
>-			"		<source output=\"---OUTPUT_DIR_PLACEHOLDER---\" path=\"---OUTPUT_DIR_PLACEHOLDER---" + File.separator + "X.java\">\n" +
>-			"			<problems errors=\"1\" problems=\"1\" warnings=\"0\">\n" +
>-			"				<problem categoryID=\"40\" charEnd=\"28\" charStart=\"25\" id=\"UndefinedType\" line=\"3\" problemID=\"16777218\" severity=\"ERROR\">\n" +
>-			"					<message value=\"Zork cannot be resolved to a type\"/>\n" +
>-			"					<source_context sourceEnd=\"3\" sourceStart=\"0\" value=\"Zork z;\"/>\n" +
>-			"					<arguments>\n" +
>-			"						<argument value=\"Zork\"/>\n" +
>-			"					</arguments>\n" +
>-			"				</problem>\n" +
>-			"			</problems>\n" +
>-			"			<classfile path=\"---OUTPUT_DIR_PLACEHOLDER---{0}X.class\"/>\n" +
>-			"		</source>\n" +
>-			"	</sources>\n" +
>-			"	<stats>\n" +
>-			"		<problem_summary errors=\"1\" problems=\"1\" tasks=\"0\" warnings=\"0\"/>\n" +
>-			"	</stats>\n" +
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.typeParameterHiding\" value=\"warning\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation\" value=\"warning\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock\" value=\"ignore\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unhandledWarningToken\" value=\"warning\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unnecessaryElse\" value=\"ignore\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck\" value=\"ignore\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess\" value=\"ignore\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException\" value=\"ignore\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable\" value=\"enabled\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference\" value=\"enabled\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding\" value=\"disabled\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unusedImport\" value=\"warning\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unusedLabel\" value=\"warning\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unusedLocal\" value=\"warning\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation\" value=\"ignore\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unusedParameter\" value=\"ignore\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference\" value=\"enabled\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract\" value=\"disabled\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete\" value=\"disabled\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unusedPrivateMember\" value=\"warning\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unusedTypeArgumentsForMethodInvocation\" value=\"warning\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.unusedWarningToken\" value=\"warning\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast\" value=\"warning\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.processAnnotations\" value=\"disabled\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.source\" value=\"1.5\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.taskCaseSensitive\" value=\"enabled\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.taskPriorities\" value=\"\"/>\n" + 
>+			"		<option key=\"org.eclipse.jdt.core.compiler.taskTags\" value=\"\"/>\n" + 
>+			"	</options>\n" + 
>+			"	<classpaths>NORMALIZED SECTION</classpaths>\n" + 
>+			"	<sources>\n" + 
>+			"		<source output=\"---OUTPUT_DIR_PLACEHOLDER---\" path=\"---OUTPUT_DIR_PLACEHOLDER---" + File.separator + "X.java\">\n" + 
>+			"			<problems errors=\"1\" problems=\"1\" warnings=\"0\">\n" + 
>+			"				<problem categoryID=\"40\" charEnd=\"28\" charStart=\"25\" id=\"UndefinedType\" line=\"3\" problemID=\"16777218\" severity=\"ERROR\">\n" + 
>+			"					<message value=\"Zork cannot be resolved to a type\"/>\n" + 
>+			"					<source_context sourceEnd=\"3\" sourceStart=\"0\" value=\"Zork z;\"/>\n" + 
>+			"					<arguments>\n" + 
>+			"						<argument value=\"Zork\"/>\n" + 
>+			"					</arguments>\n" + 
>+			"				</problem>\n" + 
>+			"			</problems>\n" + 
>+			"			<classfile path=\"---OUTPUT_DIR_PLACEHOLDER---{0}X.class\"/>\n" + 
>+			"		</source>\n" + 
>+			"	</sources>\n" + 
>+			"	<stats>\n" + 
>+			"		<problem_summary errors=\"1\" problems=\"1\" tasks=\"0\" warnings=\"0\"/>\n" + 
>+			"	</stats>\n" + 
> 			"</compiler>\n";
> 		String normalizedExpectedLogContents =
> 				MessageFormat.format(
>@@ -11123,6 +11127,55 @@
> 		"3 problems (3 warnings)",
> 		true);
> }
>+
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=325342
>+// -warn option - regression tests to check option suppressAssertNull
>+public void test293_warn_options() {
>+	this.runConformTest(
>+		new String[] {
>+			"X.java",
>+			"public class X {\n" +
>+			"	void foo(Object a, Object b, Object c) {\n" +
>+			"		assert a == null;\n " +
>+			"		if (a!=null) {\n" +
>+			"			System.out.println(\"a is not null\");\n" +
>+			"		 } else{\n" +
>+			"			System.out.println(\"a is null\");\n" +
>+			"		 }\n" +
>+			"		a = null;\n" +
>+			"		if (a== null) {}\n" +
>+			"		assert b != null;\n " +
>+			"		if (b!=null) {\n" +
>+			"			System.out.println(\"b is not null\");\n" +
>+			"		 } else{\n" +
>+			"			System.out.println(\"b is null\");\n" +
>+			"		 }\n" +
>+			"		assert c == null;\n" +
>+			"		if (c.equals(a)) {\n" +
>+			"			System.out.println(\"\");\n" +
>+			"		 } else{\n" +
>+			"			System.out.println(\"\");\n" +
>+			"		 }\n" +
>+			"	}\n" +
>+			"	public static void main(String[] args){\n" +
>+			"		X test = new X();\n" +
>+			"		test.foo(null,null, null);\n" +
>+			"	}\n" +
>+			"}\n",
>+		},
>+		"\"" + OUTPUT_DIR + File.separator + "X.java\""
>+		+ " -sourcepath \"" + OUTPUT_DIR + "\""
>+		+ " -warn:null,suppressAssertNull -1.5 -proc:none -d \"" + OUTPUT_DIR + "\"",
>+		"",
>+		"----------\n" +
>+		"1. 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)",
>+		true);
>+}
> //https://bugs.eclipse.org/bugs/show_bug.cgi?id=280784
> public void test293(){
> 	createCascadedJars();
>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.104
>diff -u -r1.104 NullReferenceTest.java
>--- src/org/eclipse/jdt/core/tests/compiler/regression/NullReferenceTest.java	21 Sep 2010 06:32:48 -0000	1.104
>+++ src/org/eclipse/jdt/core/tests/compiler/regression/NullReferenceTest.java	23 Sep 2010 16:16:28 -0000
>@@ -13494,6 +13494,110 @@
> 	}
> }
> 
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=325342
>+// EqualExpression in assert, comparison against non null
>+public void testBug325342a() {
>+	if (this.complianceLevel >= ClassFileConstants.JDK1_5) {
>+		Map compilerOptions = getCompilerOptions();
>+		compilerOptions.put(CompilerOptions.OPTION_SuppressNullInfoFromAsserts, CompilerOptions.ENABLED);
>+		this.runNegativeTest(
>+			new String[] {
>+				"Test.java",
>+				"public class Test {\n" +
>+				"	void foo(Object a, Object b, Object c) {\n" +
>+				"		assert a == null;\n " +
>+				"		if (a!=null) {\n" +
>+				"			System.out.println(\"a is not null\");\n" +
>+				"		 } else{\n" +
>+				"			System.out.println(\"a is null\");\n" +
>+				"		 }\n" +
>+				"		a = null;\n" +
>+				"		if (a== null) {}\n" +
>+				"		assert b != null;\n " +
>+				"		if (b!=null) {\n" +
>+				"			System.out.println(\"b is not null\");\n" +
>+				"		 } else{\n" +
>+				"			System.out.println(\"b is null\");\n" +
>+				"		 }\n" +
>+				"		assert c == null;\n" +
>+				"		if (c.equals(a)) {\n" +
>+				"			System.out.println(\"\");\n" +
>+				"		 } else{\n" +
>+				"			System.out.println(\"\");\n" +
>+				"		 }\n" +
>+				"	}\n" +
>+				"	public static void main(String[] args){\n" +
>+				"		Test test = new Test();\n" +
>+				"		test.foo(null,null, null);\n" +
>+				"	}\n" +
>+				"}\n"},
>+			"----------\n" + 
>+			"1. ERROR in Test.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",
>+			null,
>+			true,
>+			compilerOptions);
>+	}
>+}
>+
>+// https://bugs.eclipse.org/bugs/show_bug.cgi?id=325342
>+// EqualExpression in assert, comparison against non null
>+public void testBug325342b() {
>+	if (this.complianceLevel >= ClassFileConstants.JDK1_5) {
>+		Map compilerOptions = getCompilerOptions();
>+		compilerOptions.put(CompilerOptions.OPTION_SuppressNullInfoFromAsserts, CompilerOptions.DISABLED);
>+		this.runNegativeTest(
>+			new String[] {
>+				"Test.java",
>+				"public class Test {\n" +
>+				"	void foo(Object a, Object b, Object c) {\n" +
>+				"		assert a == null;\n " +
>+				"		if (a!=null) {\n" +
>+				"			System.out.println(\"a is not null\");\n" +
>+				"		 } else{\n" +
>+				"			System.out.println(\"a is null\");\n" +
>+				"		 }\n" +
>+				"		assert b != null;\n " +
>+				"		if (b!=null) {\n" +
>+				"			System.out.println(\"a is not null\");\n" +
>+				"		 } else{\n" +
>+				"			System.out.println(\"a is null\");\n" +
>+				"		 }\n" +
>+				"		assert c == null;\n" +
>+				"		if (c.equals(a)) {\n" +
>+				"			System.out.println(\"\");\n" +
>+				"		 } else{\n" +
>+				"			System.out.println(\"\");\n" +
>+				"		 }\n" +
>+				"	}\n" +
>+				"	public static void main(String[] args){\n" +
>+				"		Test test = new Test();\n" +
>+				"		test.foo(null,null,null);\n" +
>+				"	}\n" +
>+				"}\n"},
>+			"----------\n" + 
>+			"1. ERROR in Test.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. ERROR in Test.java (at line 10)\n" + 
>+			"	if (b!=null) {\n" + 
>+			"	 ^\n" + 
>+			"Redundant null check: The variable b cannot be null at this location\n" + 
>+			"----------\n" + 
>+			"3. ERROR in Test.java (at line 16)\n" + 
>+			"	if (c.equals(a)) {\n" + 
>+			"	 ^\n" + 
>+			"Null pointer access: The variable c can only be null at this location\n" + 
>+			"----------\n",
>+			null, true, compilerOptions);
>+	}
>+}
>+
> // https://bugs.eclipse.org/bugs/show_bug.cgi?id=325755 
> // null analysis -- conditional expression
> public void testBug325755a() {

Actions: View | Diff

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