src/hotspot/share/oops/constMethod.hpp
changeset 54927 1512d88b24c6
parent 53584 f72661ff0294
child 58447 319173c62caa
--- a/src/hotspot/share/oops/constMethod.hpp	Fri May 17 10:48:02 2019 -0400
+++ b/src/hotspot/share/oops/constMethod.hpp	Fri May 17 08:29:55 2019 -0700
@@ -288,12 +288,16 @@
 
   // adapter
   void set_adapter_entry(AdapterHandlerEntry* adapter) {
-    assert(!is_shared(), "shared methods have fixed adapter_trampoline");
+    assert(!is_shared(),
+           "shared methods in archive have fixed adapter_trampoline");
     _adapter = adapter;
   }
   void set_adapter_trampoline(AdapterHandlerEntry** trampoline) {
-    assert(DumpSharedSpaces, "must be");
-    assert(*trampoline == NULL, "must be NULL during dump time, to be initialized at run time");
+    assert(DumpSharedSpaces || DynamicDumpSharedSpaces, "must be");
+    if (DumpSharedSpaces) {
+      assert(*trampoline == NULL,
+             "must be NULL during dump time, to be initialized at run time");
+    }
     _adapter_trampoline = trampoline;
   }
   void update_adapter_trampoline(AdapterHandlerEntry* adapter) {