# HG changeset patch # User jiefu # Date 1591841313 -28800 # Thu Jun 11 10:08:33 2020 +0800 # Node ID 3527fda43b189d5fb3b97788a52b68d017f640e6 # Parent 36a2f799b7fb871e964b9f6043d99c5af7ba389e 8247377: Zero and Minimal VMs are broken after JDK-8198698 ('SystemDictionaryShared' has not been declared) Reviewed-by: diff --git a/src/hotspot/share/prims/jvm.cpp b/src/hotspot/share/prims/jvm.cpp --- a/src/hotspot/share/prims/jvm.cpp +++ b/src/hotspot/share/prims/jvm.cpp @@ -3736,6 +3736,7 @@ jobject instantiatedMethodType, jclass lambdaProxyClass)) JVMWrapper("JVM_RegisterLambdaProxyClassForArchiving"); +#if INCLUDE_CDS if (!DynamicDumpSharedSpaces) { return; } @@ -3772,7 +3773,7 @@ SystemDictionaryShared::add_lambda_proxy_class(caller_ik, lambda_ik, invoked_name, invoked_type, method_type, m, instantiated_method_type); - +#endif // INCLUDE_CDS JVM_END JVM_ENTRY(jclass, JVM_LookupLambdaProxyClassFromArchive(JNIEnv* env, @@ -3784,6 +3785,7 @@ jobject instantiatedMethodType, jboolean initialize)) JVMWrapper("JVM_LookupLambdaProxyClassFromArchive"); +#if INCLUDE_CDS if (!DynamicArchive::is_mapped()) { return NULL; } @@ -3822,6 +3824,9 @@ jcls = loaded_lambda == NULL ? NULL : (jclass) JNIHandles::make_local(env, loaded_lambda->java_mirror()); } return jcls; +#else + return NULL; +#endif // INCLUDE_CDS JVM_END JVM_ENTRY(jboolean, JVM_IsCDSDumpingEnabled(JNIEnv* env))