Fix gtests with mini-debug-info enabled by default.
Ensure we can generate mini-debug-info if it is enabled by default.
The tests don't explicitly generate the info on background thread.
Test: test.py -g
Change-Id: If3cf9a067ce683f728d553394e1407beeadae670
diff --git a/compiler/optimizing/code_generator_arm_vixl.cc b/compiler/optimizing/code_generator_arm_vixl.cc
index 18709f8..bca0936 100644
--- a/compiler/optimizing/code_generator_arm_vixl.cc
+++ b/compiler/optimizing/code_generator_arm_vixl.cc
@@ -9630,7 +9630,7 @@
MemberOffset offset = ArtMethod::EntryPointFromQuickCompiledCodeOffset(kArmPointerSize);
assembler.LoadFromOffset(arm::kLoadWord, vixl32::pc, vixl32::r0, offset.Int32Value());
assembler.GetVIXLAssembler()->Bkpt(0);
- if (GetCompilerOptions().GenerateAnyDebugInfo()) {
+ if (debug_name != nullptr && GetCompilerOptions().GenerateAnyDebugInfo()) {
*debug_name = "MethodCallThunk";
}
break;
@@ -9638,7 +9638,7 @@
case linker::LinkerPatch::Type::kCallEntrypoint: {
assembler.LoadFromOffset(arm::kLoadWord, vixl32::pc, tr, patch.EntrypointOffset());
assembler.GetVIXLAssembler()->Bkpt(0);
- if (GetCompilerOptions().GenerateAnyDebugInfo()) {
+ if (debug_name != nullptr && GetCompilerOptions().GenerateAnyDebugInfo()) {
*debug_name = "EntrypointCallThunk_" + std::to_string(patch.EntrypointOffset());
}
break;