diff options
| author | 2012-03-01 11:45:56 -0800 | |
|---|---|---|
| committer | 2012-03-01 11:45:56 -0800 | |
| commit | c73a7562fd82b027a6a49dc8f2ad53ab2982208e (patch) | |
| tree | a4866f1c2582afb92e2717df989ec20d34c71f84 /src/compiler_llvm/compiler_llvm.cc | |
| parent | a1e3a58f682ecf1fee00508c7140ae0a5d6329f8 (diff) | |
| parent | 5b8b1edc803a85bb3172560826d6a23fb23c3452 (diff) | |
Merge "Implement Link-loading and pass 62 tests in JniInternalTest." into dalvik-dev
Diffstat (limited to 'src/compiler_llvm/compiler_llvm.cc')
| -rw-r--r-- | src/compiler_llvm/compiler_llvm.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/compiler_llvm/compiler_llvm.cc b/src/compiler_llvm/compiler_llvm.cc index 56f0b07418..098589459f 100644 --- a/src/compiler_llvm/compiler_llvm.cc +++ b/src/compiler_llvm/compiler_llvm.cc @@ -55,8 +55,8 @@ llvm::Module* makeLLVMModuleContents(llvm::Module* module); CompilerLLVM::CompilerLLVM(Compiler* compiler, InstructionSet insn_set) -: compiler_(compiler), compiler_lock_("llvm_compiler_lock"), - insn_set_(insn_set), cunit_counter_(0) { + : compiler_(compiler), compiler_lock_("llvm_compiler_lock"), + insn_set_(insn_set), cunit_counter_(0) { // Initialize LLVM libraries pthread_once(&llvm_initialized, InitializeLLVM); @@ -69,6 +69,7 @@ CompilerLLVM::~CompilerLLVM() { void CompilerLLVM::EnsureCompilationUnit() { + MutexLock GUARD(compiler_lock_); DCHECK_NE(llvm_initialized, PTHREAD_ONCE_INIT); if (cunit_.get() == NULL) { cunit_.reset(new CompilationUnit(insn_set_)); |