Mercurial > hg > truffle
comparison src/share/vm/graal/graalCompiler.cpp @ 4640:8aa283b5e173
Synchronize createHotSpotTypeResolved (should fix EscapeAnalysis NPE)
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Mon, 20 Feb 2012 12:30:58 +0100 |
parents | a7a16015e47f |
children | b5dc2403c1e7 |
comparison
equal
deleted
inserted
replaced
4639:2855c491e2bd | 4640:8aa283b5e173 |
---|---|
200 Handle name = VmIds::toString<Handle>(field_name, CHECK_NULL); | 200 Handle name = VmIds::toString<Handle>(field_name, CHECK_NULL); |
201 return VMToCompiler::createRiField(field_holder, name, field_type, offset, flags, CHECK_NULL); | 201 return VMToCompiler::createRiField(field_holder, name, field_type, offset, flags, CHECK_NULL); |
202 } | 202 } |
203 | 203 |
204 Handle GraalCompiler::createHotSpotTypeResolved(KlassHandle klass, Handle name, TRAPS) { | 204 Handle GraalCompiler::createHotSpotTypeResolved(KlassHandle klass, Handle name, TRAPS) { |
205 ObjectLocker ol(klass, THREAD); | |
206 | |
205 if (klass->graal_mirror() != NULL) { | 207 if (klass->graal_mirror() != NULL) { |
206 return klass->graal_mirror(); | 208 return klass->graal_mirror(); |
207 } | 209 } |
208 | 210 |
209 instanceKlass::cast(HotSpotTypeResolved::klass())->initialize(CHECK_NULL); | 211 instanceKlass::cast(HotSpotTypeResolved::klass())->initialize(CHECK_NULL); |