commit bde2da0a5de33300bd889dee4ca875a03f222c21
author Narayan Kamath <narayan@google.com> Mon Oct 31 10:35:36 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 31 10:35:36 2016 +0000
tree 4b08b221eec55e3b5342a5bf0d33ee22533980f7
parent be5842b377945d188b309f56f88612674c4c7eaa
parent be92d691dd044dfc94a1c8e8793056776d55e826

Merge "method_handles: Complete support for emulated stack frames."
am: be92d691dd

Change-Id: Id651bd3eadd08dcd07e3280bc2cdd632d0be711f

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index d645c5a..55d8dac 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -1445,11 +1445,6 @@
 }
 
 void Runtime::DumpForSigQuit(std::ostream& os) {
-  // Dumping for SIGQIT may cause deadlocks if the the debugger is active. b/26118154
-  if (Dbg::IsDebuggerActive()) {
-    LOG(INFO) << "Skipping DumpForSigQuit due to active debugger";
-    return;
-  }
   GetClassLinker()->DumpForSigQuit(os);
   GetInternTable()->DumpForSigQuit(os);
   GetJavaVM()->DumpForSigQuit(os);

runtime/utils.cc

diff --git a/runtime/utils.cc b/runtime/utils.cc
index 6ed54f7..66739a9 100644
--- a/runtime/utils.cc
+++ b/runtime/utils.cc
@@ -37,6 +37,7 @@
 #if defined(__APPLE__)
 #include "AvailabilityMacros.h"  // For MAC_OS_X_VERSION_MAX_ALLOWED
 #include <sys/syscall.h>
+#include <crt_externs.h>
 #endif
 
 #if defined(__linux__)