src/share/vm/prims/jni.cpp

rev 8362 : [mq]: hotspot

*** 29,42 ****
  #include "classfile/classLoader.hpp"
  #include "classfile/javaClasses.hpp"
  #include "classfile/symbolTable.hpp"
  #include "classfile/systemDictionary.hpp"
  #include "classfile/vmSymbols.hpp"
  #include "interpreter/linkResolver.hpp"
  #include "memory/allocation.hpp"
  #include "memory/allocation.inline.hpp"
- #include "memory/gcLocker.inline.hpp"
  #include "memory/oopFactory.hpp"
  #include "memory/universe.inline.hpp"
  #include "oops/instanceKlass.hpp"
  #include "oops/instanceOop.hpp"
  #include "oops/markOop.hpp"
--- 29,42 ----
  #include "classfile/classLoader.hpp"
  #include "classfile/javaClasses.hpp"
  #include "classfile/symbolTable.hpp"
  #include "classfile/systemDictionary.hpp"
  #include "classfile/vmSymbols.hpp"
+ #include "gc/shared/gcLocker.inline.hpp"
  #include "interpreter/linkResolver.hpp"
  #include "memory/allocation.hpp"
  #include "memory/allocation.inline.hpp"
  #include "memory/oopFactory.hpp"
  #include "memory/universe.inline.hpp"
  #include "oops/instanceKlass.hpp"
  #include "oops/instanceOop.hpp"
  #include "oops/markOop.hpp"
*** 77,87 ****
  #include "utilities/dtrace.hpp"
  #include "utilities/events.hpp"
  #include "utilities/histogram.hpp"
  #include "utilities/macros.hpp"
  #if INCLUDE_ALL_GCS
! #include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
  #endif // INCLUDE_ALL_GCS
  
  static jint CurrentVersion = JNI_VERSION_1_8;
  
  #ifdef _WIN32
--- 77,87 ----
  #include "utilities/dtrace.hpp"
  #include "utilities/events.hpp"
  #include "utilities/histogram.hpp"
  #include "utilities/macros.hpp"
  #if INCLUDE_ALL_GCS
! #include "gc/g1/g1SATBCardTableModRefBS.hpp"
  #endif // INCLUDE_ALL_GCS
  
  static jint CurrentVersion = JNI_VERSION_1_8;
  
  #ifdef _WIN32
*** 3836,3853 ****
    return ret;
  }
  
  #ifndef PRODUCT
  
! #include "gc_implementation/shared/gcTimer.hpp"
! #include "gc_interface/collectedHeap.hpp"
  #if INCLUDE_ALL_GCS
! #include "gc_implementation/g1/heapRegionRemSet.hpp"
  #endif
  #include "memory/guardedMemory.hpp"
- #include "utilities/quickSort.hpp"
  #include "utilities/ostream.hpp"
  #if INCLUDE_VM_STRUCTS
  #include "runtime/vmStructs.hpp"
  #endif
  
  #define run_unit_test(unit_test_function_call)              \
--- 3836,3853 ----
    return ret;
  }
  
  #ifndef PRODUCT
  
! #include "gc/shared/collectedHeap.hpp"
! #include "gc/shared/gcTimer.hpp"
  #if INCLUDE_ALL_GCS
! #include "gc/g1/heapRegionRemSet.hpp"
  #endif
  #include "memory/guardedMemory.hpp"
  #include "utilities/ostream.hpp"
+ #include "utilities/quickSort.hpp"
  #if INCLUDE_VM_STRUCTS
  #include "runtime/vmStructs.hpp"
  #endif
  
  #define run_unit_test(unit_test_function_call)              \