diff options
| author | 2012-03-15 06:20:17 +0800 | |
|---|---|---|
| committer | 2012-03-26 20:50:08 -0700 | |
| commit | 1b0a1b7dcf077cbab1975dc22cb00c0b8898f05b (patch) | |
| tree | c0ab3a2544fd6ee0a69d63f655bf6d6a7bcd8a40 /src/compiler_llvm/ir_builder.cc | |
| parent | f7ad17e108b9357d7c94c6218a8521140a667f3d (diff) | |
Remove the hard coded "constants" related to shadow frame.
(cherry picked from commit ae63b2a5ae3fa64bc07369c22efcf5617d55cc16)
Change-Id: I4f00bcda535b080fd0acb586ef699d101a418675
Diffstat (limited to 'src/compiler_llvm/ir_builder.cc')
| -rw-r--r-- | src/compiler_llvm/ir_builder.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/compiler_llvm/ir_builder.cc b/src/compiler_llvm/ir_builder.cc index 6612911d35..1a27d0258f 100644 --- a/src/compiler_llvm/ir_builder.cc +++ b/src/compiler_llvm/ir_builder.cc @@ -33,7 +33,7 @@ IRBuilder::IRBuilder(llvm::LLVMContext& context, llvm::Module& module) // Get java object type from module llvm::Type* jobject_struct_type = module.getTypeByName("JavaObject"); - CHECK_NE(jobject_struct_type, static_cast<llvm::Type*>(NULL)); + CHECK(jobject_struct_type != NULL); jobject_type_ = jobject_struct_type->getPointerTo(); // Create JEnv* type @@ -41,8 +41,8 @@ IRBuilder::IRBuilder(llvm::LLVMContext& context, llvm::Module& module) jenv_type_ = jenv_struct_type->getPointerTo(); // Get Art shadow frame struct type from module - art_frame_type_ = module.getTypeByName("ArtFrame"); - CHECK_NE(art_frame_type_, static_cast<llvm::StructType*>(NULL)); + art_frame_type_ = module.getTypeByName("ShadowFrame"); + CHECK(art_frame_type_ != NULL); // Load the runtime support function declaration from module InitRuntimeSupportFuncDecl(); @@ -185,7 +185,7 @@ llvm::Type* IRBuilder::getJTypeInArraySpace(JType jty) { llvm::StructType* IRBuilder::getShadowFrameTy(uint32_t sirt_size) { - std::string name(StringPrintf("ArtFrame%u", sirt_size)); + std::string name(StringPrintf("ShadowFrame%u", sirt_size)); // Try to find the existing struct type definition if (llvm::Type* type = module_->getTypeByName(name)) { |