7109063: JSR 292: fix for 7085860 is incomplete

Reviewed-by: iveresov, alanb, jrose

src/share/classes/java/lang/invoke/MethodHandleImpl.java

@@ -934,12 +934,4 @@ import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP;
         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);
-    }
 }

test/ProblemList.txt

@@ -195,9 +195,6 @@ java/beans/XMLEncoder/6329581/Test6329581.java                  generic-all
 
 # jdk_lang
 
-# requires junit
-java/lang/invoke/InvokeDynamicPrintArgs.java                    generic-all
-
 # 7079093
 java/lang/instrument/ManifestTest.sh                            windows-all
 

test/java/lang/invoke/CallSiteTest.java

@@ -36,8 +36,6 @@
 
 package test.java.lang.invoke;
 
-import static org.junit.Assert.*;
-
 import java.io.*;
 
 import java.lang.invoke.*;
@@ -72,6 +70,11 @@ public class CallSiteTest {
     private final static int RESULT1 = 762786192;
     private final static int RESULT2 = -21474836;
 
+    private static void assertEquals(int expected, int actual) {
+        if (expected != actual)
+            throw new AssertionError("expected: " + expected + ", actual: " + actual);
+    }
+
     private static void testMutableCallSite() throws Throwable {
         // warm-up
         for (int i = 0; i < 20000; i++) {

test/java/lang/invoke/InvokeDynamicPrintArgs.java

@@ -38,8 +38,6 @@
 
 package test.java.lang.invoke;
 
-import org.junit.Test;
-
 import java.util.*;
 import java.io.*;
 
@@ -99,21 +97,6 @@ public class InvokeDynamicPrintArgs {
         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() {