@@ -4664,7 +4664,7 @@ template <class T1, class T2> bool TypePtr::is_meet_subtype_of_helper_for_array
4664
4664
}
4665
4665
4666
4666
if (other_elem == nullptr && this_elem == nullptr ) {
4667
- return this_one->_klass ->is_subtype_of (other->_klass );
4667
+ return this_one->klass () ->is_subtype_of (other->klass () );
4668
4668
}
4669
4669
4670
4670
return false ;
@@ -5993,7 +5993,7 @@ template <class T1, class T2> bool TypePtr::is_java_subtype_of_helper_for_instan
5993
5993
return true ;
5994
5994
}
5995
5995
5996
- return this_one->_klass ->is_subtype_of (other->_klass ) && this_one->_interfaces ->contains (other->_interfaces );
5996
+ return this_one->klass () ->is_subtype_of (other->klass () ) && this_one->_interfaces ->contains (other->_interfaces );
5997
5997
}
5998
5998
5999
5999
bool TypeInstKlassPtr::is_java_subtype_of_helper (const TypeKlassPtr* other, bool this_exact, bool other_exact) const {
@@ -6008,7 +6008,7 @@ template <class T1, class T2> bool TypePtr::is_same_java_type_as_helper_for_inst
6008
6008
if (!this_one->is_instance_type (other)) {
6009
6009
return false ;
6010
6010
}
6011
- return this_one->_klass ->equals (other->_klass ) && this_one->_interfaces ->eq (other->_interfaces );
6011
+ return this_one->klass () ->equals (other->klass () ) && this_one->_interfaces ->eq (other->_interfaces );
6012
6012
}
6013
6013
6014
6014
bool TypeInstKlassPtr::is_same_java_type_as_helper (const TypeKlassPtr* other) const {
@@ -6022,7 +6022,7 @@ template <class T1, class T2> bool TypePtr::maybe_java_subtype_of_helper_for_ins
6022
6022
}
6023
6023
6024
6024
if (this_one->is_array_type (other)) {
6025
- return !this_exact && this_one->_klass ->equals (ciEnv::current ()->Object_klass ()) && other->_interfaces ->contains (this_one->_interfaces );
6025
+ return !this_exact && this_one->klass () ->equals (ciEnv::current ()->Object_klass ()) && other->_interfaces ->contains (this_one->_interfaces );
6026
6026
}
6027
6027
6028
6028
assert (this_one->is_instance_type (other), " unsupported" );
@@ -6031,12 +6031,12 @@ template <class T1, class T2> bool TypePtr::maybe_java_subtype_of_helper_for_ins
6031
6031
return this_one->is_java_subtype_of (other);
6032
6032
}
6033
6033
6034
- if (!this_one->_klass ->is_subtype_of (other->_klass ) && !other->_klass ->is_subtype_of (this_one->_klass )) {
6034
+ if (!this_one->klass () ->is_subtype_of (other->klass ()) && !other->klass () ->is_subtype_of (this_one->klass () )) {
6035
6035
return false ;
6036
6036
}
6037
6037
6038
6038
if (this_exact) {
6039
- return this_one->_klass ->is_subtype_of (other->_klass ) && this_one->_interfaces ->contains (other->_interfaces );
6039
+ return this_one->klass () ->is_subtype_of (other->klass () ) && this_one->_interfaces ->contains (other->_interfaces );
6040
6040
}
6041
6041
6042
6042
return true ;
@@ -6116,7 +6116,7 @@ uint TypeAryKlassPtr::hash(void) const {
6116
6116
6117
6117
// ----------------------compute_klass------------------------------------------
6118
6118
// Compute the defining klass for this class
6119
- ciKlass* TypeAryPtr::compute_klass (DEBUG_ONLY( bool verify) ) const {
6119
+ ciKlass* TypeAryPtr::compute_klass () const {
6120
6120
// Compute _klass based on element type.
6121
6121
ciKlass* k_ary = nullptr ;
6122
6122
const TypeInstPtr *tinst;
@@ -6137,28 +6137,7 @@ ciKlass* TypeAryPtr::compute_klass(DEBUG_ONLY(bool verify)) const {
6137
6137
// and object; Top occurs when doing join on Bottom.
6138
6138
// Leave k_ary at null.
6139
6139
} else {
6140
- // Cannot compute array klass directly from basic type,
6141
- // since subtypes of TypeInt all have basic type T_INT.
6142
- #ifdef ASSERT
6143
- if (verify && el->isa_int ()) {
6144
- // Check simple cases when verifying klass.
6145
- BasicType bt = T_ILLEGAL;
6146
- if (el == TypeInt::BYTE) {
6147
- bt = T_BYTE;
6148
- } else if (el == TypeInt::SHORT) {
6149
- bt = T_SHORT;
6150
- } else if (el == TypeInt::CHAR) {
6151
- bt = T_CHAR;
6152
- } else if (el == TypeInt::INT) {
6153
- bt = T_INT;
6154
- } else {
6155
- return _klass; // just return specified klass
6156
- }
6157
- return ciTypeArrayKlass::make (bt);
6158
- }
6159
- #endif
6160
- assert (!el->isa_int (),
6161
- " integral arrays must be pre-equipped with a class" );
6140
+ assert (!el->isa_int (), " integral arrays must be pre-equipped with a class" );
6162
6141
// Compute array klass directly from basic type
6163
6142
k_ary = ciTypeArrayKlass::make (el->basic_type ());
6164
6143
}
@@ -6434,7 +6413,7 @@ template <class T1, class T2> bool TypePtr::is_java_subtype_of_helper_for_array(
6434
6413
return this_one->is_reference_type (this_elem)->is_java_subtype_of_helper (this_one->is_reference_type (other_elem), this_exact, other_exact);
6435
6414
}
6436
6415
if (this_elem == nullptr && other_elem == nullptr ) {
6437
- return this_one->_klass ->is_subtype_of (other->_klass );
6416
+ return this_one->klass () ->is_subtype_of (other->klass () );
6438
6417
}
6439
6418
return false ;
6440
6419
}
@@ -6466,8 +6445,7 @@ template <class T1, class T2> bool TypePtr::is_same_java_type_as_helper_for_arra
6466
6445
return this_one->is_reference_type (this_elem)->is_same_java_type_as (this_one->is_reference_type (other_elem));
6467
6446
}
6468
6447
if (other_elem == nullptr && this_elem == nullptr ) {
6469
- assert (this_one->_klass != nullptr && other->_klass != nullptr , " " );
6470
- return this_one->_klass ->equals (other->_klass );
6448
+ return this_one->klass ()->equals (other->klass ());
6471
6449
}
6472
6450
return false ;
6473
6451
}
@@ -6487,7 +6465,7 @@ template <class T1, class T2> bool TypePtr::maybe_java_subtype_of_helper_for_arr
6487
6465
return true ;
6488
6466
}
6489
6467
if (this_one->is_instance_type (other)) {
6490
- return other->_klass ->equals (ciEnv::current ()->Object_klass ()) && other->_interfaces ->intersection_with (this_one->_interfaces )->eq (other->_interfaces );
6468
+ return other->klass () ->equals (ciEnv::current ()->Object_klass ()) && other->_interfaces ->intersection_with (this_one->_interfaces )->eq (other->_interfaces );
6491
6469
}
6492
6470
assert (this_one->is_array_type (other), " " );
6493
6471
@@ -6506,7 +6484,7 @@ template <class T1, class T2> bool TypePtr::maybe_java_subtype_of_helper_for_arr
6506
6484
return this_one->is_reference_type (this_elem)->maybe_java_subtype_of_helper (this_one->is_reference_type (other_elem), this_exact, other_exact);
6507
6485
}
6508
6486
if (other_elem == nullptr && this_elem == nullptr ) {
6509
- return this_one->_klass ->is_subtype_of (other->_klass );
6487
+ return this_one->klass () ->is_subtype_of (other->klass () );
6510
6488
}
6511
6489
return false ;
6512
6490
}
0 commit comments