Fix the build, because we still need the ret_shorty.
Also, changed LOG(ERROR) to LOG(FATAL) and added "TODO", to address
bdc's comments on the last commit. Forgot to --amend earlier, so it's a
separate commit here.
Change-Id: I3edf1e652e5c6b4da1251cab9219b8b2b3572203
diff --git a/src/compiler_llvm/method_compiler.cc b/src/compiler_llvm/method_compiler.cc
index f549589..caf67c6 100644
--- a/src/compiler_llvm/method_compiler.cc
+++ b/src/compiler_llvm/method_compiler.cc
@@ -2828,7 +2828,8 @@
EmitGuard_ExceptionLandingPad(dex_pc);
MethodHelper method_helper(callee_method);
- if (!method_helper.GetReturnType()->IsPrimitiveVoid()) {
+ char ret_shorty = method_helper.GetShorty()[0];
+ if (ret_shorty != 'V') {
EmitStoreDalvikRetValReg(ret_shorty, kAccurate, retval);
}