Mon, 24 Nov 2014 12:49:30 -0500
8029012: parameter_index for type annotation not updated after outer.this added
Summary: Fix javac's handling of type annotations when synthetic parameters are added
Reviewed-by: jjg, mcimadamore
aoqi@0 | 1 | /* |
aoqi@0 | 2 | * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. |
aoqi@0 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
aoqi@0 | 4 | * |
aoqi@0 | 5 | * This code is free software; you can redistribute it and/or modify it |
aoqi@0 | 6 | * under the terms of the GNU General Public License version 2 only, as |
aoqi@0 | 7 | * published by the Free Software Foundation. |
aoqi@0 | 8 | * |
aoqi@0 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
aoqi@0 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
aoqi@0 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
aoqi@0 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
aoqi@0 | 13 | * accompanied this code). |
aoqi@0 | 14 | * |
aoqi@0 | 15 | * You should have received a copy of the GNU General Public License version |
aoqi@0 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
aoqi@0 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
aoqi@0 | 18 | * |
aoqi@0 | 19 | * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
aoqi@0 | 20 | * or visit www.oracle.com if you need additional information or have any |
aoqi@0 | 21 | * questions. |
aoqi@0 | 22 | */ |
aoqi@0 | 23 | |
aoqi@0 | 24 | /* |
aoqi@0 | 25 | * @test |
aoqi@0 | 26 | * @bug 6993301 |
aoqi@0 | 27 | * @summary catch parameters do not have correct kind (i.e. ElementKind.EXCEPTION_PARAMETER) |
aoqi@0 | 28 | */ |
aoqi@0 | 29 | |
aoqi@0 | 30 | import com.sun.source.tree.CompilationUnitTree; |
aoqi@0 | 31 | import com.sun.source.tree.IdentifierTree; |
aoqi@0 | 32 | import com.sun.source.tree.VariableTree; |
aoqi@0 | 33 | import com.sun.source.util.TreePathScanner; |
aoqi@0 | 34 | import com.sun.source.util.Trees; |
aoqi@0 | 35 | import com.sun.tools.javac.api.JavacTaskImpl; |
aoqi@0 | 36 | import java.io.IOException; |
aoqi@0 | 37 | import java.net.URI; |
aoqi@0 | 38 | import java.util.Arrays; |
aoqi@0 | 39 | import javax.lang.model.element.Element; |
aoqi@0 | 40 | import javax.lang.model.element.ElementKind; |
aoqi@0 | 41 | import javax.tools.JavaCompiler; |
aoqi@0 | 42 | import javax.tools.JavaFileObject; |
aoqi@0 | 43 | import javax.tools.SimpleJavaFileObject; |
aoqi@0 | 44 | import javax.tools.ToolProvider; |
aoqi@0 | 45 | |
aoqi@0 | 46 | /** |
aoqi@0 | 47 | * |
aoqi@0 | 48 | * @author Jan Lahoda |
aoqi@0 | 49 | */ |
aoqi@0 | 50 | public class T6993301 { |
aoqi@0 | 51 | public static void main(String... args) throws Exception { |
aoqi@0 | 52 | new T6993301().testExceptionParameterCorrectKind(); |
aoqi@0 | 53 | } |
aoqi@0 | 54 | |
aoqi@0 | 55 | static class MyFileObject extends SimpleJavaFileObject { |
aoqi@0 | 56 | private String text; |
aoqi@0 | 57 | public MyFileObject(String text) { |
aoqi@0 | 58 | super(URI.create("myfo:/Test.java"), JavaFileObject.Kind.SOURCE); |
aoqi@0 | 59 | this.text = text; |
aoqi@0 | 60 | } |
aoqi@0 | 61 | @Override |
aoqi@0 | 62 | public CharSequence getCharContent(boolean ignoreEncodingErrors) { |
aoqi@0 | 63 | return text; |
aoqi@0 | 64 | } |
aoqi@0 | 65 | } |
aoqi@0 | 66 | |
aoqi@0 | 67 | public void testExceptionParameterCorrectKind() throws IOException { |
aoqi@0 | 68 | final String bootPath = System.getProperty("sun.boot.class.path"); |
aoqi@0 | 69 | final JavaCompiler tool = ToolProvider.getSystemJavaCompiler(); |
aoqi@0 | 70 | assert tool != null; |
aoqi@0 | 71 | |
aoqi@0 | 72 | String code = "package test; public class Test { { try { } catch (NullPointerException ex) {} } }"; |
aoqi@0 | 73 | |
aoqi@0 | 74 | final JavacTaskImpl ct = (JavacTaskImpl)tool.getTask(null, null, null, |
aoqi@0 | 75 | Arrays.asList("-bootclasspath", bootPath), |
aoqi@0 | 76 | null, Arrays.asList(new MyFileObject(code))); |
aoqi@0 | 77 | CompilationUnitTree cut = ct.parse().iterator().next(); |
aoqi@0 | 78 | |
aoqi@0 | 79 | ct.analyze(); |
aoqi@0 | 80 | |
aoqi@0 | 81 | new TreePathScanner<Void, Void>() { |
aoqi@0 | 82 | @Override |
aoqi@0 | 83 | public Void visitVariable(VariableTree node, Void p) { |
aoqi@0 | 84 | Element el = Trees.instance(ct).getElement(getCurrentPath()); |
aoqi@0 | 85 | |
aoqi@0 | 86 | assertNotNull(el); |
aoqi@0 | 87 | assertEquals(ElementKind.EXCEPTION_PARAMETER, el.getKind()); |
aoqi@0 | 88 | |
aoqi@0 | 89 | return super.visitVariable(node, p); |
aoqi@0 | 90 | } |
aoqi@0 | 91 | }.scan(cut, null); |
aoqi@0 | 92 | } |
aoqi@0 | 93 | |
aoqi@0 | 94 | private void assertNotNull(Object o) { |
aoqi@0 | 95 | if (o == null) |
aoqi@0 | 96 | throw new AssertionError(); |
aoqi@0 | 97 | } |
aoqi@0 | 98 | |
aoqi@0 | 99 | private <T> void assertEquals(T expected, T actual) { |
aoqi@0 | 100 | if (expected == null ? actual == null : expected.equals(actual)) |
aoqi@0 | 101 | return; |
aoqi@0 | 102 | throw new AssertionError("expected: " + expected + ", actual: " + actual); |
aoqi@0 | 103 | } |
aoqi@0 | 104 | |
aoqi@0 | 105 | } |