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/code_generator_arm_vixl.h

diff --git a/compiler/optimizing/code_generator_arm_vixl.h b/compiler/optimizing/code_generator_arm_vixl.h
index aa40755..f385b34 100644
--- a/compiler/optimizing/code_generator_arm_vixl.h
+++ b/compiler/optimizing/code_generator_arm_vixl.h
@@ -856,7 +856,7 @@
                                                   bool narrow) {
     CheckValidReg(base_reg);
     CheckValidReg(holder_reg);
-    DCHECK(!narrow || base_reg < 8u) << base_reg;
+    DCHECK_IMPLIES(narrow, base_reg < 8u) << base_reg;
     BakerReadBarrierWidth width =
         narrow ? BakerReadBarrierWidth::kNarrow : BakerReadBarrierWidth::kWide;
     return BakerReadBarrierKindField::Encode(BakerReadBarrierKind::kField) |
@@ -875,7 +875,7 @@
 
   static uint32_t EncodeBakerReadBarrierGcRootData(uint32_t root_reg, bool narrow) {
     CheckValidReg(root_reg);
-    DCHECK(!narrow || root_reg < 8u) << root_reg;
+    DCHECK_IMPLIES(narrow, root_reg < 8u) << root_reg;
     BakerReadBarrierWidth width =
         narrow ? BakerReadBarrierWidth::kNarrow : BakerReadBarrierWidth::kWide;
     return BakerReadBarrierKindField::Encode(BakerReadBarrierKind::kGcRoot) |