Merge "Move all alloca to the first basic block." into ics-mr1-plus-art

1 files changed, 3 insertions, 2 deletions

diff --git a/src/compiler_llvm/method_compiler.h b/src/compiler_llvm/method_compiler.h
index 98325a0058..50411a1bf5 100644
--- a/src/compiler_llvm/method_compiler.h
+++ b/src/compiler_llvm/method_compiler.h
@@ -481,8 +481,8 @@ class MethodCompiler {
   UniquePtr<DalvikReg> retval_reg_;
 
   llvm::BasicBlock* basic_block_stack_overflow_;
-  llvm::BasicBlock* basic_block_reg_alloca_;
-  llvm::BasicBlock* basic_block_shadow_frame_alloca_;
+  llvm::BasicBlock* basic_block_alloca_;
+  llvm::BasicBlock* basic_block_shadow_frame_;
   llvm::BasicBlock* basic_block_reg_arg_init_;
   std::vector<llvm::BasicBlock*> basic_blocks_;
 
@@ -491,6 +491,7 @@ class MethodCompiler {
   llvm::BasicBlock* basic_block_unreachable_;
 
   llvm::AllocaInst* shadow_frame_;
+  llvm::AllocaInst* jvalue_temp_;
 
   uint16_t elf_func_idx_;
 };