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
1 /*
2 * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 *
5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation.
8 *
9 * This code is distributed in the hope that it will be useful, but WITHOUT
10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12 * version 2 for more details (a copy is included in the LICENSE file that
13 * accompanied this code).
14 *
15 * You should have received a copy of the GNU General Public License version
16 * 2 along with this work; if not, write to the Free Software Foundation,
17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18 *
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20 * or visit www.oracle.com if you need additional information or have any
21 * questions.
22 */
24 /*
25 * @test
26 * @bug 6257087
27 * @summary javah doesn't produce proper signatures for inner class native methods
28 * @library /tools/javac/lib
29 * @build ToolBox
30 * @run main T6257087
31 */
33 import java.nio.file.Paths;
35 //original test: test/tools/javah/6257087/foo.sh
36 public class T6257087 {
38 private static final String fooBarGoldenFile =
39 "/* DO NOT EDIT THIS FILE - it is machine generated */\n" +
40 "#include <jni.h>\n" +
41 "/* Header for class foo_bar */\n" +
42 "\n" +
43 "#ifndef _Included_foo_bar\n" +
44 "#define _Included_foo_bar\n" +
45 "#ifdef __cplusplus\n" +
46 "extern \"C\" {\n" +
47 "#endif\n" +
48 "/*\n" +
49 " * Class: foo_bar\n" +
50 " * Method: aardvark\n" +
51 " * Signature: ()V\n" +
52 " */\n" +
53 "JNIEXPORT void JNICALL Java_foo_00024bar_aardvark\n" +
54 " (JNIEnv *, jobject);\n" +
55 "\n" +
56 "#ifdef __cplusplus\n" +
57 "}\n" +
58 "#endif\n" +
59 "#endif";
61 public static void main(String[] args) throws Exception {
62 // "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d "${TC}" "${TS}${FS}foo.java"
64 // "${TESTJAVA}${FS}bin${FS}javah" ${TESTTOOLVMOPTS} -classpath "${TC}" -d "${TC}" foo
65 ToolBox.JavaToolArgs javahArgs =
66 new ToolBox.JavaToolArgs()
67 .setAllArgs("-cp", System.getProperty("test.classes"), "foo");
68 ToolBox.javah(javahArgs);
70 // diff ${DIFFOPTS} -c "${TS}${FS}foo_bar.h" "${TC}${FS}foo_bar.h"
71 ToolBox.compareLines(Paths.get("foo_bar.h"),
72 ToolBox.splitLines(fooBarGoldenFile), null);
73 }
75 }
77 class foo {
78 class bar {
79 public native void aardvark();
80 }
81 }