Merge "Update frame size after the bitcode is translated into machine code." into ics-mr1-plus-art

1 files changed, 8 insertions, 3 deletions

diff --git a/src/compiler_llvm/method_compiler.cc b/src/compiler_llvm/method_compiler.cc
index fc9c4d8c4f..153d99a93b 100644
--- a/src/compiler_llvm/method_compiler.cc
+++ b/src/compiler_llvm/method_compiler.cc
@@ -3681,9 +3681,14 @@ CompiledMethod *MethodCompiler::Compile() {
   // Dex file.  Besides, we have to convert the code unit into bytes.
   // Thus, we got our magic number 9.
 
-  return new CompiledMethod(cunit_->GetInstructionSet(),
-                            cunit_->GetElfIndex(),
-                            elf_func_idx_);
+  CompiledMethod* compiled_method =
+    new CompiledMethod(cunit_->GetInstructionSet(),
+                       cunit_->GetElfIndex(),
+                       elf_func_idx_);
+
+  cunit_->RegisterCompiledMethod(func_, compiled_method);
+
+  return compiled_method;
 }