Mercurial > hg > truffle
diff src/share/vm/graal/graalCompiler.cpp @ 13479:606959535fd4
remove Graal mirror from Class
author | twisti |
---|---|
date | Wed, 25 Dec 2013 20:27:59 -0800 |
parents | e8c4a6ea3f77 |
children | 49db2c1e3bee |
line wrap: on
line diff
--- a/src/share/vm/graal/graalCompiler.cpp Wed Dec 25 12:14:29 2013 -0800 +++ b/src/share/vm/graal/graalCompiler.cpp Wed Dec 25 20:27:59 2013 -0800 @@ -229,7 +229,7 @@ Handle signature_string = java_lang_String::create_from_symbol(signature, CHECK_NH); return VMToCompiler::createUnresolvedJavaType(signature_string, CHECK_NH); } else { - return createHotSpotResolvedObjectType(klass, CHECK_NH); + return VMToCompiler::createResolvedJavaType(klass->java_mirror(), CHECK_NH); } } else { return VMToCompiler::createPrimitiveJavaType(field_type, CHECK_NH); @@ -252,7 +252,7 @@ if (tag.is_klass()) { // The klass has been inserted into the constant pool // very recently. - return GraalCompiler::createHotSpotResolvedObjectType(cp->resolved_klass_at(index), CHECK_NH); + return VMToCompiler::createResolvedJavaType(cp->resolved_klass_at(index)->java_mirror(), CHECK_NH); } else if (tag.is_symbol()) { klass_name = cp->symbol_at(index); } else { @@ -263,7 +263,7 @@ Handle klass_name_string = java_lang_String::create_from_symbol(klass_name, CHECK_NH); return VMToCompiler::createUnresolvedJavaType(klass_name_string, CHECK_NH); } else { - return GraalCompiler::createHotSpotResolvedObjectType(klass, CHECK_NH); + return VMToCompiler::createResolvedJavaType(klass->java_mirror(), CHECK_NH); } } @@ -272,16 +272,6 @@ return VMToCompiler::createJavaField(field_holder, name, field_type, offset, flags, false, CHECK_NH); } -Handle GraalCompiler::createHotSpotResolvedObjectType(KlassHandle klass, TRAPS) { - oop java_class = klass->java_mirror(); - oop graal_mirror = java_lang_Class::graal_mirror(java_class); - if (graal_mirror != NULL) { - assert(graal_mirror->is_a(HotSpotResolvedObjectType::klass()), "unexpected class..."); - return graal_mirror; - } - return VMToCompiler::createResolvedJavaType(java_class, CHECK_NH); -} - BasicType GraalCompiler::kindToBasicType(jchar ch) { switch(ch) { case 'z': return T_BOOLEAN;