Mercurial > hg > graal-jvmci-8

comparison src/share/vm/classfile/systemDictionary.cpp @ 2044:06f017f7daa7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Thomas Wuerthinger <wuerthinger@ssw.jku.at>
date Fri, 07 Jan 2011 18:18:08 +0100
parents 2d26b0046e0d f2da85a9b08e
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/_systemDictionary.cpp.incl" 26 #include "classfile/dictionary.hpp"
27 #include "classfile/javaClasses.hpp"
28 #include "classfile/loaderConstraints.hpp"
29 #include "classfile/placeholders.hpp"
30 #include "classfile/resolutionErrors.hpp"
31 #include "classfile/systemDictionary.hpp"
32 #include "classfile/vmSymbols.hpp"
33 #include "interpreter/bytecodeStream.hpp"
34 #include "interpreter/interpreter.hpp"
35 #include "memory/gcLocker.hpp"
36 #include "memory/oopFactory.hpp"
37 #include "oops/instanceKlass.hpp"
38 #include "oops/instanceRefKlass.hpp"
39 #include "oops/klass.inline.hpp"
40 #include "oops/methodDataOop.hpp"
41 #include "oops/objArrayKlass.hpp"
42 #include "oops/oop.inline.hpp"
43 #include "oops/oop.inline2.hpp"
44 #include "oops/typeArrayKlass.hpp"
45 #include "prims/jvmtiEnvBase.hpp"
46 #include "prims/methodHandles.hpp"
47 #include "runtime/biasedLocking.hpp"
48 #include "runtime/fieldType.hpp"
49 #include "runtime/handles.inline.hpp"
50 #include "runtime/java.hpp"
51 #include "runtime/javaCalls.hpp"
52 #include "runtime/mutexLocker.hpp"
53 #include "runtime/signature.hpp"
54 #include "services/classLoadingService.hpp"
55 #include "services/threadService.hpp"
27 56
28 57
29 Dictionary* SystemDictionary::_dictionary = NULL; 58 Dictionary* SystemDictionary::_dictionary = NULL;
30 PlaceholderTable* SystemDictionary::_placeholders = NULL; 59 PlaceholderTable* SystemDictionary::_placeholders = NULL;
31 Dictionary* SystemDictionary::_shared_dictionary = NULL; 60 Dictionary* SystemDictionary::_shared_dictionary = NULL;
1980 if (_well_known_klasses[meth_group_start] == NULL) { 2009 if (_well_known_klasses[meth_group_start] == NULL) {
1981 // Skip the rest of the method handle classes, if MethodHandle is not loaded. 2010 // Skip the rest of the method handle classes, if MethodHandle is not loaded.
1982 scan = WKID(meth_group_end+1); 2011 scan = WKID(meth_group_end+1);
1983 } 2012 }
1984 WKID indy_group_start = WK_KLASS_ENUM_NAME(Linkage_klass); 2013 WKID indy_group_start = WK_KLASS_ENUM_NAME(Linkage_klass);
1985 WKID indy_group_end = WK_KLASS_ENUM_NAME(InvokeDynamic_klass); 2014 WKID indy_group_end = WK_KLASS_ENUM_NAME(CallSite_klass);
1986 initialize_wk_klasses_until(indy_group_start, scan, CHECK); 2015 initialize_wk_klasses_until(indy_group_start, scan, CHECK);
1987 if (EnableInvokeDynamic) { 2016 if (EnableInvokeDynamic) {
1988 initialize_wk_klasses_through(indy_group_end, scan, CHECK); 2017 initialize_wk_klasses_through(indy_group_end, scan, CHECK);
1989 } 2018 }
1990 if (_well_known_klasses[indy_group_start] == NULL) { 2019 if (_well_known_klasses[indy_group_start] == NULL) {