diff options
| author | Andreas Gampe <agampe@google.com> | 2015-04-03 14:36:07 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2015-04-03 14:36:07 -0700 |
| commit | 2f0751ea75e5f093d9ce7b8587e65a2ca3de0855 (patch) | |
| tree | df99d69761aa9c5ace190f4970c0952009c1713d /runtime/thread.cc | |
| parent | 698385411e5db8c7ac9bd4471f152b8c6ea7f7bf (diff) | |
| download | art-2f0751ea75e5f093d9ce7b8587e65a2ca3de0855.tar.gz art-2f0751ea75e5f093d9ce7b8587e65a2ca3de0855.tar.bz2 art-2f0751ea75e5f093d9ce7b8587e65a2ca3de0855.zip | |
ART: Turn of native stack dump on x86 on-device
Temporary workaround for bug.
Bug: 20040863
Change-Id: Ifdde68c66b94ebc2f13c7983f38700c8bcf41559
Diffstat (limited to 'runtime/thread.cc')
| -rw-r--r-- | runtime/thread.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/runtime/thread.cc b/runtime/thread.cc index 9fee779c6..8a6422d4e 100644 --- a/runtime/thread.cc +++ b/runtime/thread.cc @@ -1068,7 +1068,12 @@ void Thread::DumpStack(std::ostream& os) const { // If we're currently in native code, dump that stack before dumping the managed stack. if (dump_for_abort || ShouldShowNativeStack(this)) { DumpKernelStack(os, GetTid(), " kernel: ", false); + // b/20040863. Temporary workaround for x86 libunwind issue. +#if defined(__i386__) && defined(HAVE_ANDROID_OS) + os << "Cannot dump native stack. b/20040863.\n"; +#else DumpNativeStack(os, GetTid(), " native: ", GetCurrentMethod(nullptr, !dump_for_abort)); +#endif } DumpJavaStack(os); } else { |