Mercurial > hg > release > icedtea7-forest-2.0 > langtools
changeset 1061:f494ca4bca0d
Merge
author | lana |
---|---|
date | Wed, 15 Jun 2011 16:11:16 -0700 |
parents | b8a2c9c87018 (diff) 8ed03b0e3c9c (current diff) |
children | 9425dd4f53d5 |
files | |
diffstat | 3 files changed, 15 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Jun 06 11:08:52 2011 -0700 +++ b/.hgtags Wed Jun 15 16:11:16 2011 -0700 @@ -119,3 +119,4 @@ 7476b164194c1814704153e74d5ff7e965c6fdbf jdk7-b142 5faa9eedc44e201f2b13ad837e9077668b823d28 jdk7-b143 8eb952f43b117d538f6ca5e9e43ff9ce7646c7ee jdk7-b144 +c455e2ae5c93014ae3fc475aba4509b5f70465f7 jdk7-b145
--- a/test/tools/javac/meth/InvokeMH.java Mon Jun 06 11:08:52 2011 -0700 +++ b/test/tools/javac/meth/InvokeMH.java Wed Jun 15 16:11:16 2011 -0700 @@ -77,23 +77,23 @@ Object o; String s; int i; // for return type testing // next five must have sig = (*,*)* - o = mh_SiO.invokeGeneric((Object)"world", (Object)123); - mh_SiO.invokeGeneric((Object)"mundus", (Object)456); + o = mh_SiO.invoke((Object)"world", (Object)123); + mh_SiO.invoke((Object)"mundus", (Object)456); Object k = "kosmos"; - o = mh_SiO.invokeGeneric(k, 789); - o = mh_SiO.invokeGeneric(null, 000); - o = mh_SiO.invokeGeneric("arda", -123); + o = mh_SiO.invoke(k, 789); + o = mh_SiO.invoke(null, 000); + o = mh_SiO.invoke("arda", -123); // sig = ()String - o = mh_vS.invokeGeneric(); + o = mh_vS.invoke(); // sig = ()int - i = (int) mh_vi.invokeGeneric(); - o = (int) mh_vi.invokeGeneric(); - mh_vi.invokeGeneric(); + i = (int) mh_vi.invoke(); + o = (int) mh_vi.invoke(); + mh_vi.invoke(); // sig = ()void - mh_vv.invokeGeneric(); - o = mh_vv.invokeGeneric(); + mh_vv.invoke(); + o = mh_vv.invoke(); } }
--- a/test/tools/javac/meth/XlintWarn.java Mon Jun 06 11:08:52 2011 -0700 +++ b/test/tools/javac/meth/XlintWarn.java Wed Jun 15 16:11:16 2011 -0700 @@ -35,19 +35,19 @@ class XlintWarn { void test(MethodHandle mh) throws Throwable { int i1 = (int)mh.invokeExact(); - int i2 = (int)mh.invokeGeneric(); + int i2 = (int)mh.invoke(); int i3 = (int)mh.invokeWithArguments(); } void test2(MethodHandle mh) throws Throwable { int i1 = (int)(mh.invokeExact()); - int i2 = (int)(mh.invokeGeneric()); + int i2 = (int)(mh.invoke()); int i3 = (int)(mh.invokeWithArguments()); } void test3(MethodHandle mh) throws Throwable { int i1 = (int)((mh.invokeExact())); - int i2 = (int)((mh.invokeGeneric())); + int i2 = (int)((mh.invoke())); int i3 = (int)((mh.invokeWithArguments())); } }