commit dbac3090ace708eb27c707d4b72efc48c069129c
author Elliott Hughes <enh@google.com> Fri Mar 16 18:00:30 2012 -0700
committer Elliott Hughes <enh@google.com> Fri Mar 16 18:00:30 2012 -0700
tree 2b811b40af24ce849d327643f05b4244ca2449fb
parent 5efa670d6a8cf6ad3771b9fb7d4c10598ad78f9d

Ensure that BoxPrimitive only sees clean data...

...rather than forcing it to zero irrelevant bits itself.

Change-Id: Ibbd28db08b68fac84704a911a6f927f7d9343055

src/runtime_support.cc

diff --git a/src/runtime_support.cc b/src/runtime_support.cc
index 230c24f..c61db20 100644
--- a/src/runtime_support.cc
+++ b/src/runtime_support.cc
@@ -1170,7 +1170,7 @@
         uint64_t high_half = *reinterpret_cast<uint32_t*>(stack_args + (13 * kPointerSize));
         val.j = (val.j & 0xffffffffULL) | (high_half << 32);
       }
-      BoxPrimitive(env, param_type->GetPrimitiveType(), val);
+      BoxPrimitive(param_type->GetPrimitiveType(), val);
       if (self->IsExceptionPending()) {
         return;
       }
@@ -1189,7 +1189,7 @@
       obj = self->DecodeJObject(*reinterpret_cast<jobject*>(stack_args + (cur_arg * kPointerSize)));
     } else {
       JValue val = *reinterpret_cast<JValue*>(stack_args + (cur_arg * kPointerSize));
-      BoxPrimitive(env, param_type->GetPrimitiveType(), val);
+      BoxPrimitive(param_type->GetPrimitiveType(), val);
       if (self->IsExceptionPending()) {
         return;
       }
@@ -1218,7 +1218,7 @@
     Object* result_ref = self->DecodeJObject(result);
     if (result_ref != NULL) {
       JValue result_unboxed;
-      bool unboxed_okay = UnboxPrimitive(env, result_ref, proxy_mh.GetReturnType(), result_unboxed, "result");
+      bool unboxed_okay = UnboxPrimitive(result_ref, proxy_mh.GetReturnType(), result_unboxed, "result");
       CHECK(unboxed_okay);
       *reinterpret_cast<JValue*>(stack_args) = result_unboxed;
     } else {