Update InstructionBuilder's IsInBootImage for boot image extension.
For boot image extension, check both the class being in the
boot image space and the descriptor being in image classes.
Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Test: aosp_taimen-userdebug boots.
Bug: 119800099
Change-Id: I56f81d7b7aed20f5ee5c4ffd4d2e01aacd42d243
diff --git a/compiler/optimizing/instruction_builder.cc b/compiler/optimizing/instruction_builder.cc
index e7f0872..4ae94b7 100644
--- a/compiler/optimizing/instruction_builder.cc
+++ b/compiler/optimizing/instruction_builder.cc
@@ -1140,12 +1140,15 @@
static bool IsInBootImage(ObjPtr<mirror::Class> cls, const CompilerOptions& compiler_options)
REQUIRES_SHARED(Locks::mutator_lock_) {
- if (compiler_options.IsBootImage()) {
+ if (Runtime::Current()->GetHeap()->ObjectIsInBootImageSpace(cls)) {
+ return true;
+ }
+ if (compiler_options.IsBootImage() || compiler_options.IsBootImageExtension()) {
std::string temp;
const char* descriptor = cls->GetDescriptor(&temp);
return compiler_options.IsImageClass(descriptor);
} else {
- return Runtime::Current()->GetHeap()->FindSpaceFromObject(cls, false)->IsImageSpace();
+ return false;
}
}