commit 69a87e30730d0c6e6e5974fd2bd001f77fffed5e
author Santiago Aboy Solanes <solanes@google.com> Tue Mar 08 16:43:54 2022 +0000
committer Treehugger Robot <treehugger-gerrit@google.com> Wed Mar 09 14:13:53 2022 +0000
tree dd4ee9fddd6eb68b56c3a808ce26e0ddba9fe0fe
parent cf414b24f4097593cb68da8e0dc52d956724b4fa

Revert^4 "Add bss support for inlining BCP DexFiles for single image"

This reverts commit 1849c3a875aab44d9bff45623ec076b0331302f8.

Reason for revert: Relading after fix. It can be seen in PS 1..2

Bug: 154012332
Test: art/test/testrunner/testrunner.py --target --32 --optimizing
Test: art/test/testrunner/testrunner.py --host --64 --optimizing
Change-Id: I168572957363dd5ae1598279f2ecc8fb947a1fd5

compiler/optimizing/code_generator_arm64.cc

diff --git a/compiler/optimizing/code_generator_arm64.cc b/compiler/optimizing/code_generator_arm64.cc
index fc1c07d..76d2a6d 100644
--- a/compiler/optimizing/code_generator_arm64.cc
+++ b/compiler/optimizing/code_generator_arm64.cc
@@ -283,7 +283,9 @@
     InvokeRuntimeCallingConvention calling_convention;
     if (must_resolve_type) {
       DCHECK(IsSameDexFile(cls_->GetDexFile(), arm64_codegen->GetGraph()->GetDexFile()) ||
-             arm64_codegen->GetCompilerOptions().WithinOatFile(&cls_->GetDexFile()));
+             arm64_codegen->GetCompilerOptions().WithinOatFile(&cls_->GetDexFile()) ||
+             ContainsElement(Runtime::Current()->GetClassLinker()->GetBootClassPath(),
+                             &cls_->GetDexFile()));
       dex::TypeIndex type_index = cls_->GetTypeIndex();
       __ Mov(calling_convention.GetRegisterAt(0).W(), type_index.index_);
       if (cls_->NeedsAccessCheck()) {