From 8b20b5c1f5b454b2f8b8bff492c88724b5002600 Mon Sep 17 00:00:00 2001
From: Vladimir Marko <vmarko@google.com>
Date: Tue, 29 May 2018 15:32:55 +0000
Subject: Revert "Optimize register mask and stack mask in stack maps."

This reverts commit ffaf87a429766ed80e6afee5bebea93db539620b.

Reason for revert: Breaks exception_test32 on target
for CMS and heap poisoning configs.

Change-Id: I127c17f693e28211a799f73a50e73105edee7e4c
---
 runtime/quick_exception_handler.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime/quick_exception_handler.cc')

diff --git a/runtime/quick_exception_handler.cc b/runtime/quick_exception_handler.cc
index 26489209b8..de613d3b20 100644
--- a/runtime/quick_exception_handler.cc
+++ b/runtime/quick_exception_handler.cc
@@ -439,7 +439,7 @@ class DeoptimizeStackVisitor FINAL : public StackVisitor {
           const uint8_t* addr = reinterpret_cast<const uint8_t*>(GetCurrentQuickFrame()) + offset;
           value = *reinterpret_cast<const uint32_t*>(addr);
           uint32_t bit = (offset >> 2);
-          if (bit < stack_mask.size_in_bits() && stack_mask.LoadBit(bit)) {
+          if (bit < code_info.GetNumberOfStackMaskBits() && stack_mask.LoadBit(bit)) {
             is_reference = true;
           }
           break;
-- 
cgit v1.2.3-59-g8ed1b