changeset 51738:1a89ca728abd

8207006: serviceability/sa/TestUniverse.java#id0 crashes with EpsilonGC and AOT Reviewed-by: twisti, kvn
author shade
date Thu, 12 Jul 2018 09:13:55 +0200
parents 038688fa32d0
children 20a772d8ded0
files src/hotspot/share/aot/aotCodeHeap.cpp
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/hotspot/share/aot/aotCodeHeap.cpp	Thu Jul 12 08:44:39 2018 +0800
+++ b/src/hotspot/share/aot/aotCodeHeap.cpp	Thu Jul 12 09:13:55 2018 +0200
@@ -549,7 +549,7 @@
     _lib_symbols_initialized = true;
 
     CollectedHeap* heap = Universe::heap();
-    SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_card_table_address", address, ci_card_table_address());
+    SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_card_table_address", address, (BarrierSet::barrier_set()->is_a(BarrierSet::CardTableBarrierSet) ? ci_card_table_address() : NULL));
     SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_heap_top_address", address, (heap->supports_inline_contig_alloc() ? heap->top_addr() : NULL));
     SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_heap_end_address", address, (heap->supports_inline_contig_alloc() ? heap->end_addr() : NULL));
     SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_polling_page", address, os::get_polling_page());