From b7248b9f1a6d62a30f0cefc12de63c216b5d46e2 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Thu, 7 Apr 2016 13:19:19 -0700 Subject: Store precice set of which constructors require barriers Fixes bugs where things in the boot image might not have been calculated even though resolved_clases was true. This only occured for app and test compiles though. Fixes test 476-checker-ctor-memory-barrier which was failing due to inlining something in the boot class path and getting a unexpected barrier since the barrier defaults to enabled. No measurable increase in RAM usage. (cherry picked from commit c4ae916def97b9e1ef6df35c8fabb3921a0e380c) Bug: 28005874 Change-Id: I4a417819aa129c95f4a83c38df1a66eb77824ea9 --- compiler/driver/compiler_driver.cc | 40 ++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 17 deletions(-) (limited to 'compiler/driver/compiler_driver.cc') diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index 5fe81c789c..52940687de 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -357,8 +357,7 @@ CompilerDriver::CompilerDriver( compiler_kind_(compiler_kind), instruction_set_(instruction_set), instruction_set_features_(instruction_set_features), - no_barrier_constructor_classes_lock_("freezing constructor lock"), - resolved_classes_(false), + requires_constructor_barrier_lock_("constructor barrier lock"), compiled_classes_lock_("compiled classes lock"), compiled_methods_lock_("compiled method lock"), compiled_methods_(MethodTable::key_compare()), @@ -713,8 +712,6 @@ void CompilerDriver::Resolve(jobject class_loader, resolve_thread_count, timings); } - - resolved_classes_ = true; } // Resolve const-strings in the code. Done to have deterministic allocation behavior. Right now @@ -2135,9 +2132,10 @@ class ResolveClassFieldsAndMethodsVisitor : public CompilationVisitor { DCHECK(!it.HasNext()); } } - if (!requires_constructor_barrier) { - manager_->GetCompiler()->AddRequiresNoConstructorBarrier(self, &dex_file, class_def_index); - } + manager_->GetCompiler()->SetRequiresConstructorBarrier(self, + &dex_file, + class_def_index, + requires_constructor_barrier); } private: @@ -2794,21 +2792,29 @@ size_t CompilerDriver::GetNonRelativeLinkerPatchCount() const { return non_relative_linker_patch_count_; } -void CompilerDriver::AddRequiresNoConstructorBarrier(Thread* self, - const DexFile* dex_file, - uint16_t class_def_index) { - WriterMutexLock mu(self, no_barrier_constructor_classes_lock_); - no_barrier_constructor_classes_.insert(ClassReference(dex_file, class_def_index)); +void CompilerDriver::SetRequiresConstructorBarrier(Thread* self, + const DexFile* dex_file, + uint16_t class_def_index, + bool requires) { + WriterMutexLock mu(self, requires_constructor_barrier_lock_); + requires_constructor_barrier_.emplace(ClassReference(dex_file, class_def_index), requires); } bool CompilerDriver::RequiresConstructorBarrier(Thread* self, const DexFile* dex_file, - uint16_t class_def_index) const { - if (resolved_classes_) { - ReaderMutexLock mu(self, no_barrier_constructor_classes_lock_); - return no_barrier_constructor_classes_.count(ClassReference(dex_file, class_def_index)) == 0; + uint16_t class_def_index) { + ClassReference class_ref(dex_file, class_def_index); + { + ReaderMutexLock mu(self, requires_constructor_barrier_lock_); + auto it = requires_constructor_barrier_.find(class_ref); + if (it != requires_constructor_barrier_.end()) { + return it->second; + } } - return RequiresConstructorBarrier(*dex_file, class_def_index); + WriterMutexLock mu(self, requires_constructor_barrier_lock_); + const bool requires = RequiresConstructorBarrier(*dex_file, class_def_index); + requires_constructor_barrier_.emplace(class_ref, requires); + return requires; } std::string CompilerDriver::GetMemoryUsageString(bool extended) const { -- cgit v1.2.3-59-g8ed1b