commit 9729e52171e8f1e18681a7c7b57efd059f6563e7
author Nicolas Geoffray <ngeoffray@google.com> Tue Mar 03 12:44:53 2015 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Tue Mar 03 12:44:53 2015 +0000
tree fdabf1d965d7d3d5b07813a273053d749e190194
parent 207fc169d52c17f50c3a9e4ce0442d241c31b5fa

Revert GetThisObject change.

Code was changed to use sizeof(void*) instead of the runtime
instruction set pointer size, which caused host compilation crashes.

Change-Id: I3e59897620d6e55b43d6d76b5a0d6d0487b8081a

runtime/stack.cc

diff --git a/runtime/stack.cc b/runtime/stack.cc
index d570880..97a8d01 100644
--- a/runtime/stack.cc
+++ b/runtime/stack.cc
@@ -134,7 +134,8 @@
     } else {
       return cur_shadow_frame_->GetVRegReference(0);
     }
-  } else if (m->IsOptimized(sizeof(void*))) {
+  } else if (m->IsOptimized(GetInstructionSetPointerSize(
+      Runtime::Current()->GetInstructionSet()))) {
     // TODO: Implement, currently only used for exceptions when jdwp is enabled.
     UNIMPLEMENTED(WARNING)
         << "StackVisitor::GetThisObject is unimplemented with the optimizing compiler";