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
aoqi@0 | 1 | /* |
aoqi@0 | 2 | * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. |
aoqi@0 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
aoqi@0 | 4 | * |
aoqi@0 | 5 | * This code is free software; you can redistribute it and/or modify it |
aoqi@0 | 6 | * under the terms of the GNU General Public License version 2 only, as |
aoqi@0 | 7 | * published by the Free Software Foundation. |
aoqi@0 | 8 | * |
aoqi@0 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
aoqi@0 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
aoqi@0 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
aoqi@0 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
aoqi@0 | 13 | * accompanied this code). |
aoqi@0 | 14 | * |
aoqi@0 | 15 | * You should have received a copy of the GNU General Public License version |
aoqi@0 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
aoqi@0 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
aoqi@0 | 18 | * |
aoqi@0 | 19 | * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
aoqi@0 | 20 | * or visit www.oracle.com if you need additional information or have any |
aoqi@0 | 21 | * questions. |
aoqi@0 | 22 | */ |
aoqi@0 | 23 | |
aoqi@0 | 24 | import static com.sun.tools.classfile.TypeAnnotation.TargetType.*; |
aoqi@0 | 25 | |
aoqi@0 | 26 | /* |
aoqi@0 | 27 | * @test |
aoqi@0 | 28 | * @bug 1234567 |
aoqi@0 | 29 | * @summary Test population of reference info for instance and class initializers |
aoqi@0 | 30 | * @author Werner Dietl |
aoqi@0 | 31 | * @compile -g Driver.java ReferenceInfoUtil.java Initializers.java |
aoqi@0 | 32 | * @run main Driver Initializers |
aoqi@0 | 33 | */ |
aoqi@0 | 34 | public class Initializers { |
aoqi@0 | 35 | |
aoqi@0 | 36 | @TADescriptions({ |
aoqi@0 | 37 | @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE), |
aoqi@0 | 38 | @TADescription(annotation = "TB", type = NEW, |
aoqi@0 | 39 | genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE) |
aoqi@0 | 40 | }) |
aoqi@0 | 41 | public String instanceInit1() { |
aoqi@0 | 42 | return "class Test { { Object o = new @TA ArrayList<@TB String>(); } }"; |
aoqi@0 | 43 | } |
aoqi@0 | 44 | |
aoqi@0 | 45 | @TADescriptions({ |
aoqi@0 | 46 | @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE), |
aoqi@0 | 47 | @TADescription(annotation = "TB", type = NEW, |
aoqi@0 | 48 | genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE), |
aoqi@0 | 49 | @TADescription(annotation = "TC", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE), |
aoqi@0 | 50 | @TADescription(annotation = "TD", type = NEW, |
aoqi@0 | 51 | genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE) |
aoqi@0 | 52 | }) |
aoqi@0 | 53 | public String instanceInit2() { |
aoqi@0 | 54 | return "class Test { Object f = new @TA ArrayList<@TB String>(); " + |
aoqi@0 | 55 | " { Object o = new @TC ArrayList<@TD String>(); } }"; |
aoqi@0 | 56 | } |
aoqi@0 | 57 | |
aoqi@0 | 58 | @TADescriptions({ |
aoqi@0 | 59 | @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE), |
aoqi@0 | 60 | @TADescription(annotation = "TB", type = NEW, |
aoqi@0 | 61 | genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE) |
aoqi@0 | 62 | }) |
aoqi@0 | 63 | public String staticInit1() { |
aoqi@0 | 64 | return "class Test { static { Object o = new @TA ArrayList<@TB String>(); } }"; |
aoqi@0 | 65 | } |
aoqi@0 | 66 | |
aoqi@0 | 67 | @TADescriptions({ |
aoqi@0 | 68 | @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE), |
aoqi@0 | 69 | @TADescription(annotation = "TB", type = NEW, |
aoqi@0 | 70 | genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE), |
aoqi@0 | 71 | @TADescription(annotation = "TC", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE), |
aoqi@0 | 72 | @TADescription(annotation = "TD", type = NEW, |
aoqi@0 | 73 | genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE), |
aoqi@0 | 74 | @TADescription(annotation = "TE", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE), |
aoqi@0 | 75 | @TADescription(annotation = "TF", type = NEW, |
aoqi@0 | 76 | genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE) |
aoqi@0 | 77 | }) |
aoqi@0 | 78 | public String staticInit2() { |
aoqi@0 | 79 | return "class Test { Object f = new @TA ArrayList<@TB String>(); " + |
aoqi@0 | 80 | " static Object g = new @TC ArrayList<@TD String>(); " + |
aoqi@0 | 81 | " static { Object o = new @TE ArrayList<@TF String>(); } }"; |
aoqi@0 | 82 | } |
aoqi@0 | 83 | |
aoqi@0 | 84 | // TODO: test interaction with several constructors, especially non-initial constuctors. |
aoqi@0 | 85 | // I don't think this kind of test is possible here. |
aoqi@0 | 86 | |
aoqi@0 | 87 | @TADescriptions({ |
aoqi@0 | 88 | @TADescription(annotation = "TA", type = CAST, |
aoqi@0 | 89 | typeIndex = 0, offset = ReferenceInfoUtil.IGNORE_VALUE), |
aoqi@0 | 90 | }) |
aoqi@0 | 91 | public String lazyConstantCast1() { |
aoqi@0 | 92 | return "class Test { public static final Object o = (@TA Object) null; }"; |
aoqi@0 | 93 | } |
aoqi@0 | 94 | |
aoqi@0 | 95 | } |