summaryrefslogtreecommitdiff
path: root/src/compiler_llvm/method_compiler.h
diff options
context:
space:
mode:
author TDYa127 <tdy@google.com> 2012-11-18 16:59:53 -0800
committer Shih-wei Liao <sliao@google.com> 2012-12-04 11:07:34 -0800
commitce4cc0d1818e872c1c7f3c3519a82259afd5c288 (patch)
tree308f2c30e5a842a5e459d96e730ca4432a020f4f /src/compiler_llvm/method_compiler.h
parent823b8acdf2c8274ff93b685e50a93ab9afc6af8b (diff)
Using gcmap instead of shadow frame.
Fix misuse of TBAAJRuntime & TBAARuntimeInfo. Now, the TBAAJRuntime is only for runtime support function. Update DexPC before lock object and suspend. Change-Id: I40fa37f4863fe6e127328a8413285ee3c62e8505
Diffstat (limited to 'src/compiler_llvm/method_compiler.h')
-rw-r--r--src/compiler_llvm/method_compiler.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/compiler_llvm/method_compiler.h b/src/compiler_llvm/method_compiler.h
index 02c3d6a476..f67866affd 100644
--- a/src/compiler_llvm/method_compiler.h
+++ b/src/compiler_llvm/method_compiler.h
@@ -289,7 +289,7 @@ class MethodCompiler {
void EmitBranchExceptionLandingPad(uint32_t dex_pc);
- void EmitGuard_GarbageCollectionSuspend();
+ void EmitGuard_GarbageCollectionSuspend(uint32_t dex_pc);
llvm::Value* EmitCompareResultSelection(llvm::Value* cmp_eq,
llvm::Value* cmp_lt);
@@ -461,9 +461,7 @@ class MethodCompiler {
llvm::Function* func_;
std::vector<DalvikReg*> regs_;
- std::vector<llvm::Value*> shadow_frame_entries_;
std::vector<llvm::Value*> vregs_;
- std::vector<int32_t> reg_to_shadow_frame_index_;
UniquePtr<DalvikReg> retval_reg_;
llvm::BasicBlock* basic_block_alloca_;