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
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 literals |
jjg@1521 | 29 | * @compile -g Driver.java ReferenceInfoUtil.java TypeTests.java |
jjg@1521 | 30 | * @run main Driver TypeTests |
jjg@1521 | 31 | */ |
jjg@1521 | 32 | public class TypeTests { |
jjg@1521 | 33 | |
jjg@1521 | 34 | @TADescription(annotation = "TA", type = INSTANCEOF, offset = ReferenceInfoUtil.IGNORE_VALUE) |
jjg@1521 | 35 | public String returnObject() { |
jjg@1521 | 36 | return "Object returnObject() { return null instanceof @TA String; }"; |
jjg@1521 | 37 | } |
jjg@1521 | 38 | |
jjg@1521 | 39 | @TADescriptions({ |
jjg@1521 | 40 | @TADescription(annotation = "TA", type = INSTANCEOF, offset = ReferenceInfoUtil.IGNORE_VALUE), |
jjg@1521 | 41 | @TADescription(annotation = "TB", type = INSTANCEOF, |
jjg@1521 | 42 | genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE), |
jjg@1521 | 43 | @TADescription(annotation = "TC", type = INSTANCEOF, |
jjg@1521 | 44 | genericLocation = { 0, 0, 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE) |
jjg@1521 | 45 | }) |
jjg@1521 | 46 | public String returnObjectArray() { |
jjg@1521 | 47 | return "Object returnObjectArray() { return null instanceof @TC String @TA [] @TB []; }"; |
jjg@1521 | 48 | } |
jjg@1521 | 49 | |
jjg@1521 | 50 | // no type test for primitives |
jjg@1521 | 51 | |
jjg@1521 | 52 | @TADescriptions({ |
jjg@1521 | 53 | @TADescription(annotation = "TA", type = INSTANCEOF, offset = ReferenceInfoUtil.IGNORE_VALUE), |
jjg@1521 | 54 | @TADescription(annotation = "TB", type = INSTANCEOF, |
jjg@1521 | 55 | genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE), |
jjg@1521 | 56 | @TADescription(annotation = "TC", type = INSTANCEOF, |
jjg@1521 | 57 | genericLocation = { 0, 0, 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE) |
jjg@1521 | 58 | }) |
jjg@1521 | 59 | public String returnPrimArray() { |
jjg@1521 | 60 | return "Object returnPrimArray() { return null instanceof @TC int @TA [] @TB []; }"; |
jjg@1521 | 61 | } |
jjg@1521 | 62 | |
jjg@1521 | 63 | // no void |
jjg@1521 | 64 | // no void array |
jjg@1521 | 65 | |
jjg@1521 | 66 | @TADescription(annotation = "TA", type = INSTANCEOF, offset = ReferenceInfoUtil.IGNORE_VALUE) |
jjg@1521 | 67 | public String initObject() { |
jjg@1521 | 68 | return "void initObject() { Object a = null instanceof @TA String; }"; |
jjg@1521 | 69 | } |
jjg@1521 | 70 | |
jjg@1521 | 71 | @TADescriptions({ |
jjg@1521 | 72 | @TADescription(annotation = "TA", type = INSTANCEOF, offset = ReferenceInfoUtil.IGNORE_VALUE), |
jjg@1521 | 73 | @TADescription(annotation = "TB", type = INSTANCEOF, |
jjg@1521 | 74 | genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE), |
jjg@1521 | 75 | @TADescription(annotation = "TC", type = INSTANCEOF, |
jjg@1521 | 76 | genericLocation = { 0, 0, 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE) |
jjg@1521 | 77 | }) |
jjg@1521 | 78 | public String initObjectArray() { |
jjg@1521 | 79 | return "void initObjectArray() { Object a = null instanceof @TC String @TA [] @TB []; }"; |
jjg@1521 | 80 | } |
jjg@1521 | 81 | |
jjg@1521 | 82 | // no primitive instanceof |
jjg@1521 | 83 | |
jjg@1521 | 84 | @TADescriptions({ |
jjg@1521 | 85 | @TADescription(annotation = "TA", type = INSTANCEOF, offset = ReferenceInfoUtil.IGNORE_VALUE), |
jjg@1521 | 86 | @TADescription(annotation = "TB", type = INSTANCEOF, |
jjg@1521 | 87 | genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE), |
jjg@1521 | 88 | @TADescription(annotation = "TC", type = INSTANCEOF, |
jjg@1521 | 89 | genericLocation = { 0, 0, 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE) |
jjg@1521 | 90 | }) |
jjg@1521 | 91 | public String initPrimArray() { |
jjg@1521 | 92 | return "void initPrimArray() { Object a = null instanceof @TC int @TA [] @TB []; }"; |
jjg@1521 | 93 | } |
jjg@1521 | 94 | |
jjg@1521 | 95 | // no void |
jjg@1521 | 96 | // no void array |
jjg@1521 | 97 | |
jjg@1521 | 98 | @TADescription(annotation = "TA", type = INSTANCEOF, offset = ReferenceInfoUtil.IGNORE_VALUE) |
jjg@1521 | 99 | public String eqtestObject() { |
jjg@1521 | 100 | return "void eqtestObject() { if (true == (null instanceof @TA String)); }"; |
jjg@1521 | 101 | } |
jjg@1521 | 102 | |
jjg@1521 | 103 | @TADescriptions({ |
jjg@1521 | 104 | @TADescription(annotation = "TA", type = INSTANCEOF, offset = ReferenceInfoUtil.IGNORE_VALUE), |
jjg@1521 | 105 | @TADescription(annotation = "TB", type = INSTANCEOF, |
jjg@1521 | 106 | genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE), |
jjg@1521 | 107 | @TADescription(annotation = "TC", type = INSTANCEOF, |
jjg@1521 | 108 | genericLocation = { 0, 0, 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE) |
jjg@1521 | 109 | }) |
jjg@1521 | 110 | public String eqtestObjectArray() { |
jjg@1521 | 111 | return "void eqtestObjectArray() { if (true == (null instanceof @TC String @TA [] @TB [])); }"; |
jjg@1521 | 112 | } |
jjg@1521 | 113 | |
jjg@1521 | 114 | // no primitives |
jjg@1521 | 115 | |
jjg@1521 | 116 | @TADescriptions({ |
jjg@1521 | 117 | @TADescription(annotation = "TA", type = INSTANCEOF, offset = ReferenceInfoUtil.IGNORE_VALUE), |
jjg@1521 | 118 | @TADescription(annotation = "TB", type = INSTANCEOF, |
jjg@1521 | 119 | genericLocation = { 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE), |
jjg@1521 | 120 | @TADescription(annotation = "TC", type = INSTANCEOF, |
jjg@1521 | 121 | genericLocation = { 0, 0, 0, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE) |
jjg@1521 | 122 | }) |
jjg@1521 | 123 | public String eqtestPrimArray() { |
jjg@1521 | 124 | return "void eqtestPrimArray() { if (true == (null instanceof @TC int @TA [] @TB [])); }"; |
jjg@1521 | 125 | } |
jjg@1521 | 126 | |
jjg@1521 | 127 | // no void |
jjg@1521 | 128 | // no void array |
jjg@1521 | 129 | |
jjg@1521 | 130 | } |