Thu, 10 Oct 2013 20:12:08 -0400
8008762: Type annotation on inner class in anonymous class show up as regular type annotations
8015257: type annotation with TYPE_USE and FIELD attributed differently if repeated.
8013409: test failures for type annotations
Summary: Fixes to address some problems in type annotations
Reviewed-by: jfranck, jjg
jjg@1521 | 1 | /* |
darcy@1534 | 2 | * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. |
jjg@1521 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
jjg@1521 | 4 | * |
jjg@1521 | 5 | * This code is free software; you can redistribute it and/or modify it |
jjg@1521 | 6 | * under the terms of the GNU General Public License version 2 only, as |
jjg@1521 | 7 | * published by the Free Software Foundation. |
jjg@1521 | 8 | * |
jjg@1521 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
jjg@1521 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
jjg@1521 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
jjg@1521 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
jjg@1521 | 13 | * accompanied this code). |
jjg@1521 | 14 | * |
jjg@1521 | 15 | * You should have received a copy of the GNU General Public License version |
jjg@1521 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
jjg@1521 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
jjg@1521 | 18 | * |
jjg@1521 | 19 | * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
jjg@1521 | 20 | * or visit www.oracle.com if you need additional information or have any |
jjg@1521 | 21 | * questions. |
jjg@1521 | 22 | */ |
jjg@1521 | 23 | |
jjg@1521 | 24 | import static com.sun.tools.classfile.TypeAnnotation.TargetType.*; |
jjg@1521 | 25 | |
jjg@1521 | 26 | /* |
jjg@1521 | 27 | * @test |
jjg@1521 | 28 | * @summary Test population of reference info for exception parameters |
jjg@1521 | 29 | * @author Werner Dietl |
jjg@1521 | 30 | * @compile -g Driver.java ReferenceInfoUtil.java ExceptionParameters.java |
jjg@1521 | 31 | * @run main Driver ExceptionParameters |
jjg@1521 | 32 | */ |
jjg@1521 | 33 | public class ExceptionParameters { |
jjg@1521 | 34 | |
jjg@1521 | 35 | @TADescription(annotation = "TA", type = EXCEPTION_PARAMETER, exceptionIndex = 0) |
jjg@1521 | 36 | public String exception() { |
jjg@1521 | 37 | return "void exception() { try { new Object(); } catch(@TA Exception e) { } }"; |
jjg@1521 | 38 | } |
jjg@1521 | 39 | |
jjg@1521 | 40 | @TADescription(annotation = "TA", type = EXCEPTION_PARAMETER, exceptionIndex = 0) |
jjg@1521 | 41 | public String finalException() { |
jjg@1521 | 42 | return "void finalException() { try { new Object(); } catch(final @TA Exception e) { } }"; |
jjg@1521 | 43 | } |
jjg@1521 | 44 | |
jjg@1521 | 45 | @TADescriptions({ |
jjg@1521 | 46 | @TADescription(annotation = "TA", type = EXCEPTION_PARAMETER, exceptionIndex = 0), |
jjg@1521 | 47 | @TADescription(annotation = "TB", type = EXCEPTION_PARAMETER, exceptionIndex = 1), |
jjg@1521 | 48 | @TADescription(annotation = "TC", type = EXCEPTION_PARAMETER, exceptionIndex = 2) |
jjg@1521 | 49 | }) |
jjg@1755 | 50 | public String multipleExceptions1() { |
jjg@1521 | 51 | return "void multipleExceptions() { " + |
jjg@1521 | 52 | "try { new Object(); } catch(@TA Exception e) { }" + |
jjg@1521 | 53 | "try { new Object(); } catch(@TB Exception e) { }" + |
jjg@1521 | 54 | "try { new Object(); } catch(@TC Exception e) { }" + |
jjg@1521 | 55 | " }"; |
jjg@1521 | 56 | } |
jjg@1755 | 57 | |
jjg@1755 | 58 | @TADescriptions({ |
jjg@1755 | 59 | @TADescription(annotation = "TA", type = EXCEPTION_PARAMETER, exceptionIndex = 0), |
jjg@1755 | 60 | @TADescription(annotation = "TB", type = EXCEPTION_PARAMETER, exceptionIndex = 1), |
jjg@1755 | 61 | @TADescription(annotation = "TC", type = EXCEPTION_PARAMETER, exceptionIndex = 2) |
jjg@1755 | 62 | }) |
jjg@1755 | 63 | public String multipleExceptions2() { |
jjg@1755 | 64 | return "void multipleExceptions() { " + |
jjg@1755 | 65 | " try { new Object(); " + |
jjg@1755 | 66 | " try { new Object(); " + |
jjg@1755 | 67 | " try { new Object(); } catch(@TA Exception e) { }" + |
jjg@1755 | 68 | " } catch(@TB Exception e) { }" + |
jjg@1755 | 69 | " } catch(@TC Exception e) { }" + |
jjg@1755 | 70 | "}"; |
jjg@1755 | 71 | } |
jjg@1755 | 72 | |
jjg@1755 | 73 | @TADescriptions({ |
jjg@1755 | 74 | @TADescription(annotation = "TA", type = EXCEPTION_PARAMETER, exceptionIndex = 0), |
jjg@1755 | 75 | @TADescription(annotation = "TB", type = EXCEPTION_PARAMETER, exceptionIndex = 1), |
jjg@1755 | 76 | @TADescription(annotation = "TC", type = EXCEPTION_PARAMETER, exceptionIndex = 2) |
jjg@1755 | 77 | }) |
jjg@1755 | 78 | public String multipleExceptions3() { |
jjg@1755 | 79 | return "void multipleExceptions() { " + |
jjg@1755 | 80 | " try { new Object(); " + |
jjg@1755 | 81 | " } catch(@TA Exception e1) { "+ |
jjg@1755 | 82 | " try { new Object(); " + |
jjg@1755 | 83 | " } catch(@TB Exception e2) {" + |
jjg@1755 | 84 | " try { new Object(); } catch(@TC Exception e3) { }" + |
jjg@1755 | 85 | " }" + |
jjg@1755 | 86 | " }" + |
jjg@1755 | 87 | "}"; |
jjg@1755 | 88 | } |
jjg@1521 | 89 | } |