stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

7010194: several langtools regression failures after JSR 292 changes (b123)

Browse Source 
Some regression tests rely on unsupported JSR 292 features

Reviewed-by: jjg
This commit is contained in:
Maurizio Cimadamore 2011-01-05 09:59:01 +00:00
parent 34c5f24321
commit 21c037bb9b
4 changed files with 7 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
langtools/test/tools/javac/diags/examples/TypeParameterOnPolymorphicSignature.java
View File

@ -24,8 +24,10 @@
// key: compiler.warn.type.parameter.on.polymorphic.signature // key: compiler.warn.type.parameter.on.polymorphic.signature
// key: compiler.err.unreported.exception.need.to.catch.or.throw // key: compiler.err.unreported.exception.need.to.catch.or.throw
import java.dyn.InvokeDynamic; import java.dyn.MethodHandle;
class TypeParameterOnPolymorphicSignature { class TypeParameterOnPolymorphicSignature {
{ InvokeDynamic.<void>call("",123); } void test(MethodHandle mh) {
mh.<void>invokeExact("",123);
}
} }

64
langtools/test/tools/javac/meth/InvokeDyn.java
View File

@ -1,64 +0,0 @@
/*
* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 6754038 6979327
* @summary Generate call sites for method handle
* @author jrose
*
* @library ..
* @compile -source 7 -target 7 -XDinvokedynamic -XDallowTransitionalJSR292=no InvokeDyn.java
*/
//No: @run main/othervm -XX:+EnableInvokeDynamic meth.InvokeDyn
/*
* Standalone testing:
* <code>
* $ cd $MY_REPO_DIR/langtools
* $ (cd make; make)
* $ ./dist/bootstrap/bin/javac -d dist test/tools/javac/meth/InvokeDyn.java
* $ javap -c -classpath dist meth.InvokeDyn
* </code>
*/
package meth;
import java.dyn.*;
public class InvokeDyn {
class CS extends CallSite {
CS(Object x, Object y, Object z) { throw new RuntimeException(); }
}
//@BootstrapMethod(CS.class) //note: requires 6964498
void test() throws Throwable {
Object x = "hello";
Object ojunk; int ijunk;
ojunk = InvokeDynamic.greet(x, "world", 123);
ojunk = InvokeDynamic.greet(x, "mundus", 456);
ojunk = InvokeDynamic.greet(x, "kosmos", 789);
ojunk = (String) InvokeDynamic.cogitate(10.11121, 3.14);
//InvokeDynamic.#"yow: what I mean to say is, please treat this one specially"(null);
ijunk = (int) InvokeDynamic.invoke("goodbye");
}
}

59
langtools/test/tools/javac/meth/InvokeDynTrans.java
View File

@ -1,59 +0,0 @@
/*
* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 6754038 6979327
* @summary Generate call sites for method handle
* @author jrose
*
* @library ..
* @compile/fail/ref=InvokeDynTrans.out -Werror -XDrawDiagnostics -source 7 -target 7 InvokeDynTrans.java
*/
//No: @run main/othervm -XX:+EnableInvokeDynamic meth.InvokeDyn
/*
* Standalone testing:
* <code>
* $ cd $MY_REPO_DIR/langtools
* $ (cd make; make)
* $ ./dist/bootstrap/bin/javac -d dist test/tools/javac/meth/InvokeDyn.java
* $ javap -c -classpath dist meth.InvokeDyn
* </code>
*/
package meth;
import java.dyn.InvokeDynamic;
public class InvokeDynTrans {
void test() throws Throwable {
Object x = "hello";
InvokeDynamic.greet(x, "world", 123);
InvokeDynamic.greet(x, "mundus", 456);
InvokeDynamic.greet(x, "kosmos", 789);
InvokeDynamic.<String>cogitate(10.11121, 3.14);
//InvokeDynamic.<void>#"yow: what I mean to say is, please treat this one specially"(null);
InvokeDynamic.<int>invoke("goodbye");
}
}

8
langtools/test/tools/javac/meth/XlintWarn.java
View File

@ -23,7 +23,7 @@
/* /*
* @test * @test
* @bug 6999067 * @bug 6999067 7010194
* @summary cast for invokeExact call gets redundant cast to <type> warnings * @summary cast for invokeExact call gets redundant cast to <type> warnings
* @author mcimadamore * @author mcimadamore
* *
@ -34,9 +34,7 @@ import java.dyn.*;
class XlintWarn { class XlintWarn {
void test(MethodHandle mh) throws Throwable { void test(MethodHandle mh) throws Throwable {
int i1 = (int)mh.invoke(); int i1 = (int)mh.invokeExact();
int i2 = (int)mh.invokeExact(); int i2 = (int)mh.invokeVarargs();
int i3 = (int)mh.invokeVarargs();
int i4 = (int)InvokeDynamic.test();
} }
} }