Revert "ART: additional info SIGILL"
This reverts commit 0cff0b0956145a192865bef4896c771e164d0a3a.
Reason for revert: insufficient coverage for intended purpose per follow-up
discussion on initial CL.
Bug: 65312375
Test: m -j32
Change-Id: I3cf94207ddd93d6030d80f681613e2a7e8b2fd66
diff --git a/runtime/runtime_common.cc b/runtime/runtime_common.cc
index f8e9442..940e461 100644
--- a/runtime/runtime_common.cc
+++ b/runtime/runtime_common.cc
@@ -416,19 +416,8 @@
<< "Cmdline: " << cmd_line << std::endl
<< "Thread: " << tid << " \"" << thread_name << "\"" << std::endl
<< "Registers:\n" << Dumpable<UContext>(thread_context) << std::endl
- << "Backtrace:\n" << Dumpable<Backtrace>(thread_backtrace);
- if (signal_number == SIGILL) {
- // Note the view we present is from the d-cache, which should
- // match the i-cache if all is well.
- static const size_t kCodeSnippetBytes = 16;
- stream << "Code:\n\t" << info->si_addr << ":";
- uintptr_t start = reinterpret_cast<uintptr_t>(info->si_addr);
- uintptr_t end = std::min(start + kCodeSnippetBytes, RoundUp(start, kPageSize));
- for (uintptr_t addr = start; addr != end; ++addr) {
- stream << StringPrintf(" %02x", *(reinterpret_cast<const uint8_t*>(addr)));
- }
- }
- stream << std::endl << std::flush;
+ << "Backtrace:\n" << Dumpable<Backtrace>(thread_backtrace) << std::endl;
+ stream << std::flush;
};
if (dump_on_stderr) {
diff --git a/runtime/runtime_common.h b/runtime/runtime_common.h
index 1248fe0..06d6627 100644
--- a/runtime/runtime_common.h
+++ b/runtime/runtime_common.h
@@ -30,7 +30,6 @@
#include <iomanip>
-#include "base/bit_utils.h"
#include "base/dumpable.h"
#include "native_stack_dump.h"
#include "utils.h"