comparison src/share/vm/oops/instanceKlass.cpp @ 2044:06f017f7daa7

Merge.
author Thomas Wuerthinger <wuerthinger@ssw.jku.at>
date Fri, 07 Jan 2011 18:18:08 +0100
parents 2d26b0046e0d f95d63e2154a
children d25d4ca69222
comparison
equal deleted inserted replaced
1942:00bc9eaf0e24 2044:06f017f7daa7
20 * or visit www.oracle.com if you need additional information or have any 20 * or visit www.oracle.com if you need additional information or have any
21 * questions. 21 * questions.
22 * 22 *
23 */ 23 */
24 24
25 # include "incls/_precompiled.incl" 25 #include "precompiled.hpp"
26 # include "incls/_instanceKlass.cpp.incl" 26 #include "classfile/javaClasses.hpp"
27 #include "classfile/systemDictionary.hpp"
28 #include "classfile/verifier.hpp"
29 #include "classfile/vmSymbols.hpp"
30 #include "compiler/compileBroker.hpp"
31 #include "gc_implementation/shared/markSweep.inline.hpp"
32 #include "gc_interface/collectedHeap.inline.hpp"
33 #include "interpreter/oopMapCache.hpp"
34 #include "interpreter/rewriter.hpp"
35 #include "jvmtifiles/jvmti.h"
36 #include "memory/genOopClosures.inline.hpp"
37 #include "memory/oopFactory.hpp"
38 #include "memory/permGen.hpp"
39 #include "oops/instanceKlass.hpp"
40 #include "oops/instanceOop.hpp"
41 #include "oops/methodOop.hpp"
42 #include "oops/objArrayKlassKlass.hpp"
43 #include "oops/oop.inline.hpp"
44 #include "oops/symbolOop.hpp"
45 #include "prims/jvmtiExport.hpp"
46 #include "prims/jvmtiRedefineClassesTrace.hpp"
47 #include "runtime/fieldDescriptor.hpp"
48 #include "runtime/handles.inline.hpp"
49 #include "runtime/javaCalls.hpp"
50 #include "runtime/mutexLocker.hpp"
51 #include "services/threadService.hpp"
52 #include "utilities/dtrace.hpp"
53 #ifdef TARGET_OS_FAMILY_linux
54 # include "thread_linux.inline.hpp"
55 #endif
56 #ifdef TARGET_OS_FAMILY_solaris
57 # include "thread_solaris.inline.hpp"
58 #endif
59 #ifdef TARGET_OS_FAMILY_windows
60 # include "thread_windows.inline.hpp"
61 #endif
62 #ifndef SERIALGC
63 #include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
64 #include "gc_implementation/g1/g1OopClosures.inline.hpp"
65 #include "gc_implementation/g1/g1RemSet.inline.hpp"
66 #include "gc_implementation/g1/heapRegionSeq.inline.hpp"
67 #include "gc_implementation/parNew/parOopClosures.inline.hpp"
68 #include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp"
69 #include "gc_implementation/parallelScavenge/psScavenge.inline.hpp"
70 #include "oops/oop.pcgc.inline.hpp"
71 #endif
72 #ifdef COMPILER1
73 #include "c1/c1_Compiler.hpp"
74 #endif
27 75
28 #ifdef DTRACE_ENABLED 76 #ifdef DTRACE_ENABLED
29 77
30 HS_DTRACE_PROBE_DECL4(hotspot, class__initialization__required, 78 HS_DTRACE_PROBE_DECL4(hotspot, class__initialization__required,
31 char*, intptr_t, oop, intptr_t); 79 char*, intptr_t, oop, intptr_t);