stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8181823: [AOT] jaotc doesn't work with Graal

Browse Source 
Add new flag to indicate when to calculate class fingerprint

Reviewed-by: iklam, iveresov
This commit is contained in:
Vladimir Kozlov 2017-06-21 10:28:27 -07:00
parent 8041519b2e
commit dd676c3a98
4 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hotspot/src/jdk.internal.vm.compiler/share/classes/module-info.java
View File

@ -39,6 +39,7 @@ module jdk.internal.vm.compiler {
uses org.graalvm.compiler.debug.TTYStreamProvider; uses org.graalvm.compiler.debug.TTYStreamProvider;
uses org.graalvm.compiler.hotspot.CompilerConfigurationFactory; uses org.graalvm.compiler.hotspot.CompilerConfigurationFactory;
uses org.graalvm.compiler.hotspot.HotSpotBackendFactory; uses org.graalvm.compiler.hotspot.HotSpotBackendFactory;
uses org.graalvm.compiler.hotspot.HotSpotCodeCacheListener;
uses org.graalvm.compiler.options.OptionValuesAccess; uses org.graalvm.compiler.options.OptionValuesAccess;
uses org.graalvm.compiler.nodes.graphbuilderconf.NodeIntrinsicPluginFactory; uses org.graalvm.compiler.nodes.graphbuilderconf.NodeIntrinsicPluginFactory;

2
hotspot/src/share/vm/oops/instanceKlass.cpp
View File

@ -1954,7 +1954,7 @@ bool InstanceKlass::supers_have_passed_fingerprint_checks() {
bool InstanceKlass::should_store_fingerprint() { bool InstanceKlass::should_store_fingerprint() {
#if INCLUDE_AOT #if INCLUDE_AOT
// We store the fingerprint into the InstanceKlass only in the following 2 cases: // We store the fingerprint into the InstanceKlass only in the following 2 cases:
if (EnableJVMCI && !UseJVMCICompiler) { if (CalculateClassFingerprint) {
// (1) We are running AOT to generate a shared library. // (1) We are running AOT to generate a shared library.
return true; return true;
} }

3
hotspot/src/share/vm/runtime/globals.hpp
View File

@ -3387,6 +3387,9 @@ public:
diagnostic(bool, UseAOTStrictLoading, false, \ diagnostic(bool, UseAOTStrictLoading, false, \
"Exit the VM if any of the AOT libraries has invalid config") \ "Exit the VM if any of the AOT libraries has invalid config") \
\ \
product(bool, CalculateClassFingerprint, false, \
"Calculate class fingerprint") \
\
/* interpreter debugging */ \ /* interpreter debugging */ \
develop(intx, BinarySwitchThreshold, 5, \ develop(intx, BinarySwitchThreshold, 5, \
"Minimal number of lookupswitch entries for rewriting to binary " \ "Minimal number of lookupswitch entries for rewriting to binary " \

1
hotspot/src/share/vm/runtime/java.cpp
View File

@ -437,6 +437,7 @@ void before_exit(JavaThread* thread) {
Thread* THREAD = thread; Thread* THREAD = thread;
JVMCIRuntime::shutdown(THREAD); JVMCIRuntime::shutdown(THREAD);
if (HAS_PENDING_EXCEPTION) { if (HAS_PENDING_EXCEPTION) {
HandleMark hm(THREAD);
Handle exception(THREAD, PENDING_EXCEPTION); Handle exception(THREAD, PENDING_EXCEPTION);
CLEAR_PENDING_EXCEPTION; CLEAR_PENDING_EXCEPTION;
java_lang_Throwable::java_printStackTrace(exception, THREAD); java_lang_Throwable::java_printStackTrace(exception, THREAD);