commit b600b3f8360f535913fedc91aef7c8e5abaca48a
author Elliott Hughes <enh@google.com> Wed Mar 14 13:57:24 2012 -0700
committer Elliott Hughes <enh@google.com> Wed Mar 14 13:57:24 2012 -0700
tree b8f4fdca44a70caec314b210372d678ad9501dbf
parent 002b915276064dbe2ce9caf7474d3032301d8d7c

Fix/improve exception detail messages for unboxing.

This fixes libcore/luni/src/test/java/libcore/java/lang/reflect/MethodTest.java
failures.

Change-Id: Idf6aae169bd72f0534d4094170536e6b2515ca07

src/runtime_support.cc

diff --git a/src/runtime_support.cc b/src/runtime_support.cc
index 8dc518e..f5edebf 100644
--- a/src/runtime_support.cc
+++ b/src/runtime_support.cc
@@ -1147,7 +1147,8 @@
     Object* result_ref = self->DecodeJObject(result);
     if (result_ref != NULL) {
       JValue result_unboxed;
-      UnboxPrimitive(env, result_ref, proxy_mh.GetReturnType(), result_unboxed);
+      bool unboxed_okay = UnboxPrimitive(env, result_ref, proxy_mh.GetReturnType(), result_unboxed, "result");
+      CHECK(unboxed_okay);
       *reinterpret_cast<JValue*>(stack_args) = result_unboxed;
     } else {
       *reinterpret_cast<jobject*>(stack_args) = NULL;