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
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()) {
diff --git a/compiler/optimizing/code_generator_arm_vixl.cc b/compiler/optimizing/code_generator_arm_vixl.cc
index f65890b..1c243b6 100644
--- a/compiler/optimizing/code_generator_arm_vixl.cc
+++ b/compiler/optimizing/code_generator_arm_vixl.cc
@@ -531,7 +531,9 @@
InvokeRuntimeCallingConventionARMVIXL calling_convention;
if (must_resolve_type) {
DCHECK(IsSameDexFile(cls_->GetDexFile(), arm_codegen->GetGraph()->GetDexFile()) ||
- arm_codegen->GetCompilerOptions().WithinOatFile(&cls_->GetDexFile()));
+ arm_codegen->GetCompilerOptions().WithinOatFile(&cls_->GetDexFile()) ||
+ ContainsElement(Runtime::Current()->GetClassLinker()->GetBootClassPath(),
+ &cls_->GetDexFile()));
dex::TypeIndex type_index = cls_->GetTypeIndex();
__ Mov(calling_convention.GetRegisterAt(0), type_index.index_);
if (cls_->NeedsAccessCheck()) {
diff --git a/compiler/optimizing/code_generator_x86.cc b/compiler/optimizing/code_generator_x86.cc
index 0efd51c..4025684 100644
--- a/compiler/optimizing/code_generator_x86.cc
+++ b/compiler/optimizing/code_generator_x86.cc
@@ -290,7 +290,9 @@
InvokeRuntimeCallingConvention calling_convention;
if (must_resolve_type) {
DCHECK(IsSameDexFile(cls_->GetDexFile(), x86_codegen->GetGraph()->GetDexFile()) ||
- x86_codegen->GetCompilerOptions().WithinOatFile(&cls_->GetDexFile()));
+ x86_codegen->GetCompilerOptions().WithinOatFile(&cls_->GetDexFile()) ||
+ ContainsElement(Runtime::Current()->GetClassLinker()->GetBootClassPath(),
+ &cls_->GetDexFile()));
dex::TypeIndex type_index = cls_->GetTypeIndex();
__ movl(calling_convention.GetRegisterAt(0), Immediate(type_index.index_));
if (cls_->NeedsAccessCheck()) {
@@ -5474,7 +5476,9 @@
? invoke->AsInvokeInterface()->GetSpecialInputIndex()
: invoke->AsInvokeStaticOrDirect()->GetSpecialInputIndex();
DCHECK(IsSameDexFile(GetGraph()->GetDexFile(), *invoke->GetMethodReference().dex_file) ||
- GetCompilerOptions().WithinOatFile(invoke->GetMethodReference().dex_file));
+ GetCompilerOptions().WithinOatFile(invoke->GetMethodReference().dex_file) ||
+ ContainsElement(Runtime::Current()->GetClassLinker()->GetBootClassPath(),
+ invoke->GetMethodReference().dex_file));
HX86ComputeBaseMethodAddress* method_address =
invoke->InputAt(index)->AsX86ComputeBaseMethodAddress();
// Add the patch entry and bind its label at the end of the instruction.
diff --git a/compiler/optimizing/code_generator_x86_64.cc b/compiler/optimizing/code_generator_x86_64.cc
index ff4ab59..8c1a533 100644
--- a/compiler/optimizing/code_generator_x86_64.cc
+++ b/compiler/optimizing/code_generator_x86_64.cc
@@ -274,7 +274,9 @@
// Custom calling convention: RAX serves as both input and output.
if (must_resolve_type) {
DCHECK(IsSameDexFile(cls_->GetDexFile(), x86_64_codegen->GetGraph()->GetDexFile()) ||
- x86_64_codegen->GetCompilerOptions().WithinOatFile(&cls_->GetDexFile()));
+ x86_64_codegen->GetCompilerOptions().WithinOatFile(&cls_->GetDexFile()) ||
+ ContainsElement(Runtime::Current()->GetClassLinker()->GetBootClassPath(),
+ &cls_->GetDexFile()));
dex::TypeIndex type_index = cls_->GetTypeIndex();
__ movl(CpuRegister(RAX), Immediate(type_index.index_));
if (cls_->NeedsAccessCheck()) {
@@ -1241,7 +1243,9 @@
void CodeGeneratorX86_64::RecordMethodBssEntryPatch(HInvoke* invoke) {
DCHECK(IsSameDexFile(GetGraph()->GetDexFile(), *invoke->GetMethodReference().dex_file) ||
- GetCompilerOptions().WithinOatFile(invoke->GetMethodReference().dex_file));
+ GetCompilerOptions().WithinOatFile(invoke->GetMethodReference().dex_file) ||
+ ContainsElement(Runtime::Current()->GetClassLinker()->GetBootClassPath(),
+ invoke->GetMethodReference().dex_file));
method_bss_entry_patches_.emplace_back(invoke->GetMethodReference().dex_file,
invoke->GetMethodReference().index);
__ Bind(&method_bss_entry_patches_.back().label);
diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc
index 39f684b..741e6df 100644
--- a/compiler/optimizing/inliner.cc
+++ b/compiler/optimizing/inliner.cc
@@ -1745,11 +1745,12 @@
// Inline across dexfiles if the callee's DexFile is:
// 1) in the bootclasspath, or
if (callee->GetDeclaringClass()->GetClassLoader() == nullptr) {
- // There are cases in which the BCP DexFiles are within the OatFile as far as the compiler
- // options are concerned, but they have their own OatWriter (and therefore not in the same
- // OatFile). Then, we request the BSS check for all BCP DexFiles.
- // TODO(solanes): Add .bss support for BCP.
- *out_needs_bss_check = true;
+ // In multi-image, each BCP DexFile has their own OatWriter. Since they don't cooperate with
+ // each other, we request the BSS check for them.
+ // TODO(solanes): Add .bss support for BCP multi-image.
+ const bool is_multi_image = codegen->GetCompilerOptions().IsBootImage() ||
+ codegen->GetCompilerOptions().IsBootImageExtension();
+ *out_needs_bss_check = is_multi_image;
return true;
}