Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/test/tools/javac/meth/InvokeMH.java	Tue Jun 07 14:01:26 2011 -0700
     1.2 +++ b/test/tools/javac/meth/InvokeMH.java	Fri Jun 10 11:44:34 2011 -0700
     1.3 @@ -77,23 +77,23 @@
     1.4          Object o; String s; int i;  // for return type testing
     1.5  
     1.6          // next five must have sig = (*,*)*
     1.7 -        o = mh_SiO.invokeGeneric((Object)"world", (Object)123);
     1.8 -        mh_SiO.invokeGeneric((Object)"mundus", (Object)456);
     1.9 +        o = mh_SiO.invoke((Object)"world", (Object)123);
    1.10 +        mh_SiO.invoke((Object)"mundus", (Object)456);
    1.11          Object k = "kosmos";
    1.12 -        o = mh_SiO.invokeGeneric(k, 789);
    1.13 -        o = mh_SiO.invokeGeneric(null, 000);
    1.14 -        o = mh_SiO.invokeGeneric("arda", -123);
    1.15 +        o = mh_SiO.invoke(k, 789);
    1.16 +        o = mh_SiO.invoke(null, 000);
    1.17 +        o = mh_SiO.invoke("arda", -123);
    1.18  
    1.19          // sig = ()String
    1.20 -        o = mh_vS.invokeGeneric();
    1.21 +        o = mh_vS.invoke();
    1.22  
    1.23          // sig = ()int
    1.24 -        i = (int) mh_vi.invokeGeneric();
    1.25 -        o = (int) mh_vi.invokeGeneric();
    1.26 -        mh_vi.invokeGeneric();
    1.27 +        i = (int) mh_vi.invoke();
    1.28 +        o = (int) mh_vi.invoke();
    1.29 +        mh_vi.invoke();
    1.30  
    1.31          // sig = ()void
    1.32 -        mh_vv.invokeGeneric();
    1.33 -        o = mh_vv.invokeGeneric();
    1.34 +        mh_vv.invoke();
    1.35 +        o = mh_vv.invoke();
    1.36      }
    1.37  }

     2.1 --- a/test/tools/javac/meth/XlintWarn.java	Tue Jun 07 14:01:26 2011 -0700
     2.2 +++ b/test/tools/javac/meth/XlintWarn.java	Fri Jun 10 11:44:34 2011 -0700
     2.3 @@ -35,19 +35,19 @@
     2.4  class XlintWarn {
     2.5      void test(MethodHandle mh) throws Throwable {
     2.6          int i1 = (int)mh.invokeExact();
     2.7 -        int i2 = (int)mh.invokeGeneric();
     2.8 +        int i2 = (int)mh.invoke();
     2.9          int i3 = (int)mh.invokeWithArguments();
    2.10      }
    2.11  
    2.12      void test2(MethodHandle mh) throws Throwable {
    2.13          int i1 = (int)(mh.invokeExact());
    2.14 -        int i2 = (int)(mh.invokeGeneric());
    2.15 +        int i2 = (int)(mh.invoke());
    2.16          int i3 = (int)(mh.invokeWithArguments());
    2.17      }
    2.18  
    2.19      void test3(MethodHandle mh) throws Throwable {
    2.20          int i1 = (int)((mh.invokeExact()));
    2.21 -        int i2 = (int)((mh.invokeGeneric()));
    2.22 +        int i2 = (int)((mh.invoke()));
    2.23          int i3 = (int)((mh.invokeWithArguments()));
    2.24      }
    2.25  }