Wed, 23 Oct 2013 23:20:32 -0400
8006732: support correct bytecode storage of type annotations in multicatch
Summary: Fix issue with annotations being added before attribution, which causes multicatch not to work right and several tests to fail.
Reviewed-by: jfranck, jjg
jjg@1521 | 1 | /* |
darcy@1534 | 2 | * Copyright (c) 2009, 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 class extends clauses |
jjg@1521 | 29 | * @compile -g Driver.java ReferenceInfoUtil.java ClassExtends.java |
jjg@1521 | 30 | * @run main Driver ClassExtends |
jjg@1521 | 31 | */ |
jjg@1521 | 32 | public class ClassExtends { |
jjg@1521 | 33 | |
jjg@1521 | 34 | @TADescriptions({ |
jjg@1521 | 35 | @TADescription(annotation = "TA", type = CLASS_EXTENDS, typeIndex = -1), |
jjg@1521 | 36 | @TADescription(annotation = "TB", type = CLASS_EXTENDS, typeIndex = 1) |
jjg@1521 | 37 | }) |
jjg@1521 | 38 | public String regularClass() { |
jjg@1521 | 39 | return "class Test extends @TA Object implements Cloneable, @TB Runnable {" |
jjg@1521 | 40 | + " public void run() { } }"; |
jjg@1521 | 41 | } |
jjg@1521 | 42 | |
jjg@1521 | 43 | @TADescriptions({ |
jjg@1521 | 44 | @TADescription(annotation = "TA", type = CLASS_EXTENDS, typeIndex = -1, |
jjg@1521 | 45 | genericLocation = { 3, 0 }), |
jjg@1521 | 46 | @TADescription(annotation = "TB", type = CLASS_EXTENDS, typeIndex = 1, |
jjg@1521 | 47 | genericLocation = { 3, 1 }) |
jjg@1521 | 48 | }) |
jjg@1521 | 49 | public String regularClassExtendsParametrized() { |
jjg@1521 | 50 | return "class Test extends HashMap<@TA String, String> implements Cloneable, Map<String, @TB String>{ } "; |
jjg@1521 | 51 | } |
jjg@1521 | 52 | |
jjg@1521 | 53 | @TADescriptions({ |
jjg@1521 | 54 | @TADescription(annotation = "TA", type = CLASS_EXTENDS, typeIndex = -1), |
jjg@1521 | 55 | @TADescription(annotation = "TB", type = CLASS_EXTENDS, typeIndex = 1) |
jjg@1521 | 56 | }) |
jjg@1521 | 57 | public String abstractClass() { |
jjg@1521 | 58 | return "abstract class Test extends @TA Date implements Cloneable, @TB Runnable {" |
jjg@1521 | 59 | + " public void run() { } }"; |
jjg@1521 | 60 | } |
jjg@1521 | 61 | |
jjg@1521 | 62 | @TADescriptions({ |
jjg@1521 | 63 | @TADescription(annotation = "TA", type = CLASS_EXTENDS, typeIndex = -1, |
jjg@1521 | 64 | genericLocation = { 3, 0 }), |
jjg@1521 | 65 | @TADescription(annotation = "TB", type = CLASS_EXTENDS, typeIndex = 1, |
jjg@1521 | 66 | genericLocation = { 3, 1 }) |
jjg@1521 | 67 | }) |
jjg@1521 | 68 | public String abstractClassExtendsParametrized() { |
jjg@1521 | 69 | return "abstract class Test extends HashMap<@TA String, String> implements Cloneable, Map<String, @TB String>{ } "; |
jjg@1521 | 70 | } |
jjg@1521 | 71 | |
jjg@1521 | 72 | @TADescription(annotation = "TB", type = CLASS_EXTENDS, typeIndex = 1) |
jjg@1521 | 73 | public String regularInterface() { |
jjg@1521 | 74 | return "interface Test extends Cloneable, @TB Runnable { }"; |
jjg@1521 | 75 | } |
jjg@1521 | 76 | |
jjg@1521 | 77 | @TADescription(annotation = "TB", type = CLASS_EXTENDS, typeIndex = 1, |
jjg@1521 | 78 | genericLocation = { 3, 1 }) |
jjg@1521 | 79 | public String regularInterfaceExtendsParametrized() { |
jjg@1521 | 80 | return "interface Test extends Cloneable, Map<String, @TB String>{ } "; |
jjg@1521 | 81 | } |
jjg@1521 | 82 | |
jjg@1521 | 83 | @TADescription(annotation = "TB", type = CLASS_EXTENDS, typeIndex = 1) |
jjg@1521 | 84 | public String regularEnum() { |
jjg@1521 | 85 | return "enum Test implements Cloneable, @TB Runnable { TEST; public void run() { } }"; |
jjg@1521 | 86 | } |
jjg@1521 | 87 | |
jjg@1521 | 88 | @TADescription(annotation = "TB", type = CLASS_EXTENDS, typeIndex = 1, |
jjg@1521 | 89 | genericLocation = { 3, 0 }) |
jjg@1521 | 90 | public String regularEnumExtendsParametrized() { |
jjg@1521 | 91 | return |
jjg@1521 | 92 | "enum Test implements Cloneable, Comparator<@TB String> { TEST; " |
jjg@1521 | 93 | + "public int compare(String a, String b) { return 0; }}"; |
jjg@1521 | 94 | } |
jjg@1521 | 95 | |
jjg@1521 | 96 | } |