Mercurial > hg > graal-jvmci-8
diff src/share/vm/graal/graalCompiler.cpp @ 13086:096c224171c4
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Wed, 20 Nov 2013 00:10:38 +0100 |
parents | f6c511451e4a |
children | 77fbf02f701c |
line wrap: on
line diff
--- a/src/share/vm/graal/graalCompiler.cpp Tue Nov 19 17:44:26 2013 +0100 +++ b/src/share/vm/graal/graalCompiler.cpp Wed Nov 20 00:10:38 2013 +0100 @@ -180,10 +180,8 @@ assert(_initialized, "must already be initialized"); ResourceMark rm; - JavaThread::current()->set_is_compiling(true); Handle holder = GraalCompiler::createHotSpotResolvedObjectType(method, CHECK); VMToCompiler::compileMethod(method(), holder, entry_bci, blocking); - JavaThread::current()->set_is_compiling(false); } // Compilation entry point for methods @@ -234,8 +232,7 @@ // We have to lock the cpool to keep the oop from being resolved // while we are accessing it. But we must release the lock before // calling up into Java. - oop cplock = cp->lock(); - ObjectLocker ol(cplock, THREAD, cplock != NULL); + MonitorLockerEx ml(cp->lock()); constantTag tag = cp->tag_at(index); if (tag.is_klass()) { // The klass has been inserted into the constant pool