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) 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 4942232 |
aoqi@0 | 27 | * @summary Verifies that javah won't attempt to generate a header file if a |
aoqi@0 | 28 | * native method in a supplied class contains a parameter type whose corresponding |
aoqi@0 | 29 | * class is missing or not in the classpath |
aoqi@0 | 30 | * @library /tools/javac/lib |
aoqi@0 | 31 | * @build ToolBox |
aoqi@0 | 32 | * @run compile MissingParamClassTest.java |
aoqi@0 | 33 | * @clean MissingParamClassException |
aoqi@0 | 34 | * @run main MissingParamClassTest |
aoqi@0 | 35 | * @run compile MissingParamClassTest.java |
aoqi@0 | 36 | * @clean Param |
aoqi@0 | 37 | * @run main MissingParamClassTest |
aoqi@0 | 38 | */ |
aoqi@0 | 39 | |
aoqi@0 | 40 | import java.nio.file.Files; |
aoqi@0 | 41 | import java.nio.file.Paths; |
aoqi@0 | 42 | import java.util.ArrayList; |
aoqi@0 | 43 | import java.util.List; |
aoqi@0 | 44 | |
aoqi@0 | 45 | //original test: test/tools/javah/MissingParamClassTest.sh |
aoqi@0 | 46 | public class MissingParamClassTest { |
aoqi@0 | 47 | |
aoqi@0 | 48 | public static void main(String[] args) throws Exception { |
aoqi@0 | 49 | //first steps done now by jtreg |
aoqi@0 | 50 | //"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d . "${TESTSRC}${FS}ParamClassTest.java" "${TESTSRC}${FS}MissingParamClassException.java" |
aoqi@0 | 51 | //rm -f MissingParamClassException.class |
aoqi@0 | 52 | |
aoqi@0 | 53 | //"${TESTJAVA}${FS}bin${FS}javah" ${TESTTOOLVMOPTS} ParamClassTest 2>${TMP1} |
aoqi@0 | 54 | List<String> errOutput = new ArrayList<>(); |
aoqi@0 | 55 | ToolBox.JavaToolArgs javahParams = |
aoqi@0 | 56 | new ToolBox.JavaToolArgs(ToolBox.Expect.FAIL) |
aoqi@0 | 57 | .setAllArgs("-classpath", System.getProperty("test.classes"), "ParamClassTest") |
aoqi@0 | 58 | .setErrOutput(errOutput); |
aoqi@0 | 59 | ToolBox.javah(javahParams); |
aoqi@0 | 60 | |
aoqi@0 | 61 | //if [ -f $GENERATED_HEADER_FILE ]; then fail |
aoqi@0 | 62 | //if [ ! -s ${TMP1} ]; then fail |
aoqi@0 | 63 | if (Files.exists(Paths.get("ParamClassTest.h")) || errOutput.size() == 0) |
aoqi@0 | 64 | throw new AssertionError("The only output generated by javah must be an error message"); |
aoqi@0 | 65 | //jtreg again |
aoqi@0 | 66 | //rm -f MissingParamClassException.class ParamClassTest.class |
aoqi@0 | 67 | //rm -f $GENERATED_HEADER_FILE $TMP1 |
aoqi@0 | 68 | } |
aoqi@0 | 69 | |
aoqi@0 | 70 | } |
aoqi@0 | 71 | |
aoqi@0 | 72 | class MissingParamClassException extends Exception { |
aoqi@0 | 73 | public MissingParamClassException() { |
aoqi@0 | 74 | System.out.println("MissingParamClassException constructor called"); |
aoqi@0 | 75 | } |
aoqi@0 | 76 | } |
aoqi@0 | 77 | |
aoqi@0 | 78 | class ParamClassTest { |
aoqi@0 | 79 | public native void method(Param s); |
aoqi@0 | 80 | |
aoqi@0 | 81 | public static void main(String args[]) { |
aoqi@0 | 82 | } |
aoqi@0 | 83 | } |
aoqi@0 | 84 | |
aoqi@0 | 85 | class Param extends MissingParamClassException { |
aoqi@0 | 86 | Param() { |
aoqi@0 | 87 | System.out.println("Param constructor"); |
aoqi@0 | 88 | } |
aoqi@0 | 89 | } |