archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-23 12:34:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

7161796: PhaseStringOpts::fetch_static_field tries to fetch field from the Klass instead of the mirror

Browse source 
Reviewed-by: twisti
This commit is contained in:
Tom Rodriguez 2012-04-18 16:08:34 -07:00
parent 2ded12cdfd
commit a02fad04b2
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
hotspot/src/share/vm/opto/stringopts.cpp
View file

@ -897,8 +897,8 @@ bool StringConcat::validate_control_flow() {
} }
Node* PhaseStringOpts::fetch_static_field(GraphKit& kit, ciField* field) { Node* PhaseStringOpts::fetch_static_field(GraphKit& kit, ciField* field) {
const TypeKlassPtr* klass_type = TypeKlassPtr::make(field->holder()); const TypeInstPtr* mirror_type = TypeInstPtr::make(field->holder()->java_mirror());
Node* klass_node = __ makecon(klass_type); Node* klass_node = __ makecon(mirror_type);
BasicType bt = field->layout_type(); BasicType bt = field->layout_type();
ciType* field_klass = field->type(); ciType* field_klass = field->type();
@ -913,6 +913,7 @@ Node* PhaseStringOpts::fetch_static_field(GraphKit& kit, ciField* field) {
// and may yield a vacuous result if the field is of interface type. // and may yield a vacuous result if the field is of interface type.
type = TypeOopPtr::make_from_constant(con, true)->isa_oopptr(); type = TypeOopPtr::make_from_constant(con, true)->isa_oopptr();
assert(type != NULL, "field singleton type must be consistent"); assert(type != NULL, "field singleton type must be consistent");
return __ makecon(type);
} else { } else {
type = TypeOopPtr::make_from_klass(field_klass->as_klass()); type = TypeOopPtr::make_from_klass(field_klass->as_klass());
} }
@ -922,7 +923,7 @@ Node* PhaseStringOpts::fetch_static_field(GraphKit& kit, ciField* field) {
return kit.make_load(NULL, kit.basic_plus_adr(klass_node, field->offset_in_bytes()), return kit.make_load(NULL, kit.basic_plus_adr(klass_node, field->offset_in_bytes()),
type, T_OBJECT, type, T_OBJECT,
C->get_alias_index(klass_type->add_offset(field->offset_in_bytes()))); C->get_alias_index(mirror_type->add_offset(field->offset_in_bytes())));
} }
Node* PhaseStringOpts::int_stringSize(GraphKit& kit, Node* arg) { Node* PhaseStringOpts::int_stringSize(GraphKit& kit, Node* arg) {