diff options
Diffstat (limited to 'compiler/driver/compiler_driver.h')
| -rw-r--r-- | compiler/driver/compiler_driver.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/compiler/driver/compiler_driver.h b/compiler/driver/compiler_driver.h index 98e3d890cd..64a06a2f83 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 AddRequiresNoConstructorBarrier(Thread* self, const DexFile* dex_file, + void AddRequiresConstructorBarrier(Thread* self, const DexFile* dex_file, uint16_t class_def_index) - REQUIRES(!no_barrier_constructor_classes_lock_); + REQUIRES(!freezing_constructor_lock_); bool RequiresConstructorBarrier(Thread* self, const DexFile* dex_file, uint16_t class_def_index) const - REQUIRES(!no_barrier_constructor_classes_lock_); + REQUIRES(!freezing_constructor_lock_); // Callbacks from compiler to see what runtime checks must be generated. @@ -629,10 +629,9 @@ class CompilerDriver { const InstructionSet instruction_set_; const InstructionSetFeatures* const instruction_set_features_; - // 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_); + // 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_); typedef SafeMap<const ClassReference, CompiledClass*> ClassTable; // All class references that this compiler has compiled. |