commit 6ce90a2d55ff64a049baf9685d078cef83568591
author Hiroshi Yamauchi <yamauchi@google.com> Tue Dec 06 20:09:07 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Dec 06 20:09:07 2016 +0000
tree 658a72843f052f3c9696db1f9c56adab89216d03
parent 20f0ed64fd9b5218c134cf729b4d3e1f27592e8b
parent d12f04cb563432c1c072c7446255c57ec2f8db53

Merge "Use getReferent() in enqueueSentinelReference to avoid race with GC."
am: d12f04cb56

Change-Id: I45197211253ba6308695f3bcbf339b118cfed299

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index 66bb803..bf34548 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -1493,11 +1493,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__)