# HG changeset patch # User Gilles Duboscq # Date 1329737458 -3600 # Node ID 8aa283b5e1733cf2c879a7d83b18dcfefe1a7748 # Parent 2855c491e2bd993c0c73f6297b21d9677c352732 Synchronize createHotSpotTypeResolved (should fix EscapeAnalysis NPE) diff -r 2855c491e2bd -r 8aa283b5e173 src/share/vm/graal/graalCompiler.cpp --- a/src/share/vm/graal/graalCompiler.cpp Sun Feb 19 04:28:40 2012 +0100 +++ b/src/share/vm/graal/graalCompiler.cpp Mon Feb 20 12:30:58 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(); }