diff options
author | 2013-01-30 14:08:26 -0800 | |
---|---|---|
committer | 2013-03-06 14:08:46 -0800 | |
commit | 265091e581c9f643b37e7966890911f09e223269 (patch) | |
tree | ae493ce6c3537aebc3a85f59a73500fa819a7baf /src/compiler/llvm/gbc_expander.cc | |
parent | 4c1c283a7410784e9cab309f868248690b788a9c (diff) |
Remove ExtractCodeAndPrelink and switch Portable to MCLinker
Change-Id: Ia2459c7da6b79e0a1c0f1148c6e28ad9cbbe27a2
Diffstat (limited to 'src/compiler/llvm/gbc_expander.cc')
-rw-r--r-- | src/compiler/llvm/gbc_expander.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/llvm/gbc_expander.cc b/src/compiler/llvm/gbc_expander.cc index 4e1a91d35f..9de2e41325 100644 --- a/src/compiler/llvm/gbc_expander.cc +++ b/src/compiler/llvm/gbc_expander.cc @@ -326,7 +326,7 @@ class GBCExpanderPass : public llvm::FunctionPass { static char ID; GBCExpanderPass(const IntrinsicHelper& intrinsic_helper, IRBuilder& irb, - art::CompilerDriver* compiler, art::DexCompilationUnit* dex_compilation_unit) + art::CompilerDriver* compiler, const art::DexCompilationUnit* dex_compilation_unit) : llvm::FunctionPass(ID), intrinsic_helper_(intrinsic_helper), irb_(irb), context_(irb.getContext()), rtb_(irb.Runtime()), shadow_frame_(NULL), old_shadow_frame_(NULL), @@ -350,7 +350,7 @@ bool GBCExpanderPass::runOnFunction(llvm::Function& func) { VLOG(compiler) << "GBC expansion on " << func.getName().str(); // Runtime support or stub - if (func.getName().startswith("art_") || func.getName().startswith("Art")) { + if (dex_compilation_unit_ == NULL) { return false; } @@ -3634,7 +3634,7 @@ namespace llvm { ::llvm::FunctionPass* CreateGBCExpanderPass(const IntrinsicHelper& intrinsic_helper, IRBuilder& irb, - CompilerDriver* driver, DexCompilationUnit* dex_compilation_unit) { + CompilerDriver* driver, const DexCompilationUnit* dex_compilation_unit) { return new GBCExpanderPass(intrinsic_helper, irb, driver, dex_compilation_unit); } |