Mercurial > hg > graal-compiler
changeset 18633:8a03753546f3
Merge
author | Stefan Anzinger <stefan.a.anzinger@oracle.com> |
---|---|
date | Fri, 05 Dec 2014 00:38:17 +0100 |
parents | 5ec45cb4bf22 (current diff) 4ca70b51c8bb (diff) |
children | b4071daf1892 c9576b6cf7d6 |
files | |
diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/graal/graalRuntime.cpp Thu Dec 04 23:34:27 2014 +0100 +++ b/src/share/vm/graal/graalRuntime.cpp Fri Dec 05 00:38:17 2014 +0100 @@ -760,7 +760,7 @@ void GraalRuntime::ensure_graal_class_loader_is_initialized() { // This initialization code is guarded by a static pointer to the Factory class. - // Once it is non-null, the Graal class loader and well know Graal classes are + // Once it is non-null, the Graal class loader and well known Graal classes are // guaranteed to have been initialized. By going through the static // initializer of Factory, we can rely on class initialization semantics to // synchronize threads racing to do the initialization. @@ -782,6 +782,8 @@ } } + // We cannot use graalJavaAccess for this because we are currently in the + // process of initializing that mechanism. TempNewSymbol field_name = SymbolTable::new_symbol("useGraalClassLoader", CHECK_ABORT); fieldDescriptor field_desc; if (klass->find_field(field_name, vmSymbols::bool_signature(), &field_desc) == NULL) {