# HG changeset patch
# User shade
# Date 1531379635 -7200
# Node ID 1a89ca728abd37564fa9f35a37db98ddb0ff0e25
# Parent  038688fa32d0b7fb82e26e894ed9fd502dea5c7c
8207006: serviceability/sa/TestUniverse.java#id0 crashes with EpsilonGC and AOT
Reviewed-by: twisti, kvn

diff -r 038688fa32d0 -r 1a89ca728abd src/hotspot/share/aot/aotCodeHeap.cpp
--- 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());