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@1521 | 2 | * Copyright (c) 2008, 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 java.lang.annotation.*; |
jjg@1521 | 25 | |
jjg@1521 | 26 | /* |
jjg@1521 | 27 | * @test |
jjg@1521 | 28 | * @bug 8006775 |
jjg@1521 | 29 | * @summary new type annotation location: multicatch |
jjg@1521 | 30 | * @author Werner Dietl |
jjg@1521 | 31 | * @compile MultiCatch.java |
jjg@1521 | 32 | */ |
jjg@1521 | 33 | |
jjg@1521 | 34 | class DefaultScope { |
jjg@1521 | 35 | void exception01() { |
jjg@1521 | 36 | try { |
jjg@1521 | 37 | System.out.println("Hello 1!"); |
jjg@1521 | 38 | } catch (@B NullPointerException | @C IllegalArgumentException e) { |
jjg@1521 | 39 | e.toString(); |
jjg@1521 | 40 | } |
jjg@1521 | 41 | } |
jjg@1755 | 42 | /* Disabled: there is no syntax to annotate all components |
jjg@1755 | 43 | * of the multicatch. |
jjg@1521 | 44 | void exception02() { |
jjg@1521 | 45 | try { |
jjg@1521 | 46 | System.out.println("Hello 2!"); |
jjg@1521 | 47 | } catch @A (@B NullPointerException | @C IllegalArgumentException e) { |
jjg@1521 | 48 | e.toString(); |
jjg@1521 | 49 | } |
jjg@1521 | 50 | } |
jjg@1755 | 51 | */ |
jjg@1521 | 52 | } |
jjg@1521 | 53 | |
jjg@1521 | 54 | class ModifiedVars { |
jjg@1755 | 55 | void exception01() { |
jjg@1521 | 56 | try { |
jjg@1755 | 57 | System.out.println("Hello 1!"); |
jjg@1755 | 58 | } catch (final @B NullPointerException | @C IllegalArgumentException e) { |
jjg@1521 | 59 | e.toString(); |
jjg@1521 | 60 | } |
jjg@1521 | 61 | } |
jjg@1755 | 62 | void exception02() { |
jjg@1755 | 63 | try { |
jjg@1755 | 64 | System.out.println("Hello 1!"); |
jjg@1755 | 65 | } catch (@Decl @B NullPointerException | @C IllegalArgumentException e) { |
jjg@1755 | 66 | e.toString(); |
jjg@1755 | 67 | } |
jjg@1755 | 68 | } |
jjg@1521 | 69 | } |
jjg@1521 | 70 | |
jjg@1521 | 71 | @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) |
jjg@1521 | 72 | @interface A { } |
jjg@1521 | 73 | @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) |
jjg@1521 | 74 | @interface B { } |
jjg@1521 | 75 | @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) |
jjg@1521 | 76 | @interface C { } |
jjg@1755 | 77 | |
jjg@1755 | 78 | @interface Decl { } |