commit 45a76cb99104a222d6a9bd768a084893dcb7cf30
author Ian Rogers <irogers@google.com> Thu Jul 21 22:00:15 2011 -0700
committer Ian Rogers <irogers@google.com> Fri Jul 22 15:16:43 2011 -0700
tree 995557ba95942309ffe9c4a13819a10da8c4b4bb
parent 69759eaa6fd4386f1e6d8748052ad221087b3476

Exception and suspend count polling on JNI bridge return.

Change-Id: I0e5597fcbdcdb88100b18d63323e7ba8d27f13fe

src/calling_convention_arm.cc

diff --git a/src/calling_convention_arm.cc b/src/calling_convention_arm.cc
index 233905a..bac943b 100644
--- a/src/calling_convention_arm.cc
+++ b/src/calling_convention_arm.cc
@@ -15,12 +15,15 @@
 }
 
 ManagedRegister CallingConvention::ReturnRegister() {
+  const Method *method = GetMethod();
   if (GetMethod()->IsReturnAFloat()) {
     return ManagedRegister::FromSRegister(S0);
-  } else if (GetMethod()->IsReturnAFloat()) {
+  } else if (GetMethod()->IsReturnADouble()) {
     return ManagedRegister::FromDRegister(D0);
-  } else if (GetMethod()->IsReturnALong()) {
+  } else if (method->IsReturnALong()) {
     return ManagedRegister::FromRegisterPair(R0_R1);
+  } else if (method->IsReturnVoid()) {
+    return ManagedRegister::NoRegister();
   } else {
     return ManagedRegister::FromCoreRegister(R0);
   }