Add more logging and sanity checks for JIT mini-debug-info.
Used when diagnosing b/151137723. Keep it around.
Bug: 151137723
Test: test.py -r --jit
Change-Id: I10cc613c7396607e221fdc1f5972d26c1ac03fa8
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc
index 9978a6f..346f60d 100644
--- a/compiler/optimizing/optimizing_compiler.cc
+++ b/compiler/optimizing/optimizing_compiler.cc
@@ -406,7 +406,7 @@
PassObserver* pass_observer,
VariableSizedHandleScope* handles) const;
- void GenerateJitDebugInfo(const debug::MethodDebugInfo& method_debug_info);
+ std::vector<uint8_t> GenerateJitDebugInfo(const debug::MethodDebugInfo& method_debug_info);
std::unique_ptr<OptimizingCompilerStats> compilation_stats_;
@@ -1262,6 +1262,7 @@
const uint8_t* code = reserved_code.data() + OatQuickMethodHeader::InstructionAlignedSize();
// Add debug info after we know the code location but before we update entry-point.
+ std::vector<uint8_t> debug_info;
if (compiler_options.GenerateAnyDebugInfo()) {
debug::MethodDebugInfo info = {};
info.custom_name = "art_jni_trampoline";
@@ -1280,7 +1281,7 @@
info.frame_size_in_bytes = jni_compiled_method.GetFrameSize();
info.code_info = nullptr;
info.cfi = jni_compiled_method.GetCfi();
- GenerateJitDebugInfo(info);
+ debug_info = GenerateJitDebugInfo(info);
}
if (!code_cache->Commit(self,
@@ -1291,6 +1292,8 @@
reserved_data,
roots,
ArrayRef<const uint8_t>(stack_map),
+ debug_info,
+ /* is_full_debug_info= */ compiler_options.GetGenerateDebugInfo(),
osr,
/* has_should_deoptimize_flag= */ false,
cha_single_implementation_list)) {
@@ -1370,6 +1373,7 @@
// Add debug info after we know the code location but before we update entry-point.
const CompilerOptions& compiler_options = GetCompilerOptions();
+ std::vector<uint8_t> debug_info;
if (compiler_options.GenerateAnyDebugInfo()) {
debug::MethodDebugInfo info = {};
DCHECK(info.custom_name.empty());
@@ -1388,7 +1392,7 @@
info.frame_size_in_bytes = codegen->GetFrameSize();
info.code_info = stack_map.size() == 0 ? nullptr : stack_map.data();
info.cfi = ArrayRef<const uint8_t>(*codegen->GetAssembler()->cfi().data());
- GenerateJitDebugInfo(info);
+ debug_info = GenerateJitDebugInfo(info);
}
if (!code_cache->Commit(self,
@@ -1399,6 +1403,8 @@
reserved_data,
roots,
ArrayRef<const uint8_t>(stack_map),
+ debug_info,
+ /* is_full_debug_info= */ compiler_options.GetGenerateDebugInfo(),
osr,
codegen->GetGraph()->HasShouldDeoptimizeFlag(),
codegen->GetGraph()->GetCHASingleImplementationList())) {
@@ -1427,7 +1433,7 @@
return true;
}
-void OptimizingCompiler::GenerateJitDebugInfo(const debug::MethodDebugInfo& info) {
+std::vector<uint8_t> OptimizingCompiler::GenerateJitDebugInfo(const debug::MethodDebugInfo& info) {
const CompilerOptions& compiler_options = GetCompilerOptions();
if (compiler_options.GenerateAnyDebugInfo()) {
// If both flags are passed, generate full debug info.
@@ -1436,13 +1442,9 @@
// Create entry for the single method that we just compiled.
InstructionSet isa = compiler_options.GetInstructionSet();
const InstructionSetFeatures* features = compiler_options.GetInstructionSetFeatures();
- std::vector<uint8_t> elf = debug::MakeElfFileForJIT(isa, features, mini_debug_info, info);
-
- // NB: Don't allow packing of full info since it would remove non-backtrace data.
- MutexLock mu(Thread::Current(), *Locks::jit_lock_);
- const void* code_ptr = reinterpret_cast<const void*>(info.code_address);
- AddNativeDebugInfoForJit(code_ptr, elf, /*allow_packing=*/ mini_debug_info);
+ return debug::MakeElfFileForJIT(isa, features, mini_debug_info, info);
}
+ return std::vector<uint8_t>();
}
} // namespace art