changeset 4794:40037f37550d

7109063: JSR 292: fix for 7085860 is incomplete Reviewed-by: iveresov, alanb, jrose
author twisti
date Mon, 16 Jan 2012 01:48:07 -0800
parents b5074ea960b9
children d8462705e74c ffe93c01d5be
files src/share/classes/java/lang/invoke/MethodHandleImpl.java test/ProblemList.txt test/java/lang/invoke/InvokeDynamicPrintArgs.java
diffstat 3 files changed, 0 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/java/lang/invoke/MethodHandleImpl.java	Mon Jan 16 01:47:42 2012 -0800
+++ b/src/share/classes/java/lang/invoke/MethodHandleImpl.java	Mon Jan 16 01:48:07 2012 -0800
@@ -1258,12 +1258,4 @@
         return THROW_EXCEPTION;
     }
     static <T extends Throwable> Empty throwException(T t) throws T { throw t; }
-
-    // Linkage support:
-    static void registerBootstrap(Class<?> callerClass, MethodHandle bootstrapMethod) {
-        MethodHandleNatives.registerBootstrap(callerClass, bootstrapMethod);
-    }
-    static MethodHandle getBootstrap(Class<?> callerClass) {
-        return MethodHandleNatives.getBootstrap(callerClass);
-    }
 }
--- a/test/ProblemList.txt	Mon Jan 16 01:47:42 2012 -0800
+++ b/test/ProblemList.txt	Mon Jan 16 01:48:07 2012 -0800
@@ -195,9 +195,6 @@
 
 # jdk_lang
 
-# requires junit
-java/lang/invoke/InvokeDynamicPrintArgs.java                    generic-all
-
 # Times out on solaris 10 sparc
 java/lang/ClassLoader/Assert.java				generic-all
 
--- a/test/java/lang/invoke/InvokeDynamicPrintArgs.java	Mon Jan 16 01:47:42 2012 -0800
+++ b/test/java/lang/invoke/InvokeDynamicPrintArgs.java	Mon Jan 16 01:48:07 2012 -0800
@@ -38,8 +38,6 @@
 
 package test.java.lang.invoke;
 
-import org.junit.Test;
-
 import java.util.*;
 import java.io.*;
 
@@ -99,21 +97,6 @@
         System.setSecurityManager(new SM());
     }
 
-    @Test
-    public void testInvokeDynamicPrintArgs() throws IOException {
-        System.err.println(System.getProperties());
-        String testClassPath = System.getProperty("build.test.classes.dir");
-        if (testClassPath == null)  throw new RuntimeException();
-        String[] args = new String[]{
-            "--verify-specifier-count=3",
-            "--verbose",
-            "--expand-properties", "--classpath", testClassPath,
-            "--java", "test.java.lang.invoke.InvokeDynamicPrintArgs", "--check-output"
-        };
-        System.err.println("Indify: "+Arrays.toString(args));
-        indify.Indify.main(args);
-    }
-
     private static PrintStream oldOut;
     private static ByteArrayOutputStream buf;
     private static void openBuf() {