Force inlining on trivial accessors.

Make volatility for GetFieldObject a template parameter.
Move some trivial mirror::String routines to a -inl.h.

Bug: 14285442

Change-Id: Ie23b11d4f18cb15a62c3bbb42837a8aaf6b68f92

1 files changed, 1 insertions, 10 deletions

diff --git a/runtime/dex_file.h b/runtime/dex_file.h
index 70baeed..c782ab1 100644
--- a/runtime/dex_file.h
+++ b/runtime/dex_file.h
@@ -21,7 +21,7 @@
 #include <vector>
 
 #include "base/logging.h"
-#include "base/mutex.h"
+#include "base/mutex.h"  // For Locks::mutator_lock_.
 #include "globals.h"
 #include "invoke_type.h"
 #include "jni.h"
@@ -386,10 +386,6 @@ class DexFile {
     return *header_;
   }
 
-  Mutex& GetModificationLock() {
-    return modification_lock;
-  }
-
   // Decode the dex magic version
   uint32_t GetVersion() const;
 
@@ -877,11 +873,6 @@ class DexFile {
   // Manages the underlying memory allocation.
   UniquePtr<MemMap> mem_map_;
 
-  // The DEX-to-DEX compiler uses this lock to ensure thread safety when
-  // enabling write access to a read-only DEX file.
-  // TODO: move to Locks::dex_file_modification_lock.
-  Mutex modification_lock;
-
   // Points to the header section.
   const Header* const header_;