src/hotspot/share/runtime/sharedRuntime.cpp

rev 49911 : imported patch removeAllGCs

*** 74,86 ****
  #include "utilities/macros.hpp"
  #include "utilities/xmlstream.hpp"
  #ifdef COMPILER1
  #include "c1/c1_Runtime1.hpp"
  #endif
! #if INCLUDE_ALL_GCS
  #include "gc/g1/g1ThreadLocalData.hpp"
! #endif // INCLUDE_ALL_GCS
  
  // Shared stub locations
  RuntimeStub*        SharedRuntime::_wrong_method_blob;
  RuntimeStub*        SharedRuntime::_wrong_method_abstract_blob;
  RuntimeStub*        SharedRuntime::_ic_miss_blob;
--- 74,86 ----
  #include "utilities/macros.hpp"
  #include "utilities/xmlstream.hpp"
  #ifdef COMPILER1
  #include "c1/c1_Runtime1.hpp"
  #endif
! #if INCLUDE_G1GC
  #include "gc/g1/g1ThreadLocalData.hpp"
! #endif // INCLUDE_G1GC
  
  // Shared stub locations
  RuntimeStub*        SharedRuntime::_wrong_method_blob;
  RuntimeStub*        SharedRuntime::_wrong_method_abstract_blob;
  RuntimeStub*        SharedRuntime::_ic_miss_blob;
*** 206,216 ****
      tty->print_cr("Total IC misses: %7d", tot_misses);
    }
  }
  #endif // PRODUCT
  
! #if INCLUDE_ALL_GCS
  
  // G1 write-barrier pre: executed before a pointer store.
  JRT_LEAF(void, SharedRuntime::g1_wb_pre(oopDesc* orig, JavaThread *thread))
    if (orig == NULL) {
      assert(false, "should be optimized out");
--- 206,216 ----
      tty->print_cr("Total IC misses: %7d", tot_misses);
    }
  }
  #endif // PRODUCT
  
! #if INCLUDE_G1GC
  
  // G1 write-barrier pre: executed before a pointer store.
  JRT_LEAF(void, SharedRuntime::g1_wb_pre(oopDesc* orig, JavaThread *thread))
    if (orig == NULL) {
      assert(false, "should be optimized out");
*** 224,234 ****
  // G1 write-barrier post: executed after a pointer store.
  JRT_LEAF(void, SharedRuntime::g1_wb_post(void* card_addr, JavaThread* thread))
    G1ThreadLocalData::dirty_card_queue(thread).enqueue(card_addr);
  JRT_END
  
! #endif // INCLUDE_ALL_GCS
  
  
  JRT_LEAF(jlong, SharedRuntime::lmul(jlong y, jlong x))
    return x * y;
  JRT_END
--- 224,234 ----
  // G1 write-barrier post: executed after a pointer store.
  JRT_LEAF(void, SharedRuntime::g1_wb_post(void* card_addr, JavaThread* thread))
    G1ThreadLocalData::dirty_card_queue(thread).enqueue(card_addr);
  JRT_END
  
! #endif // INCLUDE_G1GC
  
  
  JRT_LEAF(jlong, SharedRuntime::lmul(jlong y, jlong x))
    return x * y;
  JRT_END