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) 2009, 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 | 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 new object creations |
jjg@1521 | 29 | * @compile -g Driver.java ReferenceInfoUtil.java NewObjects.java |
jjg@1521 | 30 | * @run main Driver NewObjects |
jjg@1521 | 31 | */ |
jjg@1521 | 32 | public class NewObjects { |
jjg@1521 | 33 | |
jjg@1521 | 34 | @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE) |
jjg@1521 | 35 | public String returnObject() { |
jjg@1521 | 36 | return "Object returnObject() { return new @TA String(); }"; |
jjg@1521 | 37 | } |
jjg@1521 | 38 | |
jjg@1521 | 39 | @TADescriptions({ |
jjg@1521 | 40 | @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE), |
jjg@1521 | 41 | @TADescription(annotation = "TB", type = NEW, |
jjg@1521 | 42 | genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE) |
jjg@1521 | 43 | }) |
jjg@1521 | 44 | public String returnObjectGeneric() { |
jjg@1521 | 45 | return "Object returnObjectGeneric() { return new @TA ArrayList<@TB String>(); }"; |
jjg@1521 | 46 | } |
jjg@1521 | 47 | |
jjg@1521 | 48 | @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE) |
jjg@1521 | 49 | public String initObject() { |
jjg@1521 | 50 | return "void initObject() { Object a = new @TA String(); }"; |
jjg@1521 | 51 | } |
jjg@1521 | 52 | |
jjg@1521 | 53 | @TADescriptions({ |
jjg@1521 | 54 | @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE), |
jjg@1521 | 55 | @TADescription(annotation = "TB", type = NEW, |
jjg@1521 | 56 | genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE), |
jjg@1521 | 57 | @TADescription(annotation = "TC", type = NEW, |
jjg@1521 | 58 | genericLocation = { 3, 1 }, offset = ReferenceInfoUtil.IGNORE_VALUE) |
jjg@1521 | 59 | }) |
jjg@1521 | 60 | public String initObjectGeneric() { |
jjg@1521 | 61 | return "void initObjectGeneric() { Object a = new @TA HashMap<@TB String, @TC String>(); }"; |
jjg@1521 | 62 | } |
jjg@1521 | 63 | |
jjg@1521 | 64 | @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE) |
jjg@1521 | 65 | public String eqtestObject() { |
jjg@1521 | 66 | return "void eqtestObject() { if (null == new @TA String()); }"; |
jjg@1521 | 67 | } |
jjg@1521 | 68 | |
jjg@1521 | 69 | @TADescriptions({ |
jjg@1521 | 70 | @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE), |
jjg@1521 | 71 | @TADescription(annotation = "TB", type = NEW, |
jjg@1521 | 72 | genericLocation = { 3, 0 }, offset = ReferenceInfoUtil.IGNORE_VALUE) |
jjg@1521 | 73 | }) |
jjg@1521 | 74 | public String eqtestObjectGeneric() { |
jjg@1521 | 75 | return "void eqtestObjectGeneric() { if (null == new @TA ArrayList<@TB String >()); }"; |
jjg@1521 | 76 | } |
jjg@1521 | 77 | |
jjg@1755 | 78 | @TADescriptions({ |
jjg@1755 | 79 | @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE, |
jjg@1755 | 80 | genericLocation = {0, 0}), |
jjg@1755 | 81 | @TADescription(annotation = "TB", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE) |
jjg@1755 | 82 | }) |
jjg@1755 | 83 | public String returnNewArray1() { |
jjg@1755 | 84 | return "Object returnNewArray1() { return new @TA String @TB[1]; }"; |
jjg@1755 | 85 | } |
jjg@1755 | 86 | |
jjg@1755 | 87 | @TADescriptions({ |
jjg@1755 | 88 | @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE, |
jjg@1755 | 89 | genericLocation = {0, 0, 0, 0}), |
jjg@1755 | 90 | @TADescription(annotation = "TB", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE), |
jjg@1755 | 91 | @TADescription(annotation = "TC", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE, |
jjg@1755 | 92 | genericLocation = {0, 0}), |
jjg@1755 | 93 | }) |
jjg@1755 | 94 | public String returnNewArray2() { |
jjg@1755 | 95 | return "Object returnNewArray2() { return new @TA String @TB [1] @TC [2]; }"; |
jjg@1755 | 96 | } |
jjg@1755 | 97 | |
jjg@1755 | 98 | @TADescriptions({ |
jjg@1755 | 99 | @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE, |
jjg@1755 | 100 | genericLocation = {0, 0, 0, 0}), |
jjg@1755 | 101 | @TADescription(annotation = "TB", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE, |
jjg@1755 | 102 | genericLocation = {0, 0, 0, 0, 1, 0}), |
jjg@1755 | 103 | @TADescription(annotation = "TC", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE), |
jjg@1755 | 104 | @TADescription(annotation = "TD", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE, |
jjg@1755 | 105 | genericLocation = {0, 0}), |
jjg@1755 | 106 | }) |
jjg@1755 | 107 | public String returnNewArray3() { |
jjg@1755 | 108 | return "Object returnNewArray3() { return new @TA Outer. @TB Inner @TC [1] @TD [2]; }"; |
jjg@1755 | 109 | } |
jjg@1755 | 110 | |
jjg@1755 | 111 | @TADescriptions({ |
jjg@1755 | 112 | @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE, |
jjg@1755 | 113 | genericLocation = {0, 0, 0, 0}), |
jjg@1755 | 114 | @TADescription(annotation = "TB", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE, |
jjg@1755 | 115 | genericLocation = {0, 0, 0, 0, 1, 0}), |
jjg@1755 | 116 | @TADescription(annotation = "TC", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE, |
jjg@1755 | 117 | genericLocation = {0, 0, 0, 0, 1, 0, 1, 0}), |
jjg@1755 | 118 | @TADescription(annotation = "TD", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE), |
jjg@1755 | 119 | @TADescription(annotation = "TE", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE, |
jjg@1755 | 120 | genericLocation = {0, 0}), |
jjg@1755 | 121 | }) |
jjg@1755 | 122 | public String returnNewArray4() { |
jjg@1755 | 123 | return "Object returnNewArray4() { return new @TA Outer. @TB Middle. @TC MInner @TD [1] @TE [2]; }"; |
jjg@1755 | 124 | } |
jjg@1755 | 125 | |
jjg@1755 | 126 | @TADescriptions({ |
jjg@1755 | 127 | @TADescription(annotation = "TA", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE), |
jjg@1755 | 128 | @TADescription(annotation = "TB", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE, |
jjg@1755 | 129 | genericLocation = {3, 0, 0, 0, 0, 0}), |
jjg@1755 | 130 | @TADescription(annotation = "TC", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE, |
jjg@1755 | 131 | genericLocation = {3, 0, 0, 0, 0, 0, 1, 0}), |
jjg@1755 | 132 | @TADescription(annotation = "TD", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE, |
jjg@1755 | 133 | genericLocation = {3, 0, 0, 0, 0, 0, 1, 0, 1, 0}), |
jjg@1755 | 134 | @TADescription(annotation = "TE", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE, |
jjg@1755 | 135 | genericLocation = {3, 0}), |
jjg@1755 | 136 | @TADescription(annotation = "TF", type = NEW, offset = ReferenceInfoUtil.IGNORE_VALUE, |
jjg@1755 | 137 | genericLocation = {3, 0, 0, 0}), |
jjg@1755 | 138 | }) |
jjg@1755 | 139 | public String returnNewArray5() { |
jjg@1755 | 140 | return "Object returnNewArray5() { return new @TA ArrayList<@TB Outer. @TC Middle. @TD MInner @TE [] @TF []>(); }"; |
jjg@1755 | 141 | } |
jjg@1755 | 142 | |
jjg@1755 | 143 | @TADescriptions({ |
jjg@1755 | 144 | @TADescription(annotation = "TA", type = FIELD, offset = ReferenceInfoUtil.IGNORE_VALUE, |
jjg@1755 | 145 | genericLocation = {0, 0, 0, 0}), |
jjg@1755 | 146 | @TADescription(annotation = "TB", type = FIELD, offset = ReferenceInfoUtil.IGNORE_VALUE, |
jjg@1755 | 147 | genericLocation = {0, 0, 0, 0, 1, 0}), |
jjg@1755 | 148 | @TADescription(annotation = "TC", type = FIELD, offset = ReferenceInfoUtil.IGNORE_VALUE), |
jjg@1755 | 149 | @TADescription(annotation = "TD", type = FIELD, offset = ReferenceInfoUtil.IGNORE_VALUE, |
jjg@1755 | 150 | genericLocation = {0, 0}), |
jjg@1755 | 151 | }) |
jjg@1755 | 152 | public String arrayField() { |
jjg@1755 | 153 | return "@TA Outer. @TB Inner @TC [] @TD [] f;"; |
jjg@1755 | 154 | } |
jjg@1521 | 155 | } |