commit 480c5734d2bf5bceace1d5db96c41ea6ba328273
author Shih-wei Liao <sliao@google.com> Thu Mar 01 21:21:25 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 01 21:21:26 2012 -0800
tree 22745353684e846bb93b21bde4799e89421a9b44
parent ffb465f23d9549dd591e6aa62e9250523cb00233
parent ce1190657a66a414e8e6a79cf9bcf6ddeae0d934

Merge "Remove MutexLock from the argument.  Use AssertHeld instead." into dalvik-dev

src/compiler_llvm/compiler_llvm.cc

diff --git a/src/compiler_llvm/compiler_llvm.cc b/src/compiler_llvm/compiler_llvm.cc
index 345872e..1edbd46 100644
--- a/src/compiler_llvm/compiler_llvm.cc
+++ b/src/compiler_llvm/compiler_llvm.cc
@@ -84,8 +84,9 @@
 }
 
 
-void CompilerLLVM::EnsureCompilationUnit(MutexLock& GUARD) {
+void CompilerLLVM::EnsureCompilationUnit() {
   DCHECK_NE(llvm_initialized, PTHREAD_ONCE_INIT);
+  compiler_lock_.AssertHeld();
 
   if (curr_cunit_ != NULL) {
     return;
@@ -113,7 +114,7 @@
 void CompilerLLVM::MaterializeRemainder() {
   MutexLock GUARD(compiler_lock_);
   if (curr_cunit_ != NULL) {
-    Materialize(GUARD);
+    Materialize();
   }
 }
 
@@ -121,12 +122,14 @@
 void CompilerLLVM::MaterializeIfThresholdReached() {
   MutexLock GUARD(compiler_lock_);
   if (curr_cunit_ != NULL && curr_cunit_->IsMaterializeThresholdReached()) {
-    Materialize(GUARD);
+    Materialize();
   }
 }
 
 
-void CompilerLLVM::Materialize(MutexLock& GUARD) {
+void CompilerLLVM::Materialize() {
+  compiler_lock_.AssertHeld();
+
   DCHECK(curr_cunit_ != NULL);
   DCHECK(!curr_cunit_->IsMaterialized());
 
@@ -147,7 +150,7 @@
 CompileDexMethod(OatCompilationUnit* oat_compilation_unit) {
   MutexLock GUARD(compiler_lock_);
 
-  EnsureCompilationUnit(GUARD);
+  EnsureCompilationUnit();
 
   UniquePtr<MethodCompiler> method_compiler(
       new MethodCompiler(curr_cunit_, compiler_, oat_compilation_unit));
@@ -160,7 +163,7 @@
 CompileNativeMethod(OatCompilationUnit* oat_compilation_unit) {
   MutexLock GUARD(compiler_lock_);
 
-  EnsureCompilationUnit(GUARD);
+  EnsureCompilationUnit();
 
   UniquePtr<JniCompiler> jni_compiler(
       new JniCompiler(curr_cunit_, *compiler_, oat_compilation_unit));
@@ -173,7 +176,7 @@
                                                    char const *shorty) {
   MutexLock GUARD(compiler_lock_);
 
-  EnsureCompilationUnit(GUARD);
+  EnsureCompilationUnit();
 
   UniquePtr<UpcallCompiler> upcall_compiler(
     new UpcallCompiler(curr_cunit_, *compiler_));

src/compiler_llvm/compiler_llvm.h

diff --git a/src/compiler_llvm/compiler_llvm.h b/src/compiler_llvm/compiler_llvm.h
index 07ffa61..7481c8c 100644
--- a/src/compiler_llvm/compiler_llvm.h
+++ b/src/compiler_llvm/compiler_llvm.h
@@ -83,9 +83,9 @@
   CompiledInvokeStub* CreateInvokeStub(bool is_static, char const *shorty);
 
  private:
-  void EnsureCompilationUnit(MutexLock& GUARD);
+  void EnsureCompilationUnit();
 
-  void Materialize(MutexLock& GUARD);
+  void Materialize();
 
   bool IsBitcodeFileNameAvailable() const {
     return !bitcode_filename_.empty();