# HG changeset patch
# User Stefan Anzinger <stefan.a.anzinger@oracle.com>
# Date 1417736297 -3600
# Node ID 8a03753546f3ef530dc3c0279569b6174bfb1df9
# Parent  5ec45cb4bf222bdfae78715dc06268fe60afaf4f# Parent  4ca70b51c8bbe07d81c84aed342f8c4108e97711
Merge

diff -r 5ec45cb4bf22 -r 8a03753546f3 src/share/vm/graal/graalRuntime.cpp
--- 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) {