commit 8898a270b25ff4164ec553d21fb72471e74b0b92
author Logan Chien <loganchien@google.com> Tue Dec 27 17:51:56 2011 +0800
committer Shih-wei Liao <sliao@google.com> Thu Feb 16 08:48:48 2012 -0800
tree 38dc705ccf713c2124e370c9225299d7394cec7d
parent 481731320b62cc3cb1f1545fb72c350d791348cb

Implement return instructions.

Change-Id: Id2d2ec300a577cbf66164dd3d445031a4f9c9efe

src/compiler_llvm/method_compiler.cc

diff --git a/src/compiler_llvm/method_compiler.cc b/src/compiler_llvm/method_compiler.cc
index 312b282..ceb9f74 100644
--- a/src/compiler_llvm/method_compiler.cc
+++ b/src/compiler_llvm/method_compiler.cc
@@ -1121,15 +1121,27 @@
 
 void MethodCompiler::EmitInsn_ReturnVoid(uint32_t dex_pc,
                                          Instruction const* insn) {
-  // UNIMPLEMENTED(WARNING);
-  irb_.CreateUnreachable();
+  // Garbage collection safe-point
+  EmitGuard_GarbageCollectionSuspend(dex_pc);
+
+  // Return!
+  irb_.CreateRetVoid();
 }
 
 
 void MethodCompiler::EmitInsn_Return(uint32_t dex_pc,
                                      Instruction const* insn) {
-  // UNIMPLEMENTED(WARNING);
-  irb_.CreateUnreachable();
+
+  Instruction::DecodedInstruction dec_insn(insn);
+
+  // Garbage collection safe-point
+  EmitGuard_GarbageCollectionSuspend(dex_pc);
+
+  // Return!
+  char ret_shorty = method_helper_.GetShorty()[0];
+  llvm::Value* retval = EmitLoadDalvikReg(dec_insn.vA_, ret_shorty, kAccurate);
+
+  irb_.CreateRet(retval);
 }