diff options
Diffstat (limited to 'src/compiler/dex/frontend.cc')
| -rw-r--r-- | src/compiler/dex/frontend.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/compiler/dex/frontend.cc b/src/compiler/dex/frontend.cc index 510e08ac79..482804c5ee 100644 --- a/src/compiler/dex/frontend.cc +++ b/src/compiler/dex/frontend.cc @@ -32,13 +32,13 @@ namespace { pthread_once_t llvm_multi_init = PTHREAD_ONCE_INIT; #endif void InitializeLLVMForQuick() { - llvm::llvm_start_multithreaded(); + ::llvm::llvm_start_multithreaded(); } } namespace art { -namespace compiler_llvm { -llvm::Module* makeLLVMModuleContents(llvm::Module* module); +namespace llvm { +::llvm::Module* makeLLVMModuleContents(::llvm::Module* module); } LLVMInfo::LLVMInfo() { @@ -46,12 +46,12 @@ LLVMInfo::LLVMInfo() { pthread_once(&llvm_multi_init, InitializeLLVMForQuick); #endif // Create context, module, intrinsic helper & ir builder - llvm_context_.reset(new llvm::LLVMContext()); - llvm_module_ = new llvm::Module("art", *llvm_context_); - llvm::StructType::create(*llvm_context_, "JavaObject"); - compiler_llvm::makeLLVMModuleContents(llvm_module_); - intrinsic_helper_.reset( new compiler_llvm::IntrinsicHelper(*llvm_context_, *llvm_module_)); - ir_builder_.reset(new compiler_llvm::IRBuilder(*llvm_context_, *llvm_module_, *intrinsic_helper_)); + llvm_context_.reset(new ::llvm::LLVMContext()); + llvm_module_ = new ::llvm::Module("art", *llvm_context_); + ::llvm::StructType::create(*llvm_context_, "JavaObject"); + art::llvm::makeLLVMModuleContents(llvm_module_); + intrinsic_helper_.reset( new art::llvm::IntrinsicHelper(*llvm_context_, *llvm_module_)); + ir_builder_.reset(new art::llvm::IRBuilder(*llvm_context_, *llvm_module_, *intrinsic_helper_)); } LLVMInfo::~LLVMInfo() { |