diff options
| author | 2016-04-19 15:30:54 +0000 | |
|---|---|---|
| committer | 2016-04-19 15:30:54 +0000 | |
| commit | 35a38d1e250fc3237c79fafa96ec69d6f07c1f3d (patch) | |
| tree | f94d10aa3db0dabb859e1e5e8b248373c1e81128 /runtime/fault_handler.cc | |
| parent | da66e57c57eb3a70ee1569efa19ca897f7da735f (diff) | |
| parent | d14b73d9d9027539c1dfeff93f784a58c93f4e32 (diff) | |
Merge "ART: Fast-fail empty other handlers in fault handling"
Diffstat (limited to 'runtime/fault_handler.cc')
| -rw-r--r-- | runtime/fault_handler.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/runtime/fault_handler.cc b/runtime/fault_handler.cc index 5c5abeb0a6..9f073a63a8 100644 --- a/runtime/fault_handler.cc +++ b/runtime/fault_handler.cc @@ -147,6 +147,10 @@ void FaultManager::Shutdown() { } bool FaultManager::HandleFaultByOtherHandlers(int sig, siginfo_t* info, void* context) { + if (other_handlers_.empty()) { + return false; + } + Thread* self = Thread::Current(); DCHECK(self != nullptr); |