Remove the CompilerLLVM mutex lock workaround.
Change-Id: Iefc4e020d6b0a9a67d4c7ad5780f28e0082393c2
diff --git a/src/compiler.cc b/src/compiler.cc
index ce7eb3c..155e8be 100644
--- a/src/compiler.cc
+++ b/src/compiler.cc
@@ -1248,18 +1248,6 @@
const ClassLoader* class_loader = context->GetClassLoader();
const DexFile& dex_file = *context->GetDexFile();
const DexFile::ClassDef& class_def = dex_file.GetClassDef(class_def_index);
-#if defined(ART_USE_LLVM_COMPILER)
- // TODO: Remove this. We should not lock the compiler_lock_ in CompileClass()
- // However, without this mutex lock, we will get segmentation fault before
- // LLVM becomes multithreaded.
- Compiler* cmplr = context->GetCompiler();
- CompilerMutexLockFn f =
- FindFunction<CompilerMutexLockFn>(MakeCompilerSoName(cmplr->GetInstructionSet()),
- cmplr->compiler_library_,
- "compilerLLVMMutexLock");
- UniquePtr<MutexLock> GUARD((*f)(*cmplr));
-#endif
-
if (SkipClass(class_loader, dex_file, class_def)) {
return;
}
diff --git a/src/compiler_llvm/compiler_llvm.cc b/src/compiler_llvm/compiler_llvm.cc
index baa6b2f..c890003 100644
--- a/src/compiler_llvm/compiler_llvm.cc
+++ b/src/compiler_llvm/compiler_llvm.cc
@@ -377,11 +377,6 @@
return ContextOf(compiler)->GetElfImages();
}
-// Note: Using this function carefully!!! This is temporary solution, we will remove it.
-extern "C" art::MutexLock* compilerLLVMMutexLock(art::Compiler& compiler) {
- return new art::MutexLock(ContextOf(compiler)->compiler_lock_);
-}
-
extern "C" void compilerLLVMDispose(art::Compiler& compiler) {
delete ContextOf(compiler);
}