changeset 22967:8c999e913d82

temporary workaround until JDK-8142511 is integrated
author Doug Simon <doug.simon@oracle.com>
date Wed, 11 Nov 2015 22:43:24 +0100
parents 2adc45c38bde
children 1492a9afd575
files graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java	Wed Nov 11 17:02:13 2015 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java	Wed Nov 11 22:43:24 2015 +0100
@@ -63,6 +63,7 @@
 import java.util.jar.JarFile;
 import java.util.stream.Collectors;
 
+import jdk.vm.ci.code.BytecodeFrame;
 import jdk.vm.ci.hotspot.HotSpotCompilationRequest;
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider;
@@ -476,6 +477,9 @@
         });
 
         try {
+            // Temporary workaround until JDK-8142511 is integrated
+            BytecodeFrame.isPlaceholderBci(0);
+
             // compile dummy method to get compiler initialized outside of the
             // config debug override.
             HotSpotResolvedJavaMethod dummyMethod = (HotSpotResolvedJavaMethod) JVMCI.getRuntime().getHostJVMCIBackend().getMetaAccess().lookupJavaMethod(