# HG changeset patch # User lana # Date 1337625889 25200 # Node ID 305a3d828f117e255e5f55070cd91ff549c1404f # Parent b0dbcb47d458c6d3c1df75f971bff741e989e6d7# Parent fe188621fed1971e459b68279a8d5cc38325aca5 Merge diff -r b0dbcb47d458 -r 305a3d828f11 langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java --- a/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java Thu May 17 06:20:51 2012 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java Mon May 21 11:44:49 2012 -0700 @@ -1606,6 +1606,11 @@ } private JCStatement makeResourceCloseInvocation(JCExpression resource) { + // convert to AutoCloseable if needed + if (types.asSuper(resource.type, syms.autoCloseableType.tsym) == null) { + resource = (JCExpression) convert(resource, syms.autoCloseableType); + } + // create resource.close() method invocation JCExpression resourceClose = makeCall(resource, names.close, diff -r b0dbcb47d458 -r 305a3d828f11 langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java --- a/langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java Thu May 17 06:20:51 2012 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java Mon May 21 11:44:49 2012 -0700 @@ -2206,10 +2206,15 @@ } else { JCExpression t = term(EXPR | TYPE); if ((lastmode & TYPE) != 0 && - (token.kind == IDENTIFIER || token.kind == ASSERT || token.kind == ENUM)) + (token.kind == IDENTIFIER || token.kind == ASSERT || + token.kind == ENUM)) { return variableDeclarators(modifiersOpt(), t, stats).toList(); - else + } else if ((lastmode & TYPE) != 0 && token.kind == 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(); + } } } diff -r b0dbcb47d458 -r 305a3d828f11 langtools/src/share/classes/com/sun/tools/javac/processing/JavacMessager.java --- a/langtools/src/share/classes/com/sun/tools/javac/processing/JavacMessager.java Thu May 17 06:20:51 2012 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/processing/JavacMessager.java Mon May 21 11:44:49 2012 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -99,6 +99,7 @@ if (treeTop != null) { newSource = treeTop.snd.sourcefile; if (newSource != null) { + // save the old version and reinstate it later oldSource = log.useSource(newSource); pos = treeTop.fst.pos(); } @@ -131,7 +132,8 @@ break; } } finally { - if (oldSource != null) + // reinstate the saved version, only if it was saved earlier + if (newSource != null) log.useSource(oldSource); } } diff -r b0dbcb47d458 -r 305a3d828f11 langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties --- a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties Thu May 17 06:20:51 2012 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties Mon May 21 11:44:49 2012 -0700 @@ -137,6 +137,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 b0dbcb47d458 -r 305a3d828f11 langtools/test/tools/javac/TryWithResources/T7164542.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/test/tools/javac/TryWithResources/T7164542.java Mon May 21 11:44:49 2012 -0700 @@ -0,0 +1,44 @@ +/* + * 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. + */ + +/* + * @test + * @bug 7164542 + * @summary try-with-resources: problem with intersection types + * @compile T7164542.java + */ + +public class T7164542 { + public static + void copy(S s, T t, int size) throws Exception { + /* + * compiler used to fail here with: + * symbol: method close() + * location: interface Readable + * Fatal Error: Unable to find method close + */ + try (S src = s; T trg = t) { + } + } +} diff -r b0dbcb47d458 -r 305a3d828f11 langtools/test/tools/javac/diags/examples/ForeachBadInitialization.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/test/tools/javac/diags/examples/ForeachBadInitialization.java Mon May 21 11:44:49 2012 -0700 @@ -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 s = null; + for (a : s) {} + } +} diff -r b0dbcb47d458 -r 305a3d828f11 langtools/test/tools/javac/parser/JavacParserTest.java --- a/langtools/test/tools/javac/parser/JavacParserTest.java Thu May 17 06:20:51 2012 -0700 +++ b/langtools/test/tools/javac/parser/JavacParserTest.java Mon May 21 11:44:49 2012 -0700 @@ -23,7 +23,7 @@ /* * @test - * @bug 7073631 + * @bug 7073631 7159445 * @summary tests error and diagnostics positions * @author Jan Lahoda */ @@ -875,6 +875,7 @@ testMissingClassError(); testSwitchError(); testMethodError(); + testErrorRecoveryForEnhancedForLoop142381(); } public static void main(String... args) throws IOException { @@ -892,8 +893,10 @@ } } - void assertFalse(String message, boolean empty) { - throw new UnsupportedOperationException("Not yet implemented"); + void assertFalse(String message, boolean bvalue) { + if (bvalue == true) { + fail(message); + } } void assertEquals(String message, int i, long l) { diff -r b0dbcb47d458 -r 305a3d828f11 langtools/test/tools/javac/processing/messager/MessagerDiags.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/test/tools/javac/processing/messager/MessagerDiags.java Mon May 21 11:44:49 2012 -0700 @@ -0,0 +1,131 @@ +/* + * 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. 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 7166010 + * @summary warnings printed by annotation processors uses incorrect source + */ +import com.sun.source.util.JavacTask; +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 java.util.Set; +import javax.annotation.processing.AbstractProcessor; +import javax.annotation.processing.Messager; +import javax.annotation.processing.RoundEnvironment; +import javax.annotation.processing.SupportedAnnotationTypes; +import javax.annotation.processing.SupportedSourceVersion; +import javax.lang.model.SourceVersion; +import javax.lang.model.element.Element; +import javax.lang.model.element.TypeElement; +import javax.tools.Diagnostic; +import javax.tools.DiagnosticCollector; +import javax.tools.JavaCompiler; +import javax.tools.JavaFileObject; +import javax.tools.SimpleJavaFileObject; +import javax.tools.ToolProvider; + +import static javax.tools.Diagnostic.Kind.*; +import static javax.tools.JavaFileObject.Kind.*; + +@SupportedSourceVersion(SourceVersion.RELEASE_6) +@SupportedAnnotationTypes("*") +public class MessagerDiags extends AbstractProcessor { + static final String CNAME = "Test"; + static final String TEST_JAVA = CNAME + ".java"; + static final String TEST_JAVA_URI_NAME = "myfo:/" + TEST_JAVA; + static final String WRN_NO_SOURCE = "warning without source"; + static final String WRN_WITH_SOURCE = "warning with source"; + static final String NONE = ""; + static final String[] EXPECTED = { NONE + ":-1--1:" + WRN_NO_SOURCE, + TEST_JAVA + ":0-13:" + WRN_WITH_SOURCE, + NONE + ":-1--1:" + WRN_NO_SOURCE + }; + + @Override + public boolean process(Set annotations, + RoundEnvironment roundEnv) { + Messager messager = processingEnv.getMessager(); + for (Element e : roundEnv.getRootElements()) { + messager.printMessage(WARNING, WRN_NO_SOURCE); + messager.printMessage(WARNING, WRN_WITH_SOURCE, e); + messager.printMessage(WARNING, WRN_NO_SOURCE); + } + return false; + } + + public static void main(String... args) throws IOException { + final String bootPath = System.getProperty("sun.boot.class.path"); + final JavaCompiler tool = ToolProvider.getSystemJavaCompiler(); + assert tool != null; + + DiagnosticCollector dc = new DiagnosticCollector<>(); + List options = new LinkedList<>(); + options.addAll(Arrays.asList("-bootclasspath", bootPath, + "-source", "1.6", "-classpath", + System.getProperty("java.class.path"))); + options.addAll(Arrays.asList("-processor", + MessagerDiags.class.getName())); + JavacTask ct = (JavacTask)tool.getTask(null, null, dc, options, null, + Arrays.asList(new MyFileObject("class " + CNAME + " {}"))); + ct.analyze(); + + List obtainedErrors = new ArrayList<>(); + + for (Diagnostic d : dc.getDiagnostics()) { + String dSource; + if (d.getSource() != null) { + dSource = d.getSource().toUri().getPath(); + dSource = dSource.substring(dSource.lastIndexOf('/') + 1); + } else { + dSource = NONE; + } + obtainedErrors.add(dSource + ":" + d.getStartPosition() + "-" + + d.getEndPosition() + ":" + d.getMessage(null)); + } + List expectedErrors = Arrays.asList(EXPECTED); + if (!expectedErrors.equals(obtainedErrors)) { + System.err.println("Expected: " + expectedErrors); + System.err.println("Obtained: " + obtainedErrors); + throw new AssertionError("Messages don't match"); + } + } + + static class MyFileObject extends SimpleJavaFileObject { + private String text; + public MyFileObject(String text) { + super(URI.create(TEST_JAVA_URI_NAME), SOURCE); + this.text = text; + } + @Override + public CharSequence getCharContent(boolean ignoreEncodingErrors) { + return text; + } + } +}