Mercurial > hg > graal-jvmci-8
diff src/share/vm/runtime/init.cpp @ 7066:7d815d842ee0
Merge.
author | Christian Haeubl <haeubl@ssw.jku.at> |
---|---|
date | Fri, 23 Nov 2012 11:50:27 +0100 |
parents | 8c5333c80cfd fb19af007ffc |
children | 5fc51c1ecdeb |
line wrap: on
line diff
--- a/src/share/vm/runtime/init.cpp Fri Nov 23 11:40:17 2012 +0100 +++ b/src/share/vm/runtime/init.cpp Fri Nov 23 11:50:27 2012 +0100 @@ -99,12 +99,13 @@ management_init(); bytecodes_init(); classLoader_init(); + Metaspace::global_initialize(); // must be before codeCache codeCache_init(); VM_Version_init(); os_init_globals(); stubRoutines_init1(); jint status = universe_init(); // dependent on codeCache_init and - // stubRoutines_init1 + // stubRoutines_init1 and metaspace_init. if (status != JNI_OK) return status; @@ -118,9 +119,9 @@ universe2_init(); // dependent on codeCache_init and stubRoutines_init1 referenceProcessor_init(); jni_handles_init(); -#ifndef VM_STRUCTS_KERNEL +#if INCLUDE_VM_STRUCTS vmStructs_init(); -#endif // VM_STRUCTS_KERNEL +#endif // INCLUDE_VM_STRUCTS vtableStubs_init(); InlineCacheBuffer_init();