Skip to content

8341411: C2: remove slice parameter from GraphKit::make_load() and GraphKit::store_to_memory() #21834

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

8341411: C2: remove slice parameter from GraphKit::make_load() and GraphKit::store_to_memory() #21834

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a595ddd
8341411: C2: remove slice parameter from GraphKit::make_load() and Gr…
theoweidmannoracle Nov 1, 2024
f89f2cf
Remove unnecessary store_to_memory param/overload
theoweidmannoracle Nov 7, 2024
cb703a4
Add asserts
theoweidmannoracle Nov 7, 2024
256bcf4
Added assert message
theoweidmannoracle Nov 8, 2024
8d239fd
Fix asserts
theoweidmannoracle Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/hotspot/share/opto/arraycopynode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,10 @@ Node* ArrayCopyNode::try_clone_instance(PhaseGVN *phase, bool can_reshape, int c
Node* off = phase->MakeConX(field->offset_in_bytes());
Node* next_src = phase->transform(new AddPNode(base_src,base_src,off));
Node* next_dest = phase->transform(new AddPNode(base_dest,base_dest,off));
assert(adr_type->ptr() == phase->C->get_alias_index(phase->type(next_src)->isa_ptr()));
assert(adr_type->ptr() == phase->C->get_alias_index(phase->type(next_dest)->isa_ptr()));
assert(adr_type->ptr() == phase->C->get_alias_index(phase->type(next_src)->isa_ptr()),
"slice of address and input slice don't match");
assert(adr_type->ptr() == phase->C->get_alias_index(phase->type(next_dest)->isa_ptr()),
"slice of address and input slice don't match");
BasicType bt = field->layout_type();

const Type *type;
Expand Down
3 changes: 2 additions & 1 deletion src/hotspot/share/opto/library_call.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7014,7 +7014,8 @@ Node* LibraryCallKit::load_field_from_object(Node* fromObj, const char* fieldNam
assert(field_klass->is_loaded(), "should be loaded");
const TypePtr* adr_type = C->alias_type(field)->adr_type();
Node *adr = basic_plus_adr(fromObj, fromObj, offset);
assert(adr_type->ptr() == C->get_alias_index(_gvn.type(adr)->isa_ptr()));
assert(adr_type->ptr() == C->get_alias_index(_gvn.type(adr)->isa_ptr()),
"slice of address and input slice don't match");
BasicType bt = field->layout_type();

// Build the resultant type of the load
Expand Down
6 changes: 4 additions & 2 deletions src/hotspot/share/opto/parse3.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,8 @@ void Parse::do_get_xxx(Node* obj, ciField* field, bool is_field) {
int offset = field->offset_in_bytes();
const TypePtr* adr_type = C->alias_type(field)->adr_type();
Node *adr = basic_plus_adr(obj, obj, offset);
assert(adr_type->ptr() == C->get_alias_index(_gvn.type(adr)->isa_ptr()));
assert(adr_type->ptr() == C->get_alias_index(_gvn.type(adr)->isa_ptr()),
"slice of address and input slice don't match");

// Build the resultant type of the load
const Type *type;
Expand Down Expand Up @@ -205,7 +206,8 @@ void Parse::do_put_xxx(Node* obj, ciField* field, bool is_field) {
int offset = field->offset_in_bytes();
const TypePtr* adr_type = C->alias_type(field)->adr_type();
Node* adr = basic_plus_adr(obj, obj, offset);
assert(adr_type->ptr() == C->get_alias_index(_gvn.type(adr)->isa_ptr()));
assert(adr_type->ptr() == C->get_alias_index(_gvn.type(adr)->isa_ptr()),
"slice of address and input slice don't match");
BasicType bt = field->layout_type();
// Value to be stored
Node* val = type2size[bt] == 1 ? pop() : pop_pair();
Expand Down