Attachment 180086 Details for Bug 323012 – Proposed fix + regression test

[patch] Proposed fix + regression test

patch_323012.txt (text/plain), 5.37 KB, created by Olivier Thomann

on 2010-10-01 15:53:10 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2010-10-01 15:53:10 EDT

Size: 5.37 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: compiler/org/eclipse/jdt/internal/compiler/ast/ClassLiteralAccess.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ClassLiteralAccess.java,v
>retrieving revision 1.51
>diff -u -r1.51 ClassLiteralAccess.java
>--- compiler/org/eclipse/jdt/internal/compiler/ast/ClassLiteralAccess.java	26 Jul 2010 06:32:19 -0000	1.51
>+++ compiler/org/eclipse/jdt/internal/compiler/ast/ClassLiteralAccess.java	1 Oct 2010 19:49:40 -0000
>@@ -40,7 +40,7 @@
> 		// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=22334
> 		if (!sourceType.isInterface()
> 				&& !this.targetType.isBaseType()
>-				&& currentScope.compilerOptions().sourceLevel < ClassFileConstants.JDK1_5) {
>+				&& currentScope.compilerOptions().targetJDK < ClassFileConstants.JDK1_5) {
> 			this.syntheticField = sourceType.addSyntheticFieldForClassLiteral(this.targetType, currentScope);
> 		}
> 		return flowInfo;
>#P org.eclipse.jdt.core.tests.compiler
>Index: src/org/eclipse/jdt/core/tests/compiler/regression/Jsr14Test.java
>===================================================================
>RCS file: src/org/eclipse/jdt/core/tests/compiler/regression/Jsr14Test.java
>diff -N src/org/eclipse/jdt/core/tests/compiler/regression/Jsr14Test.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/jdt/core/tests/compiler/regression/Jsr14Test.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,81 @@
>+/*******************************************************************************
>+ * Copyright (c) 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
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.jdt.core.tests.compiler.regression;
>+
>+import java.io.File;
>+import java.util.Map;
>+
>+import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
>+
>+import junit.framework.Test;
>+
>+public class Jsr14Test extends AbstractRegressionTest {
>+
>+public Jsr14Test(String name) {
>+	super(name);
>+}
>+protected Map getCompilerOptions() {
>+	Map options = super.getCompilerOptions();
>+	options.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
>+	options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
>+	options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_4);
>+	return options;
>+}
>+// Static initializer to specify tests subset using TESTS_* static variables
>+// All specified tests which does not belong to the class are skipped...
>+static {
>+//	TESTS_NAMES = new String[] { "test000" };
>+//	TESTS_NUMBERS = new int[] { 15 };
>+//	TESTS_RANGE = new int[] { 11, -1 };
>+}
>+public static Test suite() {
>+	return buildMinimalComplianceTestSuite(testClass(), F_1_4);
>+}
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=277450
>+public void test1() throws Exception {
>+	this.runConformTest(
>+		new String[] {
>+			"X.java",
>+			"public class X {\n" + 
>+			"	public static void main(String[] args) {\n" + 
>+			"		System.out.println(X.class);\n" + 
>+			"	}\n" + 
>+			"}",
>+		},
>+		"class X");
>+	String expectedOutput =
>+		"  // Method descriptor #18 ([Ljava/lang/String;)V\n" + 
>+		"  // Stack: 3, Locals: 1\n" + 
>+		"  public static void main(java.lang.String[] args);\n" + 
>+		"     0  getstatic java.lang.System.out : java.io.PrintStream [19]\n" + 
>+		"     3  getstatic X.class$0 : java.lang.Class [25]\n" + 
>+		"     6  dup\n" + 
>+		"     7  ifnonnull 35\n" + 
>+		"    10  pop\n" + 
>+		"    11  ldc <String \"X\"> [27]\n" + 
>+		"    13  invokestatic java.lang.Class.forName(java.lang.String) : java.lang.Class [28]\n" + 
>+		"    16  dup\n" + 
>+		"    17  putstatic X.class$0 : java.lang.Class [25]\n" + 
>+		"    20  goto 35\n" + 
>+		"    23  new java.lang.NoClassDefFoundError [34]\n" + 
>+		"    26  dup_x1\n" + 
>+		"    27  swap\n" + 
>+		"    28  invokevirtual java.lang.Throwable.getMessage() : java.lang.String [36]\n" + 
>+		"    31  invokespecial java.lang.NoClassDefFoundError(java.lang.String) [42]\n" + 
>+		"    34  athrow\n" + 
>+		"    35  invokevirtual java.io.PrintStream.println(java.lang.Object) : void [45]\n" + 
>+		"    38  return\n";
>+	checkDisassembledClassFile(OUTPUT_DIR + File.separator + "X.class", "X", expectedOutput);
>+}
>+public static Class testClass() {
>+	return Jsr14Test.class;
>+}
>+}
>Index: src/org/eclipse/jdt/core/tests/compiler/regression/TestAll.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/TestAll.java,v
>retrieving revision 1.87
>diff -u -r1.87 TestAll.java
>--- src/org/eclipse/jdt/core/tests/compiler/regression/TestAll.java	21 Jul 2010 07:08:51 -0000	1.87
>+++ src/org/eclipse/jdt/core/tests/compiler/regression/TestAll.java	1 Oct 2010 19:49:41 -0000
>@@ -172,6 +172,7 @@
> 		TestCase.RUN_ONLY_ID = null;
> 		all.addTest(AbstractCompilerTest.buildComplianceTestSuite(ClassFileConstants.JDK1_7, tests_1_7));
> 	}
>+	all.addTest(new TestSuite(Jsr14Test.class));
> 	return all;
> }
> }

Actions: View | Diff

Attachments on bug 323012: 179724 | 179740 | 180020 | 180055 | 180078 | 180079 | 180084 | 180086