1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8299155: C2: SubTypeCheckNode::verify() should not produce dependencies / oop pool entries

Browse Source 
Reviewed-by: thartmann, kvn
This commit is contained in:
Roland Westrelin 2023-02-03 07:58:29 +00:00
parent 11804b246e
commit cf68d9fb8e
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/hotspot/share/opto/subtypenode.cpp
View File

@ -167,19 +167,10 @@ bool SubTypeCheckNode::verify(PhaseGVN* phase) {
const TypeKlassPtr* subk = sub_t->isa_klassptr() ? sub_t->is_klassptr() : sub_t->is_oopptr()->as_klass_type();
if (super_t->singleton() && subk != NULL) {
Node* subklass = NULL;
if (sub_t->isa_oopptr()) {
Node* adr = phase->transform(new AddPNode(obj_or_subklass, obj_or_subklass, phase->MakeConX(oopDesc::klass_offset_in_bytes())));
subklass = phase->transform(LoadKlassNode::make(*phase, NULL, C->immutable_memory(), adr, TypeInstPtr::KLASS));
record_for_cleanup(subklass, phase);
} else {
subklass = obj_or_subklass;
}
const Type* cached_t = Value(phase); // cache the type to validate consistency
switch (C->static_subtype_check(superk, subk)) {
case Compile::SSC_easy_test: {
return verify_helper(phase, subklass, cached_t);
return verify_helper(phase, load_klass(phase), cached_t);
}
case Compile::SSC_full_test: {
Node* p1 = phase->transform(new AddPNode(superklass, superklass, phase->MakeConX(in_bytes(Klass::super_check_offset_offset()))));
@ -189,6 +180,7 @@ bool SubTypeCheckNode::verify(PhaseGVN* phase) {
int cacheoff_con = in_bytes(Klass::secondary_super_cache_offset());
bool might_be_cache = (phase->find_int_con(chk_off, cacheoff_con) == cacheoff_con);
if (!might_be_cache) {
Node* subklass = load_klass(phase);
Node* chk_off_X = chk_off;
#ifdef _LP64
chk_off_X = phase->transform(new ConvI2LNode(chk_off_X));
@ -210,4 +202,19 @@ bool SubTypeCheckNode::verify(PhaseGVN* phase) {
return true;
}
Node* SubTypeCheckNode::load_klass(PhaseGVN* phase) const {
Node* obj_or_subklass = in(ObjOrSubKlass);
const Type* sub_t = phase->type(obj_or_subklass);
Node* subklass = NULL;
if (sub_t->isa_oopptr()) {
Node* adr = phase->transform(new AddPNode(obj_or_subklass, obj_or_subklass, phase->MakeConX(oopDesc::klass_offset_in_bytes())));
subklass = phase->transform(LoadKlassNode::make(*phase, NULL, phase->C->immutable_memory(), adr, TypeInstPtr::KLASS));
record_for_cleanup(subklass, phase);
} else {
subklass = obj_or_subklass;
}
return subklass;
}
#endif

2
src/hotspot/share/opto/subtypenode.hpp
View File

@ -57,6 +57,8 @@ private:
static bool is_oop(PhaseGVN* phase, Node* n);
#endif // ASSERT
Node* load_klass(PhaseGVN* phase) const;
};
#endif // SHARE_OPTO_SUBTYPENODE_HPP