diff options
| author | David Srbecky <dsrbecky@google.com> | 2018-06-02 05:06:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-06-02 05:06:05 +0000 |
| commit | 6bb8751785d045441d06d9728c5c59dd69338f14 (patch) | |
| tree | f9b204f1093333d6e326a57b8e0729b36eb49a0d /runtime/quick_exception_handler.cc | |
| parent | b1daf3469a2073837c1a236c13bd6666e4aae9f1 (diff) | |
| parent | 71ec1cc0665cdb9d39f4fd284d68962020417a53 (diff) | |
Merge "Rewrite dex register map encoding in stackmaps."
Diffstat (limited to 'runtime/quick_exception_handler.cc')
| -rw-r--r-- | runtime/quick_exception_handler.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/quick_exception_handler.cc b/runtime/quick_exception_handler.cc index 63a09f25a4..4f4abf7f7f 100644 --- a/runtime/quick_exception_handler.cc +++ b/runtime/quick_exception_handler.cc @@ -232,7 +232,7 @@ void QuickExceptionHandler::SetCatchEnvironmentForOptimizedHandler(StackVisitor* DCHECK(catch_stack_map.IsValid()); DexRegisterMap catch_vreg_map = code_info.GetDexRegisterMapOf(catch_stack_map, number_of_vregs); - if (!catch_vreg_map.IsValid()) { + if (!catch_vreg_map.IsValid() || !catch_vreg_map.HasAnyLiveDexRegisters()) { return; } |