Mon, 24 Nov 2014 12:49:30 -0500
8029012: parameter_index for type annotation not updated after outer.this added
Summary: Fix javac's handling of type annotations when synthetic parameters are added
Reviewed-by: jjg, mcimadamore
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 | /* |
aoqi@0 | 25 | @test |
aoqi@0 | 26 | @bug 8004969 |
aoqi@0 | 27 | @summary Lambda deserialization |
aoqi@0 | 28 | |
aoqi@0 | 29 | */ |
aoqi@0 | 30 | |
aoqi@0 | 31 | import java.io.*; |
aoqi@0 | 32 | |
aoqi@0 | 33 | public class T8004969 implements Serializable { |
aoqi@0 | 34 | |
aoqi@0 | 35 | static int assertionCount = 0; |
aoqi@0 | 36 | |
aoqi@0 | 37 | static void assertTrue(boolean cond) { |
aoqi@0 | 38 | assertionCount++; |
aoqi@0 | 39 | if (!cond) |
aoqi@0 | 40 | throw new AssertionError(); |
aoqi@0 | 41 | } |
aoqi@0 | 42 | |
aoqi@0 | 43 | static String mm(String s) { return "mref" + s; } |
aoqi@0 | 44 | |
aoqi@0 | 45 | String aField = "aF"; |
aoqi@0 | 46 | |
aoqi@0 | 47 | public static void main(String[] args) throws Exception { |
aoqi@0 | 48 | (new T8004969()).doit(); |
aoqi@0 | 49 | } |
aoqi@0 | 50 | |
aoqi@0 | 51 | public void doit() throws Exception { |
aoqi@0 | 52 | String aLocal = "aL"; |
aoqi@0 | 53 | int anInt = 99; |
aoqi@0 | 54 | |
aoqi@0 | 55 | try { |
aoqi@0 | 56 | // Write lambdas out |
aoqi@0 | 57 | ByteArrayOutputStream baos = new ByteArrayOutputStream(); |
aoqi@0 | 58 | ObjectOutput out = new ObjectOutputStream(baos); |
aoqi@0 | 59 | |
aoqi@0 | 60 | write(out, z -> "[" + z + "]" ); |
aoqi@0 | 61 | write(out, z -> { String x = z + z; return x + x; } ); |
aoqi@0 | 62 | write(out, T8004969::mm ); |
aoqi@0 | 63 | write(out, z -> (new LSI() { public String convert(String x) { return "*"+x; }} ).convert(z) ); |
aoqi@0 | 64 | write(out, z -> aField + z ); |
aoqi@0 | 65 | write(out, z -> aLocal + z ); |
aoqi@0 | 66 | write(out, z -> z + anInt ); |
aoqi@0 | 67 | out.flush(); |
aoqi@0 | 68 | out.close(); |
aoqi@0 | 69 | |
aoqi@0 | 70 | // Read them back |
aoqi@0 | 71 | ByteArrayInputStream bais = |
aoqi@0 | 72 | new ByteArrayInputStream(baos.toByteArray()); |
aoqi@0 | 73 | ObjectInputStream in = new ObjectInputStream(bais); |
aoqi@0 | 74 | readAssert(in, "[X]"); |
aoqi@0 | 75 | readAssert(in, "XXXX"); |
aoqi@0 | 76 | readAssert(in, "mrefX"); |
aoqi@0 | 77 | readAssert(in, "*X"); |
aoqi@0 | 78 | readAssert(in, "aFX"); |
aoqi@0 | 79 | readAssert(in, "aLX"); |
aoqi@0 | 80 | readAssert(in, "X99"); |
aoqi@0 | 81 | in.close(); |
aoqi@0 | 82 | } catch (IOException e) { |
aoqi@0 | 83 | e.printStackTrace(); |
aoqi@0 | 84 | throw e; |
aoqi@0 | 85 | } |
aoqi@0 | 86 | assertTrue(assertionCount == 7); |
aoqi@0 | 87 | } |
aoqi@0 | 88 | |
aoqi@0 | 89 | static void write(ObjectOutput out, LSI lamb) throws IOException { |
aoqi@0 | 90 | out.writeObject(lamb); |
aoqi@0 | 91 | } |
aoqi@0 | 92 | |
aoqi@0 | 93 | static void readAssert(ObjectInputStream in, String expected) throws IOException, ClassNotFoundException { |
aoqi@0 | 94 | LSI ls = (LSI) in.readObject(); |
aoqi@0 | 95 | String result = ls.convert("X"); |
aoqi@0 | 96 | System.out.printf("Result: %s\n", result); |
aoqi@0 | 97 | assertTrue(result.equals(expected)); |
aoqi@0 | 98 | } |
aoqi@0 | 99 | } |
aoqi@0 | 100 | |
aoqi@0 | 101 | interface LSI extends Serializable { |
aoqi@0 | 102 | String convert(String x); |
aoqi@0 | 103 | } |