Optimizing: Create fewer handles in inliner.
Use ObjPtr<> and bool instead of ReferenceTypeInfo to avoid
creating unnecessary temporary Handle<>s. This should reduce
compiler memory use a little bit.
And rewrite ReferenceTypePropagation::IsAdmissible() with
an explicit loop instead of a tail recursion.
Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Test: aosp_taimen-userdebug boots.
Change-Id: Ic9952134d669b336fb28e6ea13117446d11dc145
diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc
index 05a0afa..126bf25 100644
--- a/compiler/optimizing/inliner.cc
+++ b/compiler/optimizing/inliner.cc
@@ -2167,7 +2167,8 @@
inliner.Run();
}
-static bool IsReferenceTypeRefinement(ReferenceTypeInfo declared_rti,
+static bool IsReferenceTypeRefinement(ObjPtr<mirror::Class> declared_class,
+ bool declared_is_exact,
bool declared_can_be_null,
HInstruction* actual_obj)
REQUIRES_SHARED(Locks::mutator_lock_) {
@@ -2176,22 +2177,29 @@
}
ReferenceTypeInfo actual_rti = actual_obj->GetReferenceTypeInfo();
- return (actual_rti.IsExact() && !declared_rti.IsExact()) ||
- declared_rti.IsStrictSupertypeOf(actual_rti);
+ ObjPtr<mirror::Class> actual_class = actual_rti.GetTypeHandle().Get();
+ return (actual_rti.IsExact() && !declared_is_exact) ||
+ (declared_class != actual_class && declared_class->IsAssignableFrom(actual_class));
}
-ReferenceTypeInfo HInliner::GetClassRTI(ObjPtr<mirror::Class> klass) {
- return ReferenceTypePropagation::IsAdmissible(klass)
- ? ReferenceTypeInfo::Create(handles_->NewHandle(klass))
- : graph_->GetInexactObjectRti();
+static bool IsReferenceTypeRefinement(ObjPtr<mirror::Class> declared_class,
+ bool declared_can_be_null,
+ HInstruction* actual_obj)
+ REQUIRES_SHARED(Locks::mutator_lock_) {
+ bool admissible = ReferenceTypePropagation::IsAdmissible(declared_class);
+ return IsReferenceTypeRefinement(
+ admissible ? declared_class : GetClassRoot<mirror::Class>(),
+ /*declared_is_exact=*/ admissible && declared_class->CannotBeAssignedFromOtherTypes(),
+ declared_can_be_null,
+ actual_obj);
}
bool HInliner::ArgumentTypesMoreSpecific(HInvoke* invoke_instruction, ArtMethod* resolved_method) {
// If this is an instance call, test whether the type of the `this` argument
// is more specific than the class which declares the method.
if (!resolved_method->IsStatic()) {
- if (IsReferenceTypeRefinement(GetClassRTI(resolved_method->GetDeclaringClass()),
- /* declared_can_be_null= */ false,
+ if (IsReferenceTypeRefinement(resolved_method->GetDeclaringClass(),
+ /*declared_can_be_null=*/ false,
invoke_instruction->InputAt(0u))) {
return true;
}
@@ -2210,9 +2218,7 @@
if (input->GetType() == DataType::Type::kReference) {
ObjPtr<mirror::Class> param_cls = resolved_method->LookupResolvedClassFromTypeIndex(
param_list->GetTypeItem(param_idx).type_idx_);
- if (IsReferenceTypeRefinement(GetClassRTI(param_cls),
- /* declared_can_be_null= */ true,
- input)) {
+ if (IsReferenceTypeRefinement(param_cls, /*declared_can_be_null=*/ true, input)) {
return true;
}
}
@@ -2227,8 +2233,10 @@
if (return_replacement != nullptr) {
if (return_replacement->GetType() == DataType::Type::kReference) {
// Test if the return type is a refinement of the declared return type.
- if (IsReferenceTypeRefinement(invoke_instruction->GetReferenceTypeInfo(),
- /* declared_can_be_null= */ true,
+ ReferenceTypeInfo invoke_rti = invoke_instruction->GetReferenceTypeInfo();
+ if (IsReferenceTypeRefinement(invoke_rti.GetTypeHandle().Get(),
+ invoke_rti.IsExact(),
+ /*declared_can_be_null=*/ true,
return_replacement)) {
return true;
} else if (return_replacement->IsInstanceFieldGet()) {
@@ -2258,7 +2266,10 @@
// some functionality from the reference type propagation.
DCHECK(return_replacement->IsPhi());
ObjPtr<mirror::Class> cls = resolved_method->LookupResolvedReturnType();
- return_replacement->SetReferenceTypeInfo(GetClassRTI(cls));
+ ReferenceTypeInfo rti = ReferenceTypePropagation::IsAdmissible(cls)
+ ? ReferenceTypeInfo::Create(handles_->NewHandle(cls))
+ : graph_->GetInexactObjectRti();
+ return_replacement->SetReferenceTypeInfo(rti);
}
}
}