# HG changeset patch
# User Lukas Stadler <lukas.stadler@jku.at>
# Date 1329744891 -3600
# Node ID 5195b780d253802c141a7b9289b218109b12cfdd
# Parent  83b4cc4df77ac8b15efde28194b73a8edc04621d# Parent  8aa283b5e1733cf2c879a7d83b18dcfefe1a7748
Merge

diff -r 83b4cc4df77a -r 5195b780d253 src/share/vm/graal/graalCompiler.cpp
--- a/src/share/vm/graal/graalCompiler.cpp	Mon Feb 20 14:29:51 2012 +0100
+++ b/src/share/vm/graal/graalCompiler.cpp	Mon Feb 20 14:34:51 2012 +0100
@@ -202,6 +202,8 @@
 }
 
 Handle GraalCompiler::createHotSpotTypeResolved(KlassHandle klass, Handle name, TRAPS) {
+  ObjectLocker ol(klass, THREAD);
+
   if (klass->graal_mirror() != NULL) {
     return klass->graal_mirror();
   }