--- old/test/lib/sun/hotspot/WhiteBox.java	2016-02-25 15:39:27.896183534 +0100
+++ new/test/lib/sun/hotspot/WhiteBox.java	2016-02-25 15:39:27.816183531 +0100
@@ -302,13 +302,20 @@
     Objects.requireNonNull(method);
     return testSetForceInlineMethod0(method, value);
   }
-  public        boolean enqueueMethodForCompilation(Executable method, int compLevel) {
-    return enqueueMethodForCompilation(method, compLevel, -1 /*InvocationEntryBci*/);
+  private native boolean enqueueMethodForCompilation0(Executable method, int compLevel, int entry_bci, boolean block);
+  public boolean compileMethod(Executable method, int compLevel) {
+    return compileMethod(method, compLevel, -1 /*InvocationEntryBci*/);
   }
-  private native boolean enqueueMethodForCompilation0(Executable method, int compLevel, int entry_bci);
+  public boolean compileMethod(Executable method, int compLevel, int entry_bci) {
+    Objects.requireNonNull(method);
+    return enqueueMethodForCompilation0(method, compLevel, entry_bci, true);    
+  }    
+  public boolean enqueueMethodForCompilation(Executable method, int compLevel) {
+    return enqueueMethodForCompilation(method, compLevel, -1 /*InvocationEntryBci*/);
+  }  
   public  boolean enqueueMethodForCompilation(Executable method, int compLevel, int entry_bci) {
     Objects.requireNonNull(method);
-    return enqueueMethodForCompilation0(method, compLevel, entry_bci);
+    return enqueueMethodForCompilation0(method, compLevel, entry_bci, false);
   }
   private native void    clearMethodState0(Executable method);
   public         void    clearMethodState(Executable method) {