--- a/src/hotspot/share/jvmci/jvmciRuntime.hpp Fri Mar 08 18:21:52 2019 -0800
+++ b/src/hotspot/share/jvmci/jvmciRuntime.hpp Wed Apr 24 09:10:45 2019 -0700
@@ -53,18 +53,13 @@
private:
static jobject _HotSpotJVMCIRuntime_instance;
- static bool _HotSpotJVMCIRuntime_initialized;
static bool _well_known_classes_initialized;
- static CompLevelAdjustment _comp_level_adjustment;
-
static bool _shutdown_called;
- static CompLevel adjust_comp_level_inner(const methodHandle& method, bool is_osr, CompLevel level, JavaThread* thread);
-
public:
static bool is_HotSpotJVMCIRuntime_initialized() {
- return _HotSpotJVMCIRuntime_initialized;
+ return _HotSpotJVMCIRuntime_instance != NULL;
}
/**
@@ -74,7 +69,7 @@
static jobject get_HotSpotJVMCIRuntime_jobject(TRAPS) {
initialize_JVMCI(CHECK_NULL);
- assert(_HotSpotJVMCIRuntime_initialized, "must be");
+ assert(_HotSpotJVMCIRuntime_instance != NULL, "must be");
return _HotSpotJVMCIRuntime_instance;
}
@@ -107,18 +102,6 @@
return _shutdown_called;
}
- /**
- * Lets JVMCI modify the compilation level currently selected for a method by
- * the VM compilation policy.
- *
- * @param method the method being scheduled for compilation
- * @param is_osr specifies if the compilation is an OSR compilation
- * @param level the compilation level currently selected by the VM compilation policy
- * @param thread the current thread
- * @return the compilation level to use for the compilation
- */
- static CompLevel adjust_comp_level(const methodHandle& method, bool is_osr, CompLevel level, JavaThread* thread);
-
static BasicType kindToBasicType(Handle kind, TRAPS);
static void new_instance_common(JavaThread* thread, Klass* klass, bool null_on_fail);