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/compiled_method.h b/src/compiled_method.h
index d11f0e4..9ad3139 100644
--- a/src/compiled_method.h
+++ b/src/compiled_method.h
@@ -109,10 +109,11 @@
#if defined(ART_USE_LLVM_COMPILER)
llvm::Function* func_;
#endif
+ // TODO: Change the line above from #endif to #else, after oat_writer is
+ // changed.
std::vector<uint8_t> code_;
};
} // namespace art
#endif // ART_SRC_COMPILED_METHOD_H_
-
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);
}
diff --git a/src/compiler_llvm/upcall_compiler.cc b/src/compiler_llvm/upcall_compiler.cc
index 308790a..8dc4e98 100644
--- a/src/compiler_llvm/upcall_compiler.cc
+++ b/src/compiler_llvm/upcall_compiler.cc
@@ -148,7 +148,7 @@
args.push_back(irb_.CreateLoad(arg_addr));
} else {
- LOG(ERROR) << "Unexpected arg shorty for invoke stub: " << shorty[i];
+ LOG(FATAL) << "Unexpected arg shorty for invoke stub: " << shorty[i];
}
}
