Revert "Revert "Check if we require barrier if we did not resolve classes""
This reverts commit a7ab4997f7263439561093ffbc7dea29181a47c5.
diff --git a/compiler/driver/compiler_driver.h b/compiler/driver/compiler_driver.h
index 98e3d89..0ed0bb6 100644
--- a/compiler/driver/compiler_driver.h
+++ b/compiler/driver/compiler_driver.h
@@ -619,6 +619,8 @@
void FreeThreadPools();
void CheckThreadPools();
+ bool RequiresConstructorBarrier(const DexFile& dex_file, uint16_t class_def_idx) const;
+
const CompilerOptions* const compiler_options_;
VerificationResults* const verification_results_;
DexFileToMethodInlinerMap* const method_inliner_map_;
@@ -629,10 +631,14 @@
const InstructionSet instruction_set_;
const InstructionSetFeatures* const instruction_set_features_;
- // All class references that do not require constructor barriers
+ // All class references that do not require constructor barriers. Only filled in if
+ // resolved_classes_ is true.
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_);
+ // resolved_classes_ is true if we performed the resolve phase and filled in
+ // no_barrier_constructor_classes_.
+ bool resolved_classes_;
typedef SafeMap<const ClassReference, CompiledClass*> ClassTable;
// All class references that this compiler has compiled.