Mercurial > hg > truffle
diff src/share/vm/gc_interface/collectedHeap.cpp @ 21559:be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Thu, 28 May 2015 15:36:48 +0200 |
| parents | 7848fc12602b |
| children |
line wrap: on
line diff
--- a/src/share/vm/gc_interface/collectedHeap.cpp Wed May 27 13:43:27 2015 +0200 +++ b/src/share/vm/gc_interface/collectedHeap.cpp Thu May 28 15:36:48 2015 +0200 @@ -217,8 +217,8 @@ #ifdef COMPILER2 _defer_initial_card_mark = ReduceInitialCardMarks && can_elide_tlab_store_barriers() && (DeferInitialCardMark || card_mark_must_follow_store()); -#elif defined GRAAL - _defer_initial_card_mark = GraalDeferredInitBarriers && can_elide_tlab_store_barriers() +#elif defined JVMCI + _defer_initial_card_mark = JVMCIDeferredInitBarriers && can_elide_tlab_store_barriers() && (DeferInitialCardMark || card_mark_must_follow_store()); #else assert(_defer_initial_card_mark == false, "Who would set it?"); @@ -527,7 +527,7 @@ " to threads list is doomed to failure!"); for (JavaThread *thread = Threads::first(); thread; thread = thread->next()) { if (use_tlab) thread->tlab().make_parsable(retire_tlabs); -#if defined(COMPILER2) || defined(GRAAL) +#if defined(COMPILER2) || defined(JVMCI) // The deferred store barriers must all have been flushed to the // card-table (or other remembered set structure) before GC starts // processing the card-table (or other remembered set).