Mercurial > hg > graal-compiler
diff src/share/vm/ci/ciObjectFactory.cpp @ 12355:cefad50507d8
Merge with hs25-b53
| author | Gilles Duboscq <duboscq@ssw.jku.at> |
|---|---|
| date | Fri, 11 Oct 2013 10:38:03 +0200 |
| parents | 6b0fd0964b87 f98f5d48f511 |
| children | d8041d695d19 |
line wrap: on
line diff
--- a/src/share/vm/ci/ciObjectFactory.cpp Thu Oct 10 18:26:22 2013 +0200 +++ b/src/share/vm/ci/ciObjectFactory.cpp Fri Oct 11 10:38:03 2013 +0200 @@ -563,7 +563,10 @@ return get_unloaded_instance(ciEnv::_MethodType_klass->as_instance_klass()); } - +ciInstance* ciObjectFactory::get_unloaded_object_constant() { + if (ciEnv::_Object_klass == NULL) return NULL; + return get_unloaded_instance(ciEnv::_Object_klass->as_instance_klass()); +} //------------------------------------------------------------------ // ciObjectFactory::get_empty_methodData