summaryrefslogtreecommitdiff
path: root/runtime/quick_exception_handler.cc
diff options
context:
space:
mode:
author Mathieu Chartier <mathieuc@google.com> 2017-02-01 22:53:59 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2017-02-01 22:54:00 +0000
commit3cb871ab1af47576959fd24a99d370381b8f193e (patch)
tree6e95b08b6fcf253ab6ea53d2e542e3f85f9f39c7 /runtime/quick_exception_handler.cc
parent9fcd2566c3893a9497aa713330bd231b3157d17e (diff)
parent1a20b6801f2432a42b906f0de01e7e9586526aec (diff)
Merge "Deduplicate register masks"
Diffstat (limited to 'runtime/quick_exception_handler.cc')
-rw-r--r--runtime/quick_exception_handler.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/quick_exception_handler.cc b/runtime/quick_exception_handler.cc
index 3ba30112fa..bf995095de 100644
--- a/runtime/quick_exception_handler.cc
+++ b/runtime/quick_exception_handler.cc
@@ -407,7 +407,7 @@ class DeoptimizeStackVisitor FINAL : public StackVisitor {
CodeInfoEncoding encoding = code_info.ExtractEncoding();
StackMap stack_map = code_info.GetStackMapForNativePcOffset(native_pc_offset, encoding);
const size_t number_of_vregs = m->GetCodeItem()->registers_size_;
- uint32_t register_mask = stack_map.GetRegisterMask(encoding.stack_map_encoding);
+ uint32_t register_mask = code_info.GetRegisterMaskOf(encoding, stack_map);
BitMemoryRegion stack_mask = code_info.GetStackMaskOf(encoding, stack_map);
DexRegisterMap vreg_map = IsInInlinedFrame()
? code_info.GetDexRegisterMapAtDepth(GetCurrentInliningDepth() - 1,