Thu, 21 Feb 2013 15:26:46 +0000
8007461: Regression: bad overload resolution when inner class and outer class have method with same name
Summary: Fix regression in varargs method resolution introduced by bad refactoring
Reviewed-by: jjg
aoqi@0 | 1 | /* |
aoqi@0 | 2 | * Copyright (c) 2012, 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 7126832 |
aoqi@0 | 27 | * @compile java.java |
aoqi@0 | 28 | * @summary com.sun.tools.javac.api.ClientCodeWrapper$WrappedJavaFileManager cannot be cast |
aoqi@0 | 29 | * @run main T7126832 |
aoqi@0 | 30 | */ |
aoqi@0 | 31 | |
aoqi@0 | 32 | import java.io.*; |
aoqi@0 | 33 | import java.util.*; |
aoqi@0 | 34 | |
aoqi@0 | 35 | public class T7126832 { |
aoqi@0 | 36 | public static void main(String... args) throws Exception { |
aoqi@0 | 37 | new T7126832().run(); |
aoqi@0 | 38 | } |
aoqi@0 | 39 | |
aoqi@0 | 40 | void run() throws Exception { |
aoqi@0 | 41 | Locale prev = Locale.getDefault(); |
aoqi@0 | 42 | Locale.setDefault(Locale.ENGLISH); |
aoqi@0 | 43 | try { |
aoqi@0 | 44 | // Verify that a .java file is correctly diagnosed |
aoqi@0 | 45 | File ff = writeFile(new File("JavahTest.java"), "class JavahTest {}"); |
aoqi@0 | 46 | test(Arrays.asList(ff.getPath()), 1, "Could not find class file for 'JavahTest.java'."); |
aoqi@0 | 47 | |
aoqi@0 | 48 | // Verify that a class named 'xx.java' is accepted. |
aoqi@0 | 49 | // Note that ./xx/java.class exists, so this should work ok |
aoqi@0 | 50 | test(Arrays.asList("xx.java"), 0, null); |
aoqi@0 | 51 | |
aoqi@0 | 52 | if (errors > 0) { |
aoqi@0 | 53 | throw new Exception(errors + " errors occurred"); |
aoqi@0 | 54 | } |
aoqi@0 | 55 | } finally { |
aoqi@0 | 56 | Locale.setDefault(prev); |
aoqi@0 | 57 | } |
aoqi@0 | 58 | } |
aoqi@0 | 59 | |
aoqi@0 | 60 | void test(List<String> args, int expectRC, String expectOut) { |
aoqi@0 | 61 | System.err.println("Test: " + args |
aoqi@0 | 62 | + " rc:" + expectRC |
aoqi@0 | 63 | + ((expectOut != null) ? " out:" + expectOut : "")); |
aoqi@0 | 64 | |
aoqi@0 | 65 | StringWriter sw = new StringWriter(); |
aoqi@0 | 66 | PrintWriter pw = new PrintWriter(sw); |
aoqi@0 | 67 | int rc = 0; |
aoqi@0 | 68 | String out = null; |
aoqi@0 | 69 | try { |
aoqi@0 | 70 | rc = com.sun.tools.javah.Main.run(args.toArray(new String[args.size()]), pw); |
aoqi@0 | 71 | out = sw.toString(); |
aoqi@0 | 72 | } catch(Exception ee) { |
aoqi@0 | 73 | rc = 1; |
aoqi@0 | 74 | out = ee.toString();; |
aoqi@0 | 75 | } |
aoqi@0 | 76 | pw.close(); |
aoqi@0 | 77 | if (!out.isEmpty()) { |
aoqi@0 | 78 | System.err.println(out); |
aoqi@0 | 79 | } |
aoqi@0 | 80 | if (rc != expectRC) { |
aoqi@0 | 81 | error("Unexpected exit code: " + rc + "; expected: " + expectRC); |
aoqi@0 | 82 | } |
aoqi@0 | 83 | if (expectOut != null && !out.contains(expectOut)) { |
aoqi@0 | 84 | error("Expected string not found: " + expectOut); |
aoqi@0 | 85 | } |
aoqi@0 | 86 | |
aoqi@0 | 87 | System.err.println(); |
aoqi@0 | 88 | } |
aoqi@0 | 89 | |
aoqi@0 | 90 | File writeFile(File ff, String ss) throws IOException { |
aoqi@0 | 91 | if (ff.getParentFile() != null) |
aoqi@0 | 92 | ff.getParentFile().mkdirs(); |
aoqi@0 | 93 | |
aoqi@0 | 94 | try (FileWriter out = new FileWriter(ff)) { |
aoqi@0 | 95 | out.write(ss); |
aoqi@0 | 96 | } |
aoqi@0 | 97 | return ff; |
aoqi@0 | 98 | } |
aoqi@0 | 99 | |
aoqi@0 | 100 | void error(String msg) { |
aoqi@0 | 101 | System.err.println(msg); |
aoqi@0 | 102 | errors++; |
aoqi@0 | 103 | } |
aoqi@0 | 104 | |
aoqi@0 | 105 | int errors; |
aoqi@0 | 106 | } |
aoqi@0 | 107 |