commit 371bd83f21f8db3b8e4cc8a660ead6a0650e92f6
author Mathieu Chartier <mathieuc@google.com> Thu Apr 07 10:19:48 2016 -0700
committer Mathieu Chartier <mathieuc@google.com> Thu Apr 07 10:19:48 2016 -0700
tree d71023c2408ed6145153bbeac5f573dd5667e163
parent 7fa1f92cbf98c40baa00c6fb9331ec7ac72abfa8

Revert "Revert "Change RequiresConstructorBarrier default to yes""

This reverts commit 0436ee6bd33a0b905cd2a7e333f7935da1bd5d86.

compiler/driver/compiler_driver.h

diff --git a/compiler/driver/compiler_driver.h b/compiler/driver/compiler_driver.h
index 64a06a2..98e3d89 100644
--- a/compiler/driver/compiler_driver.h
+++ b/compiler/driver/compiler_driver.h
@@ -183,12 +183,12 @@
   // Remove and delete a compiled method.
   void RemoveCompiledMethod(const MethodReference& method_ref) REQUIRES(!compiled_methods_lock_);
 
-  void AddRequiresConstructorBarrier(Thread* self, const DexFile* dex_file,
+  void AddRequiresNoConstructorBarrier(Thread* self, const DexFile* dex_file,
                                      uint16_t class_def_index)
-      REQUIRES(!freezing_constructor_lock_);
+      REQUIRES(!no_barrier_constructor_classes_lock_);
   bool RequiresConstructorBarrier(Thread* self, const DexFile* dex_file,
                                   uint16_t class_def_index) const
-      REQUIRES(!freezing_constructor_lock_);
+      REQUIRES(!no_barrier_constructor_classes_lock_);
 
   // Callbacks from compiler to see what runtime checks must be generated.
 
@@ -629,9 +629,10 @@
   const InstructionSet instruction_set_;
   const InstructionSetFeatures* const instruction_set_features_;
 
-  // All class references that require
-  mutable ReaderWriterMutex freezing_constructor_lock_ DEFAULT_MUTEX_ACQUIRED_AFTER;
-  std::set<ClassReference> freezing_constructor_classes_ GUARDED_BY(freezing_constructor_lock_);
+  // All class references that do not require constructor barriers
+  mutable ReaderWriterMutex no_barrier_constructor_classes_lock_ DEFAULT_MUTEX_ACQUIRED_AFTER;
+  std::set<ClassReference> no_barrier_constructor_classes_
+      GUARDED_BY(no_barrier_constructor_classes_lock_);
 
   typedef SafeMap<const ClassReference, CompiledClass*> ClassTable;
   // All class references that this compiler has compiled.