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 | /* |
jjg@1755 | 2 | * Copyright (c) 2012, 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 | /* |
jjg@1521 | 25 | * @test |
jjg@2150 | 26 | * @bug 8026791 |
jjg@1521 | 27 | * @summary Test population of reference info for constructor results |
jjg@1521 | 28 | * @compile -g Driver.java ReferenceInfoUtil.java Constructors.java |
jjg@1521 | 29 | * @run main Driver Constructors |
jjg@1521 | 30 | */ |
jjg@2150 | 31 | |
jjg@2150 | 32 | import static com.sun.tools.classfile.TypeAnnotation.TargetType.*; |
jjg@2150 | 33 | |
jjg@1521 | 34 | public class Constructors { |
jjg@1521 | 35 | |
jjg@1521 | 36 | @TADescriptions({ |
jjg@1521 | 37 | @TADescription(annotation = "TA", type = METHOD_RETURN), |
jjg@1521 | 38 | @TADescription(annotation = "TB", type = METHOD_RETURN), |
jjg@1521 | 39 | @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER, paramIndex = 0) |
jjg@1521 | 40 | }) |
jjg@1521 | 41 | public String regularClass() { |
jjg@1521 | 42 | return "class Test { @TA Test() {}" + |
jjg@1521 | 43 | " @TB Test(@TC int b) {} }"; |
jjg@1521 | 44 | } |
jjg@1521 | 45 | |
jjg@1521 | 46 | @TADescriptions({ |
jjg@2150 | 47 | @TADescription(annotation = "TA", type = METHOD_RETURN, genericLocation = {1, 0}), |
jjg@2150 | 48 | @TADescription(annotation = "TB", type = METHOD_RETURN, genericLocation = {1, 0}), |
jjg@1521 | 49 | @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER, paramIndex = 0) |
jjg@1521 | 50 | }) |
jjg@1521 | 51 | @TestClass("Test$Inner") |
jjg@1521 | 52 | public String innerClass() { |
jjg@1521 | 53 | return "class Test { class Inner {" + |
jjg@1521 | 54 | " @TA Inner() {}" + |
jjg@1521 | 55 | " @TB Inner(@TC int b) {}" + |
jjg@1521 | 56 | " } }"; |
jjg@1521 | 57 | } |
jjg@1521 | 58 | |
jjg@1521 | 59 | @TADescriptions({ |
jjg@1521 | 60 | @TADescription(annotation = "TA", type = METHOD_RECEIVER), |
jjg@2150 | 61 | @TADescription(annotation = "TB", type = METHOD_RETURN, genericLocation = {1, 0}), |
jjg@1521 | 62 | @TADescription(annotation = "TC", type = METHOD_RECEIVER), |
jjg@2150 | 63 | @TADescription(annotation = "TD", type = METHOD_RETURN, genericLocation = {1, 0}), |
jjg@1521 | 64 | @TADescription(annotation = "TE", type = METHOD_FORMAL_PARAMETER, paramIndex = 0) |
jjg@1521 | 65 | }) |
jjg@1521 | 66 | @TestClass("Test$Inner") |
jjg@1521 | 67 | public String innerClass2() { |
jjg@1521 | 68 | return "class Test { class Inner {" + |
jjg@1521 | 69 | " @TB Inner(@TA Test Test.this) {}" + |
jjg@1521 | 70 | " @TD Inner(@TC Test Test.this, @TE int b) {}" + |
jjg@1521 | 71 | " } }"; |
jjg@1521 | 72 | } |
jjg@1755 | 73 | |
jjg@1755 | 74 | @TADescriptions({ |
jjg@1755 | 75 | @TADescription(annotation = "TA", type = METHOD_RECEIVER), |
jjg@1755 | 76 | @TADescription(annotation = "TB", type = METHOD_RECEIVER, genericLocation = {1, 0}), |
jjg@2150 | 77 | @TADescription(annotation = "TC", type = METHOD_RETURN, genericLocation = {1, 0, 1, 0}), |
jjg@1755 | 78 | @TADescription(annotation = "TD", type = METHOD_RECEIVER, genericLocation = {1, 0}), |
jjg@2150 | 79 | @TADescription(annotation = "TE", type = METHOD_RETURN, genericLocation = {1, 0, 1, 0}), |
jjg@1755 | 80 | @TADescription(annotation = "TF", type = METHOD_FORMAL_PARAMETER, paramIndex = 0) |
jjg@1755 | 81 | }) |
jjg@1755 | 82 | @TestClass("Outer$Middle$Inner") |
jjg@1755 | 83 | public String innerClass3() { |
jjg@1755 | 84 | return "class Outer { class Middle { class Inner {" + |
jjg@1755 | 85 | " @TC Inner(@TA Outer. @TB Middle Middle.this) {}" + |
jjg@1755 | 86 | " @TE Inner(@TD Middle Outer.Middle.this, @TF int b) {}" + |
jjg@1755 | 87 | " } } }"; |
jjg@1755 | 88 | } |
jjg@1755 | 89 | |
jjg@1969 | 90 | @TADescriptions({ |
jjg@1969 | 91 | @TADescription(annotation = "TA", type = CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT, |
jjg@1969 | 92 | typeIndex = 0, offset = 4), |
jjg@1969 | 93 | @TADescription(annotation = "TB", type = CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT, |
jjg@1969 | 94 | typeIndex = 0, offset = 0) |
jjg@1969 | 95 | }) |
jjg@1969 | 96 | public String generic1() { |
jjg@1969 | 97 | return "class Test { <T> Test(int i) { new <@TA T>Test(); }" + |
jjg@1969 | 98 | " <T> Test() { <@TB String>this(0); } }"; |
jjg@1969 | 99 | } |
jjg@1969 | 100 | |
jjg@1969 | 101 | @TADescriptions({ |
jjg@1969 | 102 | @TADescription(annotation = "TA", type = CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT, |
jjg@1969 | 103 | typeIndex = 0, offset = 0) |
jjg@1969 | 104 | }) |
jjg@1969 | 105 | public String generic2() { |
jjg@1969 | 106 | return "class Super { <T> Super(int i) { } } " + |
jjg@1969 | 107 | "class Test extends Super { <T> Test() { <@TA String>super(0); } }"; |
jjg@1969 | 108 | } |
jjg@1969 | 109 | |
jjg@1521 | 110 | } |