From a7ab4997f7263439561093ffbc7dea29181a47c5 Mon Sep 17 00:00:00 2001 From: Roland Levillain Date: Thu, 7 Apr 2016 14:56:58 +0000 Subject: Revert "Check if we require barrier if we did not resolve classes" CL https://android-review.googlesource.com/#/c/213119/ is breaking run-test 476-checker-ctor-memory-barrier on ARM and ARM64, and reverting it requires reverting this CL (https://android-review.googlesource.com/#/c/213109/) first. Bug: 28005874 This reverts commit 20fd7cdd25364b16d878df037c6ae0fbd5f2a9ac. Change-Id: Iaf174b2df3dd4dd469c79ca3f2c68ef87748d124 --- compiler/driver/compiler_driver.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'compiler/driver/compiler_driver.h') diff --git a/compiler/driver/compiler_driver.h b/compiler/driver/compiler_driver.h index 0ed0bb6af7..98e3d890cd 100644 --- a/compiler/driver/compiler_driver.h +++ b/compiler/driver/compiler_driver.h @@ -619,8 +619,6 @@ class CompilerDriver { 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_; @@ -631,14 +629,10 @@ class CompilerDriver { const InstructionSet instruction_set_; const InstructionSetFeatures* const instruction_set_features_; - // All class references that do not require constructor barriers. Only filled in if - // resolved_classes_ is true. + // 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_); - // resolved_classes_ is true if we performed the resolve phase and filled in - // no_barrier_constructor_classes_. - bool resolved_classes_; typedef SafeMap ClassTable; // All class references that this compiler has compiled. -- cgit v1.2.3-59-g8ed1b