commit 7f5b9be62c034b29f3bb550478da9af28e88f72b
author TDYa127 <tdy@google.com> Sun Apr 29 01:31:49 2012 -0700
committer Shih-wei Liao <sliao@google.com> Thu May 03 18:28:57 2012 -0700
tree 123880aa0d911e9bdf635cc87633704b3d4392b0
parent 5e5a804e7be57876df789c88dc0503879f969f39

Separate object register and shadow frame entry.

The shadow frame already escaped. LLVM can't do optimization for the
shadow frame entry.

Change-Id: I3a6e4a3066ebcc9a6530e3313061af3a7d18c456

src/compiler_llvm/dalvik_reg.cc

diff --git a/src/compiler_llvm/dalvik_reg.cc b/src/compiler_llvm/dalvik_reg.cc
index 379fcb0..492d33b 100644
--- a/src/compiler_llvm/dalvik_reg.cc
+++ b/src/compiler_llvm/dalvik_reg.cc
@@ -29,6 +29,8 @@
    public:
     DalvikLocalVarReg(MethodCompiler& method_compiler, uint32_t reg_idx);
 
+    virtual void SetValue(JType jty, JTypeSpace space, llvm::Value* value);
+
     virtual ~DalvikLocalVarReg();
 
    private:
@@ -39,6 +41,7 @@
     llvm::Value* reg_32_;
     llvm::Value* reg_64_;
     llvm::Value* reg_obj_;
+    llvm::Value* reg_shadow_frame_;
   };
 
   class DalvikRetValReg : public DalvikReg {
@@ -201,7 +204,7 @@
 DalvikLocalVarReg::DalvikLocalVarReg(MethodCompiler& method_compiler,
                                      uint32_t reg_idx)
 : DalvikReg(method_compiler), reg_idx_(reg_idx),
-  reg_32_(NULL), reg_64_(NULL), reg_obj_(NULL) {
+  reg_32_(NULL), reg_64_(NULL), reg_obj_(NULL), reg_shadow_frame_(NULL) {
 }
 
 
@@ -209,6 +212,17 @@
 }
 
 
+void DalvikLocalVarReg::SetValue(JType jty, JTypeSpace space, llvm::Value* value) {
+  DalvikReg::SetValue(jty, space, value);
+
+  if (jty == kObject) {
+    DCHECK_NE(reg_shadow_frame_, static_cast<llvm::Value*>(NULL))
+      << "Didn't allocate shadow frame entry.";
+    irb_.CreateStore(value, reg_shadow_frame_);
+  }
+}
+
+
 llvm::Value* DalvikLocalVarReg::GetRawAddr(JType jty, JTypeSpace space) {
   switch (GetRegCategoryFromJType(jty)) {
   case kRegCat1nr:
@@ -226,6 +240,7 @@
   case kRegObject:
     if (reg_obj_ == NULL) {
       reg_obj_ = method_compiler_->AllocDalvikLocalVarReg(kRegObject, reg_idx_);
+      reg_shadow_frame_ = method_compiler_->AllocShadowFrameEntry(reg_idx_);
     }
     return reg_obj_;