*** old/src/share/vm/gc/shared/collectedHeap.cpp	Wed Sep 16 15:18:38 2015
--- new/src/share/vm/gc/shared/collectedHeap.cpp	Wed Sep 16 15:18:37 2015

*** 225,235 ****
--- 225,235 ----
  }
  
  void CollectedHeap::pre_initialize() {
    // Used for ReduceInitialCardMarks (when COMPILER2 is used);
    // otherwise remains unused.
! #ifdef COMPILER2
! #if defined(COMPILER2) || INCLUDE_JVMCI
    _defer_initial_card_mark =    ReduceInitialCardMarks && can_elide_tlab_store_barriers()
                               && (DeferInitialCardMark || card_mark_must_follow_store());
  #else
    assert(_defer_initial_card_mark == false, "Who would set it?");
  #endif

*** 533,543 ****
--- 533,543 ----
    assert(!use_tlab || Threads::first() != NULL,
           "Attempt to fill tlabs before main thread has been added"
           " 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);
! #ifdef COMPILER2
! #if defined(COMPILER2) || INCLUDE_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).
       if (deferred) flush_deferred_store_barrier(thread);
  #else