From ce4cc0d1818e872c1c7f3c3519a82259afd5c288 Mon Sep 17 00:00:00 2001 From: TDYa127 Date: Sun, 18 Nov 2012 16:59:53 -0800 Subject: 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 --- src/compiler_llvm/ir_builder.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/compiler_llvm/ir_builder.cc') diff --git a/src/compiler_llvm/ir_builder.cc b/src/compiler_llvm/ir_builder.cc index b271002df4..e8e73e3780 100644 --- a/src/compiler_llvm/ir_builder.cc +++ b/src/compiler_llvm/ir_builder.cc @@ -151,8 +151,8 @@ llvm::Type* IRBuilder::getJTypeInArraySpace(JType jty) { } -llvm::StructType* IRBuilder::getShadowFrameTy(uint32_t sirt_size, uint32_t vreg_size) { - std::string name(StringPrintf("ShadowFrame%u_vreg%u", sirt_size, vreg_size)); +llvm::StructType* IRBuilder::getShadowFrameTy(uint32_t vreg_size) { + std::string name(StringPrintf("ShadowFrame%u", vreg_size)); // Try to find the existing struct type definition if (llvm::Type* type = module_->getTypeByName(name)) { @@ -163,7 +163,6 @@ llvm::StructType* IRBuilder::getShadowFrameTy(uint32_t sirt_size, uint32_t vreg_ // Create new struct type definition llvm::Type* elem_types[] = { art_frame_type_, - llvm::ArrayType::get(jobject_type_, sirt_size), llvm::ArrayType::get(getInt32Ty(), vreg_size), }; -- cgit v1.2.3-59-g8ed1b