commit 9f1ab126ff140f452c124dddf9b8a1ced6daf89a
author Ian Rogers <irogers@google.com> Mon Dec 12 08:52:43 2011 -0800
committer Ian Rogers <irogers@google.com> Mon Dec 12 13:38:55 2011 -0800
tree e65ecdb43832e3d53287a2c927949ae7409a92e7
parent 6ef827a33b04fd5413d2ad88fd4599ca1920c824

Address various dex2oat hangs

class_linker.cc - add support for no such field error
dex_verifier.cc - address cases where type information isn't available
due to verification errors
dex_verifier.h - support for monitor nesting upto 64 deep

These changes address Bug: 5742499, Bug: 5743100, Bug: 5742810

Change-Id: I2e9a77059314c84f21ad5d194bad77c7f2fa2ee9

src/dex_verifier.h

diff --git a/src/dex_verifier.h b/src/dex_verifier.h
index 201cd2b..5b2f54e 100644
--- a/src/dex_verifier.h
+++ b/src/dex_verifier.h
@@ -707,14 +707,14 @@
 
   void CopyRegToLockDepth(size_t dst, size_t src) {
     if (reg_to_lock_depths_.count(src) > 0) {
-      uint32_t depths = reg_to_lock_depths_[src];
+      uint64_t depths = reg_to_lock_depths_[src];
       reg_to_lock_depths_[dst] = depths;
     }
   }
 
   bool IsSetLockDepth(size_t reg, size_t depth) {
     if (reg_to_lock_depths_.count(reg) > 0) {
-      uint32_t depths = reg_to_lock_depths_[reg];
+      uint64_t depths = reg_to_lock_depths_[reg];
       return (depths & (1 << depth)) != 0;
     } else {
       return false;
@@ -722,9 +722,9 @@
   }
 
   void SetRegToLockDepth(size_t reg, size_t depth) {
-    CHECK_LT(depth, 32u);
+    CHECK_LT(depth, 64u);
     DCHECK(!IsSetLockDepth(reg, depth));
-    uint32_t depths;
+    uint64_t depths;
     if (reg_to_lock_depths_.count(reg) > 0) {
       depths = reg_to_lock_depths_[reg];
       depths = depths | (1 << depth);
@@ -735,9 +735,9 @@
   }
 
   void ClearRegToLockDepth(size_t reg, size_t depth) {
-    CHECK_LT(depth, 32u);
+    CHECK_LT(depth, 64u);
     DCHECK(IsSetLockDepth(reg, depth));
-    uint32_t depths = reg_to_lock_depths_[reg];
+    uint64_t depths = reg_to_lock_depths_[reg];
     depths = depths ^ (1 << depth);
     if (depths != 0) {
       reg_to_lock_depths_[reg] = depths;
@@ -766,7 +766,7 @@
   // A map from register to a bit vector of indices into the monitors_ stack. As we pop the monitor
   // stack we verify that monitor-enter/exit are correctly nested. That is, if there was a
   // monitor-enter on v5 and then on v6, we expect the monitor-exit to be on v6 then on v5
-  std::map<uint32_t, uint32_t> reg_to_lock_depths_;
+  std::map<uint32_t, uint64_t> reg_to_lock_depths_;
 };
 std::ostream& operator<<(std::ostream& os, const RegisterLine& rhs);