Optimizing: Improve generated code for HLoadClass...
... for resolved package-private class accessed from
unresolved compiling class in the same package.
Test: Additional tests in 727-checker-unresolved-class.
Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Bug: 161898207
Change-Id: I215dcd9db2297f5c8d9547635d80975d88534579
diff --git a/compiler/optimizing/instruction_builder.cc b/compiler/optimizing/instruction_builder.cc
index 1aef100..2da19ba 100644
--- a/compiler/optimizing/instruction_builder.cc
+++ b/compiler/optimizing/instruction_builder.cc
@@ -2419,9 +2419,11 @@
return true;
} else if (klass->IsPublic()) {
return false;
+ } else if (dex_compilation_unit_->GetCompilingClass() != nullptr) {
+ return !dex_compilation_unit_->GetCompilingClass()->CanAccess(klass);
} else {
- ObjPtr<mirror::Class> compiling_class = dex_compilation_unit_->GetCompilingClass().Get();
- return compiling_class == nullptr || !compiling_class->CanAccess(klass);
+ SamePackageCompare same_package(*dex_compilation_unit_);
+ return !same_package(klass);
}
}