comparison src/share/vm/oops/cpCache.cpp @ 8002:8391fdd36e1f

Merge
author dlong
date Sun, 27 Jan 2013 01:07:09 -0800
parents db9981fd3124
children 461a3adac4d1
comparison
equal deleted inserted replaced
7946:6fbe8a57549d 8002:8391fdd36e1f
31 #include "oops/objArrayOop.hpp" 31 #include "oops/objArrayOop.hpp"
32 #include "oops/oop.inline.hpp" 32 #include "oops/oop.inline.hpp"
33 #include "prims/jvmtiRedefineClassesTrace.hpp" 33 #include "prims/jvmtiRedefineClassesTrace.hpp"
34 #include "prims/methodHandles.hpp" 34 #include "prims/methodHandles.hpp"
35 #include "runtime/handles.inline.hpp" 35 #include "runtime/handles.inline.hpp"
36 #ifndef SERIALGC 36 #include "utilities/macros.hpp"
37 #if INCLUDE_ALL_GCS
37 # include "gc_implementation/parallelScavenge/psPromotionManager.hpp" 38 # include "gc_implementation/parallelScavenge/psPromotionManager.hpp"
38 #endif 39 #endif // INCLUDE_ALL_GCS
39 40
40 41
41 // Implememtation of ConstantPoolCacheEntry 42 // Implememtation of ConstantPoolCacheEntry
42 43
43 void ConstantPoolCacheEntry::initialize_entry(int index) { 44 void ConstantPoolCacheEntry::initialize_entry(int index) {