# HG changeset patch
# User ccheung
# Date 1571415458 25200
# Node ID 72e605a88500b850e0379116c41548591178a3d9
# Parent  0279391875bf5fd946aa47421c13d7782a97a2df
8232030: HelloDynamic.java fails with latest Graal
Summary: Include the dynamic dumping condition when setting up the merged_ordering array in merge_in_new_methods() of defaultMethods.cpp.
Reviewed-by: iklam, coleenp

diff -r 0279391875bf -r 72e605a88500 src/hotspot/share/classfile/defaultMethods.cpp
--- a/src/hotspot/share/classfile/defaultMethods.cpp	Fri Oct 18 11:36:35 2019 -0400
+++ b/src/hotspot/share/classfile/defaultMethods.cpp	Fri Oct 18 09:17:38 2019 -0700
@@ -1012,7 +1012,7 @@
       klass->class_loader_data(), new_size, NULL, CHECK);
 
   // original_ordering might be empty if this class has no methods of its own
-  if (JvmtiExport::can_maintain_original_method_order() || DumpSharedSpaces) {
+  if (JvmtiExport::can_maintain_original_method_order() || Arguments::is_dumping_archive()) {
     merged_ordering = MetadataFactory::new_array<int>(
         klass->class_loader_data(), new_size, CHECK);
   }