From 371bd83f21f8db3b8e4cc8a660ead6a0650e92f6 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Thu, 7 Apr 2016 10:19:48 -0700 Subject: Revert "Revert "Change RequiresConstructorBarrier default to yes"" This reverts commit 0436ee6bd33a0b905cd2a7e333f7935da1bd5d86. --- compiler/driver/compiler_driver.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'compiler/driver/compiler_driver.h') diff --git a/compiler/driver/compiler_driver.h b/compiler/driver/compiler_driver.h index 64a06a2f83..98e3d890cd 100644 --- a/compiler/driver/compiler_driver.h +++ b/compiler/driver/compiler_driver.h @@ -183,12 +183,12 @@ class CompilerDriver { // 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 @@ class CompilerDriver { 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 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 no_barrier_constructor_classes_ + GUARDED_BY(no_barrier_constructor_classes_lock_); typedef SafeMap ClassTable; // All class references that this compiler has compiled. -- cgit v1.2.3-59-g8ed1b