1.1 --- a/test/tools/javac/annotations/typeAnnotations/referenceinfos/Constructors.java Sun Oct 20 12:01:43 2013 -0700
1.2 +++ b/test/tools/javac/annotations/typeAnnotations/referenceinfos/Constructors.java Sun Oct 20 12:46:12 2013 -0700
1.3 @@ -21,14 +21,16 @@
1.4 * questions.
1.5 */
1.6
1.7 -import static com.sun.tools.classfile.TypeAnnotation.TargetType.*;
1.8 -
1.9 /*
1.10 * @test
1.11 + * @bug 8026791
1.12 * @summary Test population of reference info for constructor results
1.13 * @compile -g Driver.java ReferenceInfoUtil.java Constructors.java
1.14 * @run main Driver Constructors
1.15 */
1.16 +
1.17 +import static com.sun.tools.classfile.TypeAnnotation.TargetType.*;
1.18 +
1.19 public class Constructors {
1.20
1.21 @TADescriptions({
1.22 @@ -42,8 +44,8 @@
1.23 }
1.24
1.25 @TADescriptions({
1.26 - @TADescription(annotation = "TA", type = METHOD_RETURN),
1.27 - @TADescription(annotation = "TB", type = METHOD_RETURN),
1.28 + @TADescription(annotation = "TA", type = METHOD_RETURN, genericLocation = {1, 0}),
1.29 + @TADescription(annotation = "TB", type = METHOD_RETURN, genericLocation = {1, 0}),
1.30 @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER, paramIndex = 0)
1.31 })
1.32 @TestClass("Test$Inner")
1.33 @@ -56,9 +58,9 @@
1.34
1.35 @TADescriptions({
1.36 @TADescription(annotation = "TA", type = METHOD_RECEIVER),
1.37 - @TADescription(annotation = "TB", type = METHOD_RETURN),
1.38 + @TADescription(annotation = "TB", type = METHOD_RETURN, genericLocation = {1, 0}),
1.39 @TADescription(annotation = "TC", type = METHOD_RECEIVER),
1.40 - @TADescription(annotation = "TD", type = METHOD_RETURN),
1.41 + @TADescription(annotation = "TD", type = METHOD_RETURN, genericLocation = {1, 0}),
1.42 @TADescription(annotation = "TE", type = METHOD_FORMAL_PARAMETER, paramIndex = 0)
1.43 })
1.44 @TestClass("Test$Inner")
1.45 @@ -72,9 +74,9 @@
1.46 @TADescriptions({
1.47 @TADescription(annotation = "TA", type = METHOD_RECEIVER),
1.48 @TADescription(annotation = "TB", type = METHOD_RECEIVER, genericLocation = {1, 0}),
1.49 - @TADescription(annotation = "TC", type = METHOD_RETURN),
1.50 + @TADescription(annotation = "TC", type = METHOD_RETURN, genericLocation = {1, 0, 1, 0}),
1.51 @TADescription(annotation = "TD", type = METHOD_RECEIVER, genericLocation = {1, 0}),
1.52 - @TADescription(annotation = "TE", type = METHOD_RETURN),
1.53 + @TADescription(annotation = "TE", type = METHOD_RETURN, genericLocation = {1, 0, 1, 0}),
1.54 @TADescription(annotation = "TF", type = METHOD_FORMAL_PARAMETER, paramIndex = 0)
1.55 })
1.56 @TestClass("Outer$Middle$Inner")
