/hg/icedtea7-forest/langtools: 4 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Jun 14 18:13:04 UTC 2016
changeset 36a608cb4934 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=36a608cb4934
author: ksrini
date: Wed Dec 07 10:47:46 2011 -0800
7086015, PR3013: fix test/tools/javac/parser/netbeans/JavacParserTest.java
Reviewed-by: ksrini, jjg
Contributed-by: matherey.nunez at oracle.com
changeset 2cf81bc27d18 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=2cf81bc27d18
author: ksrini
date: Fri Jun 10 18:47:23 2016 +0100
7119487, PR3013: JavacParserTest.java test fails on Windows platforms
Reviewed-by: jjg
changeset bb8394a66bf7 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=bb8394a66bf7
author: ksrini
date: Tue Jun 14 00:50:59 2016 +0100
7159445, PR3013: (javac) emits inaccurate diagnostics for enhanced for-loops
Reviewed-by: jjg
Contributed-by: jan.lahoda at oracle.com
changeset bd3480b6d64a in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=bd3480b6d64a
author: mcimadamore
date: Tue Jun 14 19:13:29 2016 +0100
8069181, PR3012, RH1015612: java.lang.AssertionError when compiling JDK 1.4 code in JDK 8
Summary: remove erroneous call to modifiersOpt() in variable parsing
Reviewed-by: jfranck, jlahoda
diffstat:
src/share/classes/com/sun/tools/javac/parser/JavacParser.java | 33 +-
src/share/classes/com/sun/tools/javac/resources/compiler.properties | 4 +
test/tools/javac/diags/examples/ForeachBadInitialization.java | 31 +
test/tools/javac/enum/8069181/T8069181.java | 45 +
test/tools/javac/parser/JavacParserTest.java | 886 ++++++++++
test/tools/javac/parser/netbeans/JavacParserTest.java | 716 --------
6 files changed, 987 insertions(+), 728 deletions(-)
diffs (truncated from 1760 to 500 lines):
diff -r 4bac4ef52aab -r bd3480b6d64a src/share/classes/com/sun/tools/javac/parser/JavacParser.java
--- a/src/share/classes/com/sun/tools/javac/parser/JavacParser.java Sun Apr 17 01:21:11 2016 +0100
+++ b/src/share/classes/com/sun/tools/javac/parser/JavacParser.java Tue Jun 14 19:13:29 2016 +0100
@@ -1962,10 +1962,15 @@
} else {
JCExpression t = term(EXPR | TYPE);
if ((lastmode & TYPE) != 0 &&
- (S.token() == IDENTIFIER || S.token() == ASSERT || S.token() == ENUM))
- return variableDeclarators(modifiersOpt(), t, stats).toList();
- else
+ (S.token() == IDENTIFIER || S.token() == ASSERT ||
+ S.token() == ENUM)) {
+ return variableDeclarators(mods(pos, 0, List.<JCAnnotation>nil()), t, stats).toList();
+ } else if ((lastmode & TYPE) != 0 && S.token() == COLON) {
+ error(pos, "bad.initializer", "for-loop");
+ return List.of((JCStatement)F.at(pos).VarDef(null, null, t, null));
+ } else {
return moreStatementExpressions(pos, t, stats).toList();
+ }
}
}
@@ -2057,16 +2062,20 @@
default: break;
}
- /* A modifiers tree with no modifier tokens or annotations
- * has no text position. */
- if ((flags & (Flags.ModifierFlags | Flags.ANNOTATION)) == 0 && annotations.isEmpty())
- pos = Position.NOPOS;
+ return mods(pos, flags, annotations.toList());
+ }
+ //where
+ JCModifiers mods(int pos, long flags, List<JCAnnotation> annotations) {
+ /* A modifiers tree with no modifier tokens or annotations
+ * has no text position. */
+ if ((flags & (Flags.ModifierFlags | Flags.ANNOTATION)) == 0 && annotations.isEmpty())
+ pos = Position.NOPOS;
- JCModifiers mods = F.at(pos).Modifiers(flags, annotations.toList());
- if (pos != Position.NOPOS)
- storeEnd(mods, S.prevEndPos());
- return mods;
- }
+ JCModifiers mods = F.at(pos).Modifiers(flags, annotations);
+ if (pos != Position.NOPOS)
+ storeEnd(mods, S.prevEndPos());
+ return mods;
+ }
/** Annotation = "@" Qualident [ "(" AnnotationFieldValues ")" ]
* @param pos position of "@" token
diff -r 4bac4ef52aab -r bd3480b6d64a src/share/classes/com/sun/tools/javac/resources/compiler.properties
--- a/src/share/classes/com/sun/tools/javac/resources/compiler.properties Sun Apr 17 01:21:11 2016 +0100
+++ b/src/share/classes/com/sun/tools/javac/resources/compiler.properties Tue Jun 14 19:13:29 2016 +0100
@@ -143,6 +143,10 @@
compiler.err.attribute.value.must.be.constant=\
attribute value must be constant
+# 0: statement type
+compiler.err.bad.initializer=\
+ bad initializer for {0}
+
compiler.err.break.outside.switch.loop=\
break outside switch or loop
diff -r 4bac4ef52aab -r bd3480b6d64a test/tools/javac/diags/examples/ForeachBadInitialization.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/javac/diags/examples/ForeachBadInitialization.java Tue Jun 14 19:13:29 2016 +0100
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// key: compiler.err.bad.initializer
+import java.util.List;
+class ForeachBadInitialization {
+ void m() {
+ List<String> s = null;
+ for (a : s) {}
+ }
+}
diff -r 4bac4ef52aab -r bd3480b6d64a test/tools/javac/enum/8069181/T8069181.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/javac/enum/8069181/T8069181.java Tue Jun 14 19:13:29 2016 +0100
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8069181
+ * @summary java.lang.AssertionError when compiling JDK 1.4 code in JDK 8
+ *
+ * @compile -source 1.4 T8069181.java
+ */
+import java.util.Enumeration;
+import java.util.Hashtable;
+class T8069181 {
+ void test() {
+ Hashtable hTable = new Hashtable();
+ hTable.put("hello", "value");
+ for (Enumeration enum = hTable.keys();;){
+ if(!enum.hasMoreElements())
+ break;
+ enum.nextElement();
+ }
+ }
+}
diff -r 4bac4ef52aab -r bd3480b6d64a test/tools/javac/parser/JavacParserTest.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/javac/parser/JavacParserTest.java Tue Jun 14 19:13:29 2016 +0100
@@ -0,0 +1,886 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 7073631 7159445
+ * @summary tests error and diagnostics positions
+ * @author Jan Lahoda
+ */
+
+import com.sun.source.tree.BinaryTree;
+import com.sun.source.tree.BlockTree;
+import com.sun.source.tree.ClassTree;
+import com.sun.source.tree.CompilationUnitTree;
+import com.sun.source.tree.ErroneousTree;
+import com.sun.source.tree.ExpressionStatementTree;
+import com.sun.source.tree.ExpressionTree;
+import com.sun.source.tree.MethodInvocationTree;
+import com.sun.source.tree.MethodTree;
+import com.sun.source.tree.ModifiersTree;
+import com.sun.source.tree.StatementTree;
+import com.sun.source.tree.Tree;
+import com.sun.source.tree.Tree.Kind;
+import com.sun.source.tree.VariableTree;
+import com.sun.source.tree.WhileLoopTree;
+import com.sun.source.util.SourcePositions;
+import com.sun.source.util.TreeScanner;
+import com.sun.source.util.Trees;
+import com.sun.tools.javac.api.JavacTaskImpl;
+import com.sun.tools.javac.tree.JCTree;
+import java.io.IOException;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+import javax.tools.Diagnostic;
+import javax.tools.DiagnosticCollector;
+import javax.tools.DiagnosticListener;
+import javax.tools.JavaCompiler;
+import javax.tools.JavaFileObject;
+import javax.tools.SimpleJavaFileObject;
+import javax.tools.ToolProvider;
+
+public class JavacParserTest extends TestCase {
+ final JavaCompiler tool;
+ public JavacParserTest(String testName) {
+ tool = ToolProvider.getSystemJavaCompiler();
+ System.out.println("java.home=" + System.getProperty("java.home"));
+ }
+
+ static class MyFileObject extends SimpleJavaFileObject {
+
+ private String text;
+
+ public MyFileObject(String text) {
+ super(URI.create("myfo:/Test.java"), JavaFileObject.Kind.SOURCE);
+ this.text = text;
+ }
+
+ @Override
+ public CharSequence getCharContent(boolean ignoreEncodingErrors) {
+ return text;
+ }
+ }
+ /*
+ * converts Windows to Unix style LFs for comparing strings
+ */
+ private String normalize(String in) {
+ return in.replace(System.getProperty("line.separator"), "\n");
+ }
+
+ public CompilationUnitTree getCompilationUnitTree(String code) throws IOException {
+
+ JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, null, null, null,
+ null, Arrays.asList(new MyFileObject(code)));
+ CompilationUnitTree cut = ct.parse().iterator().next();
+ return cut;
+ }
+
+ public List<String> getErroneousTreeValues(ErroneousTree node) {
+
+ List<String> values = new ArrayList<>();
+ if (node.getErrorTrees() != null) {
+ for (Tree t : node.getErrorTrees()) {
+ values.add(t.toString());
+ }
+ } else {
+ throw new RuntimeException("ERROR: No Erroneous tree "
+ + "has been created.");
+ }
+ return values;
+ }
+
+ public void testPositionForSuperConstructorCalls() throws IOException {
+ assert tool != null;
+
+ String code = "package test; public class Test {public Test() {super();}}";
+
+ JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, null, null, null,
+ null, Arrays.asList(new MyFileObject(code)));
+ CompilationUnitTree cut = ct.parse().iterator().next();
+ SourcePositions pos = Trees.instance(ct).getSourcePositions();
+
+ MethodTree method =
+ (MethodTree) ((ClassTree) cut.getTypeDecls().get(0)).getMembers().get(0);
+ ExpressionStatementTree es =
+ (ExpressionStatementTree) method.getBody().getStatements().get(0);
+
+ final int esStartPos = code.indexOf(es.toString());
+ final int esEndPos = esStartPos + es.toString().length();
+ assertEquals("testPositionForSuperConstructorCalls",
+ esStartPos, pos.getStartPosition(cut, es));
+ assertEquals("testPositionForSuperConstructorCalls",
+ esEndPos, pos.getEndPosition(cut, es));
+
+ MethodInvocationTree mit = (MethodInvocationTree) es.getExpression();
+
+ final int mitStartPos = code.indexOf(mit.toString());
+ final int mitEndPos = mitStartPos + mit.toString().length();
+ assertEquals("testPositionForSuperConstructorCalls",
+ mitStartPos, pos.getStartPosition(cut, mit));
+ assertEquals("testPositionForSuperConstructorCalls",
+ mitEndPos, pos.getEndPosition(cut, mit));
+
+ final int methodStartPos = mitStartPos;
+ final int methodEndPos = methodStartPos + mit.getMethodSelect().toString().length();
+ assertEquals("testPositionForSuperConstructorCalls",
+ methodStartPos, pos.getStartPosition(cut, mit.getMethodSelect()));
+ assertEquals("testPositionForSuperConstructorCalls",
+ methodEndPos, pos.getEndPosition(cut, mit.getMethodSelect()));
+
+ }
+
+ public void testPositionForEnumModifiers() throws IOException {
+
+ String code = "package test; public enum Test {A;}";
+
+ JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, null, null, null,
+ null, Arrays.asList(new MyFileObject(code)));
+ CompilationUnitTree cut = ct.parse().iterator().next();
+ SourcePositions pos = Trees.instance(ct).getSourcePositions();
+
+ ClassTree clazz = (ClassTree) cut.getTypeDecls().get(0);
+ ModifiersTree mt = clazz.getModifiers();
+
+ assertEquals("testPositionForEnumModifiers",
+ 38 - 24, pos.getStartPosition(cut, mt));
+ assertEquals("testPositionForEnumModifiers",
+ 44 - 24, pos.getEndPosition(cut, mt));
+ }
+
+ public void testNewClassWithEnclosing() throws IOException {
+
+
+ String code = "package test; class Test { " +
+ "class d {} private void method() { " +
+ "Object o = Test.this.new d(); } }";
+
+ JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, null, null, null,
+ null, Arrays.asList(new MyFileObject(code)));
+ CompilationUnitTree cut = ct.parse().iterator().next();
+ SourcePositions pos = Trees.instance(ct).getSourcePositions();
+
+ ClassTree clazz = (ClassTree) cut.getTypeDecls().get(0);
+ ExpressionTree est =
+ ((VariableTree) ((MethodTree) clazz.getMembers().get(1)).getBody().getStatements().get(0)).getInitializer();
+
+ assertEquals("testNewClassWithEnclosing",
+ 97 - 24, pos.getStartPosition(cut, est));
+ assertEquals("testNewClassWithEnclosing",
+ 114 - 24, pos.getEndPosition(cut, est));
+ }
+
+ public void testPreferredPositionForBinaryOp() throws IOException {
+
+ String code = "package test; public class Test {"
+ + "private void test() {"
+ + "Object o = null; boolean b = o != null && o instanceof String;"
+ + "} private Test() {}}";
+
+ CompilationUnitTree cut = getCompilationUnitTree(code);
+ ClassTree clazz = (ClassTree) cut.getTypeDecls().get(0);
+ MethodTree method = (MethodTree) clazz.getMembers().get(0);
+ VariableTree condSt = (VariableTree) method.getBody().getStatements().get(1);
+ BinaryTree cond = (BinaryTree) condSt.getInitializer();
+
+ JCTree condJC = (JCTree) cond;
+ int condStartPos = code.indexOf("&&");
+ assertEquals("testPreferredPositionForBinaryOp",
+ condStartPos, condJC.pos);
+ }
+
+ public void testPositionBrokenSource126732a() throws IOException {
+ String[] commands = new String[]{
+ "return Runnable()",
+ "do { } while (true)",
+ "throw UnsupportedOperationException()",
+ "assert true",
+ "1 + 1",};
+
+ for (String command : commands) {
+
+ String code = "package test;\n"
+ + "public class Test {\n"
+ + " public static void test() {\n"
+ + " " + command + " {\n"
+ + " new Runnable() {\n"
+ + " };\n"
+ + " }\n"
+ + "}";
+ JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, null, null,
+ null, null, Arrays.asList(new MyFileObject(code)));
+ CompilationUnitTree cut = ct.parse().iterator().next();
+
+ ClassTree clazz = (ClassTree) cut.getTypeDecls().get(0);
+ MethodTree method = (MethodTree) clazz.getMembers().get(0);
+ List<? extends StatementTree> statements =
+ method.getBody().getStatements();
+
+ StatementTree ret = statements.get(0);
+ StatementTree block = statements.get(1);
+
+ Trees t = Trees.instance(ct);
+ int len = code.indexOf(command + " {") + (command + " ").length();
+ assertEquals(command, len,
+ t.getSourcePositions().getEndPosition(cut, ret));
+ assertEquals(command, len,
+ t.getSourcePositions().getStartPosition(cut, block));
+ }
+ }
+
+ public void testPositionBrokenSource126732b() throws IOException {
+ String[] commands = new String[]{
+ "break",
+ "break A",
+ "continue ",
+ "continue A",};
+
+ for (String command : commands) {
+
+ String code = "package test;\n"
+ + "public class Test {\n"
+ + " public static void test() {\n"
+ + " while (true) {\n"
+ + " " + command + " {\n"
+ + " new Runnable() {\n"
+ + " };\n"
+ + " }\n"
+ + " }\n"
+ + "}";
+
+ JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, null, null,
+ null, null, Arrays.asList(new MyFileObject(code)));
+ CompilationUnitTree cut = ct.parse().iterator().next();
+
+ ClassTree clazz = (ClassTree) cut.getTypeDecls().get(0);
+ MethodTree method = (MethodTree) clazz.getMembers().get(0);
+ List<? extends StatementTree> statements =
+ ((BlockTree) ((WhileLoopTree) method.getBody().getStatements().get(0)).getStatement()).getStatements();
+
+ StatementTree ret = statements.get(0);
+ StatementTree block = statements.get(1);
+
+ Trees t = Trees.instance(ct);
+ int len = code.indexOf(command + " {") + (command + " ").length();
+ assertEquals(command, len,
+ t.getSourcePositions().getEndPosition(cut, ret));
+ assertEquals(command, len,
+ t.getSourcePositions().getStartPosition(cut, block));
+ }
+ }
+
+ public void testErrorRecoveryForEnhancedForLoop142381() throws IOException {
+
+ String code = "package test; class Test { " +
+ "private void method() { " +
+ "java.util.Set<String> s = null; for (a : s) {} } }";
+
+ final List<Diagnostic<? extends JavaFileObject>> errors =
+ new LinkedList<Diagnostic<? extends JavaFileObject>>();
+
+ JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, null,
+ new DiagnosticListener<JavaFileObject>() {
+ public void report(Diagnostic<? extends JavaFileObject> diagnostic) {
+ errors.add(diagnostic);
+ }
+ }, null, null, Arrays.asList(new MyFileObject(code)));
+
+ CompilationUnitTree cut = ct.parse().iterator().next();
+
+ ClassTree clazz = (ClassTree) cut.getTypeDecls().get(0);
+ StatementTree forStatement =
+ ((MethodTree) clazz.getMembers().get(0)).getBody().getStatements().get(1);
+
+ assertEquals("testErrorRecoveryForEnhancedForLoop142381",
+ Kind.ENHANCED_FOR_LOOP, forStatement.getKind());
+ assertFalse("testErrorRecoveryForEnhancedForLoop142381", errors.isEmpty());
+ }
+
+ public void testPositionAnnotationNoPackage187551() throws IOException {
+
+ String code = "\n at interface Test {}";
+
+ JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, null, null, null,
+ null, Arrays.asList(new MyFileObject(code)));
+
+ CompilationUnitTree cut = ct.parse().iterator().next();
+ ClassTree clazz = (ClassTree) cut.getTypeDecls().get(0);
+ Trees t = Trees.instance(ct);
+
+ assertEquals("testPositionAnnotationNoPackage187551",
+ 1, t.getSourcePositions().getStartPosition(cut, clazz));
+ }
+
+ public void testPositionsSane() throws IOException {
+ performPositionsSanityTest("package test; class Test { " +
+ "private void method() { " +
+ "java.util.List<? extends java.util.List<? extends String>> l; " +
+ "} }");
+ performPositionsSanityTest("package test; class Test { " +
+ "private void method() { " +
+ "java.util.List<? super java.util.List<? super String>> l; " +
+ "} }");
+ performPositionsSanityTest("package test; class Test { " +
+ "private void method() { " +
More information about the distro-pkg-dev
mailing list