commit 872ec72de447b2803894e17253399a54a4c10e1f
author Santiago Aboy Solanes <solanes@google.com> Fri Feb 18 14:10:25 2022 +0000
committer Santiago Aboy Solanes <solanes@google.com> Fri Feb 25 08:18:14 2022 +0000
tree 244ca496149b8e1d9d4c786609c91da7f93f8736
parent 0805e9083aa761094575cd3c4d1eff41bbcf5b74

Update compiler/ implications to use (D)CHECK_IMPLIES

Follow-up to aosp/1988868 in which we added the (D)CHECK_IMPLIES
macro. This CL uses it on compiler/ occurrences found by a regex.

Test: art/test/testrunner/testrunner.py --host --64 --optimizing -b
Change-Id: If63aed969bfb8b31d6fbbcb3bca2b04314c894b7

compiler/optimizing/intrinsics_arm64.cc

diff --git a/compiler/optimizing/intrinsics_arm64.cc b/compiler/optimizing/intrinsics_arm64.cc
index 69e4fcf..1130f3a 100644
--- a/compiler/optimizing/intrinsics_arm64.cc
+++ b/compiler/optimizing/intrinsics_arm64.cc
@@ -1228,14 +1228,14 @@
                                   Register expected2 = Register()) {
   // The `expected2` is valid only for reference slow path and represents the unmarked old value
   // from the main path attempt to emit CAS when the marked old value matched `expected`.
-  DCHECK(type == DataType::Type::kReference || !expected2.IsValid());
+  DCHECK_IMPLIES(expected2.IsValid(), type == DataType::Type::kReference);
 
   DCHECK(ptr.IsX());
   DCHECK_EQ(new_value.IsX(), type == DataType::Type::kInt64);
   DCHECK_EQ(old_value.IsX(), type == DataType::Type::kInt64);
   DCHECK(store_result.IsW());
   DCHECK_EQ(expected.IsX(), type == DataType::Type::kInt64);
-  DCHECK(!expected2.IsValid() || expected2.IsW());
+  DCHECK_IMPLIES(expected2.IsValid(), expected2.IsW());
 
   Arm64Assembler* assembler = codegen->GetAssembler();
   MacroAssembler* masm = assembler->GetVIXLAssembler();
@@ -1361,7 +1361,7 @@
     // representing the to-space and from-space references for the same object.
 
     UseScratchRegisterScope temps(masm);
-    DCHECK(!store_result_.IsValid() || !temps.IsAvailable(store_result_));
+    DCHECK_IMPLIES(store_result_.IsValid(), !temps.IsAvailable(store_result_));
     Register tmp_ptr = temps.AcquireX();
     Register store_result = store_result_.IsValid() ? store_result_ : temps.AcquireW();
 
@@ -1578,7 +1578,7 @@
 }
 void IntrinsicCodeGeneratorARM64::VisitJdkUnsafeCompareAndSetObject(HInvoke* invoke) {
   // The only supported read barrier implementation is the Baker-style read barriers.
-  DCHECK(!kEmitCompilerReadBarrier || kUseBakerReadBarrier);
+  DCHECK_IMPLIES(kEmitCompilerReadBarrier, kUseBakerReadBarrier);
 
   GenUnsafeCas(invoke, DataType::Type::kReference, codegen_);
 }
@@ -2884,7 +2884,7 @@
 void IntrinsicCodeGeneratorARM64::VisitSystemArrayCopy(HInvoke* invoke) {
   // The only read barrier implementation supporting the
   // SystemArrayCopy intrinsic is the Baker-style read barriers.
-  DCHECK(!kEmitCompilerReadBarrier || kUseBakerReadBarrier);
+  DCHECK_IMPLIES(kEmitCompilerReadBarrier, kUseBakerReadBarrier);
 
   MacroAssembler* masm = GetVIXLAssembler();
   LocationSummary* locations = invoke->GetLocations();