commit 60f322223ce25384bbf70be950a660e94538ed57
author Mathieu Chartier <mathieuc@google.com> Tue Oct 09 11:49:06 2018 -0700
committer Mathieu Chartier <mathieuc@google.com> Tue Oct 09 11:49:06 2018 -0700
tree 4bd42a9618a0dcf1d45741d70a48683e3f4b3155
parent 1f0133bc00f96316224a7547bbe4ecc6b406c46e

Avoid sign extending pointers in SetStringInitValueToAllAliases

Prevent check failures when object pointers are in top 2GB of low 4GB
range.

Bug: 117427174
Test: test-art-host
Change-Id: I6abbe2505bea35248a0fb3095f47e33051d0a21e

runtime/interpreter/interpreter_common.cc

diff --git a/runtime/interpreter/interpreter_common.cc b/runtime/interpreter/interpreter_common.cc
index dc3cc45..43e4eb4 100644
--- a/runtime/interpreter/interpreter_common.cc
+++ b/runtime/interpreter/interpreter_common.cc
@@ -590,10 +590,10 @@
   for (uint32_t i = 0, e = shadow_frame->NumberOfVRegs(); i < e; ++i) {
     if (shadow_frame->GetVRegReference(i) == existing) {
       DCHECK_EQ(shadow_frame->GetVRegReference(i),
-                reinterpret_cast<mirror::Object*>(shadow_frame->GetVReg(i)));
+                reinterpret_cast<mirror::Object*>(static_cast<uint32_t>(shadow_frame->GetVReg(i))));
       shadow_frame->SetVRegReference(i, result.GetL());
       DCHECK_EQ(shadow_frame->GetVRegReference(i),
-                reinterpret_cast<mirror::Object*>(shadow_frame->GetVReg(i)));
+                reinterpret_cast<mirror::Object*>(static_cast<uint32_t>(shadow_frame->GetVReg(i))));
     }
   }
 }