archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-19 18:44:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8247377: Zero and Minimal VMs are broken after JDK-8198698 ('SystemDictionaryShared' has not been declared)

Browse source 
Reviewed-by: dholmes
This commit is contained in:
Jie Fu 2020-06-11 10:08:33 +08:00
parent 259662fe77
commit 462f806818
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/hotspot/share/prims/jvm.cpp
View file

@ -3736,6 +3736,7 @@ JVM_ENTRY(void, JVM_RegisterLambdaProxyClassForArchiving(JNIEnv* env,
jobject instantiatedMethodType, jobject instantiatedMethodType,
jclass lambdaProxyClass)) jclass lambdaProxyClass))
JVMWrapper("JVM_RegisterLambdaProxyClassForArchiving"); JVMWrapper("JVM_RegisterLambdaProxyClassForArchiving");
#if INCLUDE_CDS
if (!DynamicDumpSharedSpaces) { if (!DynamicDumpSharedSpaces) {
return; return;
} }
@ -3772,7 +3773,7 @@ JVM_ENTRY(void, JVM_RegisterLambdaProxyClassForArchiving(JNIEnv* env,
SystemDictionaryShared::add_lambda_proxy_class(caller_ik, lambda_ik, invoked_name, invoked_type, SystemDictionaryShared::add_lambda_proxy_class(caller_ik, lambda_ik, invoked_name, invoked_type,
method_type, m, instantiated_method_type); method_type, m, instantiated_method_type);
#endif // INCLUDE_CDS
JVM_END JVM_END
JVM_ENTRY(jclass, JVM_LookupLambdaProxyClassFromArchive(JNIEnv* env, JVM_ENTRY(jclass, JVM_LookupLambdaProxyClassFromArchive(JNIEnv* env,
@ -3784,6 +3785,7 @@ JVM_ENTRY(jclass, JVM_LookupLambdaProxyClassFromArchive(JNIEnv* env,
jobject instantiatedMethodType, jobject instantiatedMethodType,
jboolean initialize)) jboolean initialize))
JVMWrapper("JVM_LookupLambdaProxyClassFromArchive"); JVMWrapper("JVM_LookupLambdaProxyClassFromArchive");
#if INCLUDE_CDS
if (!DynamicArchive::is_mapped()) { if (!DynamicArchive::is_mapped()) {
return NULL; return NULL;
} }
@ -3822,6 +3824,9 @@ JVM_ENTRY(jclass, JVM_LookupLambdaProxyClassFromArchive(JNIEnv* env,
jcls = loaded_lambda == NULL ? NULL : (jclass) JNIHandles::make_local(env, loaded_lambda->java_mirror()); jcls = loaded_lambda == NULL ? NULL : (jclass) JNIHandles::make_local(env, loaded_lambda->java_mirror());
} }
return jcls; return jcls;
#else
return NULL;
#endif // INCLUDE_CDS
JVM_END JVM_END
JVM_ENTRY(jboolean, JVM_IsCDSDumpingEnabled(JNIEnv* env)) JVM_ENTRY(jboolean, JVM_IsCDSDumpingEnabled(JNIEnv* env))