comparison src/share/vm/oops/instanceKlass.cpp @ 7212:291ffc492eb6

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Fri, 14 Dec 2012 14:35:13 +0100
parents 5d0bb7d52783 f34d701e952e
children 989155e2d07a
comparison
equal deleted inserted replaced
7163:2ed8d74e5984 7212:291ffc492eb6
49 #include "prims/jvmtiRedefineClassesTrace.hpp" 49 #include "prims/jvmtiRedefineClassesTrace.hpp"
50 #include "runtime/fieldDescriptor.hpp" 50 #include "runtime/fieldDescriptor.hpp"
51 #include "runtime/handles.inline.hpp" 51 #include "runtime/handles.inline.hpp"
52 #include "runtime/javaCalls.hpp" 52 #include "runtime/javaCalls.hpp"
53 #include "runtime/mutexLocker.hpp" 53 #include "runtime/mutexLocker.hpp"
54 #include "runtime/thread.inline.hpp"
54 #include "services/threadService.hpp" 55 #include "services/threadService.hpp"
55 #include "utilities/dtrace.hpp" 56 #include "utilities/dtrace.hpp"
56 #ifdef TARGET_OS_FAMILY_linux
57 # include "thread_linux.inline.hpp"
58 #endif
59 #ifdef TARGET_OS_FAMILY_solaris
60 # include "thread_solaris.inline.hpp"
61 #endif
62 #ifdef TARGET_OS_FAMILY_windows
63 # include "thread_windows.inline.hpp"
64 #endif
65 #ifdef TARGET_OS_FAMILY_bsd
66 # include "thread_bsd.inline.hpp"
67 #endif
68 #ifndef SERIALGC 57 #ifndef SERIALGC
69 #include "gc_implementation/concurrentMarkSweep/cmsOopClosures.inline.hpp" 58 #include "gc_implementation/concurrentMarkSweep/cmsOopClosures.inline.hpp"
70 #include "gc_implementation/g1/g1CollectedHeap.inline.hpp" 59 #include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
71 #include "gc_implementation/g1/g1OopClosures.inline.hpp" 60 #include "gc_implementation/g1/g1OopClosures.inline.hpp"
72 #include "gc_implementation/g1/g1RemSet.inline.hpp" 61 #include "gc_implementation/g1/g1RemSet.inline.hpp"