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