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
1 /*
2 * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 *
5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation.
8 *
9 * This code is distributed in the hope that it will be useful, but WITHOUT
10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12 * version 2 for more details (a copy is included in the LICENSE file that
13 * accompanied this code).
14 *
15 * You should have received a copy of the GNU General Public License version
16 * 2 along with this work; if not, write to the Free Software Foundation,
17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18 *
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20 * or visit www.oracle.com if you need additional information or have any
21 * questions.
22 */
24 import static com.sun.tools.classfile.TypeAnnotation.TargetType.*;
26 /*
27 * @test
28 * @summary Test population of reference info for constructor results
29 * @compile -g Driver.java ReferenceInfoUtil.java Constructors.java
30 * @run main Driver Constructors
31 */
32 public class Constructors {
34 @TADescriptions({
35 @TADescription(annotation = "TA", type = METHOD_RETURN),
36 @TADescription(annotation = "TB", type = METHOD_RETURN),
37 @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER, paramIndex = 0)
38 })
39 public String regularClass() {
40 return "class Test { @TA Test() {}" +
41 " @TB Test(@TC int b) {} }";
42 }
44 @TADescriptions({
45 @TADescription(annotation = "TA", type = METHOD_RETURN),
46 @TADescription(annotation = "TB", type = METHOD_RETURN),
47 @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER, paramIndex = 0)
48 })
49 @TestClass("Test$Inner")
50 public String innerClass() {
51 return "class Test { class Inner {" +
52 " @TA Inner() {}" +
53 " @TB Inner(@TC int b) {}" +
54 " } }";
55 }
57 @TADescriptions({
58 @TADescription(annotation = "TA", type = METHOD_RECEIVER),
59 @TADescription(annotation = "TB", type = METHOD_RETURN),
60 @TADescription(annotation = "TC", type = METHOD_RECEIVER),
61 @TADescription(annotation = "TD", type = METHOD_RETURN),
62 @TADescription(annotation = "TE", type = METHOD_FORMAL_PARAMETER, paramIndex = 0)
63 })
64 @TestClass("Test$Inner")
65 public String innerClass2() {
66 return "class Test { class Inner {" +
67 " @TB Inner(@TA Test Test.this) {}" +
68 " @TD Inner(@TC Test Test.this, @TE int b) {}" +
69 " } }";
70 }
72 @TADescriptions({
73 @TADescription(annotation = "TA", type = METHOD_RECEIVER),
74 @TADescription(annotation = "TB", type = METHOD_RECEIVER, genericLocation = {1, 0}),
75 @TADescription(annotation = "TC", type = METHOD_RETURN),
76 @TADescription(annotation = "TD", type = METHOD_RECEIVER, genericLocation = {1, 0}),
77 @TADescription(annotation = "TE", type = METHOD_RETURN),
78 @TADescription(annotation = "TF", type = METHOD_FORMAL_PARAMETER, paramIndex = 0)
79 })
80 @TestClass("Outer$Middle$Inner")
81 public String innerClass3() {
82 return "class Outer { class Middle { class Inner {" +
83 " @TC Inner(@TA Outer. @TB Middle Middle.this) {}" +
84 " @TE Inner(@TD Middle Outer.Middle.this, @TF int b) {}" +
85 " } } }";
86 }
88 @TADescriptions({
89 @TADescription(annotation = "TA", type = CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT,
90 typeIndex = 0, offset = 4),
91 @TADescription(annotation = "TB", type = CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT,
92 typeIndex = 0, offset = 0)
93 })
94 public String generic1() {
95 return "class Test { <T> Test(int i) { new <@TA T>Test(); }" +
96 " <T> Test() { <@TB String>this(0); } }";
97 }
99 @TADescriptions({
100 @TADescription(annotation = "TA", type = CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT,
101 typeIndex = 0, offset = 0)
102 })
103 public String generic2() {
104 return "class Super { <T> Super(int i) { } } " +
105 "class Test extends Super { <T> Test() { <@TA String>super(0); } }";
106 }
108 }