changeset 34489:c742968c922b

Merge
author amurillo
date Thu, 03 Dec 2015 22:30:17 -0800
parents 16e5e1fdf327 945799ef99f3
children eb1c1d3d7647 24c22a1b14ff b509dfa96469
files
diffstat 1 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/test/lib/sun/hotspot/WhiteBox.java	Wed Dec 02 11:22:12 2015 -0800
+++ b/test/lib/sun/hotspot/WhiteBox.java	Thu Dec 03 22:30:17 2015 -0800
@@ -32,6 +32,7 @@
 import java.util.function.Function;
 import java.security.BasicPermission;
 import java.util.Objects;
+import jdk.internal.HotSpotIntrinsicCandidate;
 
 import sun.hotspot.parser.DiagnosticCommand;
 
@@ -170,6 +171,9 @@
   public native boolean shouldPrintAssembly(Executable method);
   public native int     deoptimizeFrames(boolean makeNotEntrant);
   public native void    deoptimizeAll();
+
+  @HotSpotIntrinsicCandidate
+  public        void    deoptimize() {}
   public        boolean isMethodCompiled(Executable method) {
     return isMethodCompiled(method, false /*not osr*/);
   }
@@ -304,6 +308,8 @@
   }
   public native Object[] getCodeBlob(long addr);
 
+  public native void clearInlineCaches();
+
   // Intered strings
   public native boolean isInStringTable(String str);