commit ec696e5d98ae4c503966f199bac341b50bfa1a5b
author Ulya Trafimovich <skvadrik@google.com> Wed Jan 26 10:21:32 2022 +0000
committer Ulya Trofimovich <skvadrik@google.com> Thu Jan 27 12:51:11 2022 +0000
tree 8b23d8373f28b1f19f57f99d9a1484f7c7942c31
parent 9c69afddaf25924ef7148a8fee0c319e7c4c95b0

Clean up debug checks in intrinsic code.

Deduplicate checks that were repeated for all ISAs, use a few helper
functions to make the code simpler.

Bug: 71781600
Test: art/test.py -r --host
Test: art/test.py -r --target
Change-Id: I3fefecce98a9a8b3b9bf53c31c2eefdafe8bd6a3

compiler/optimizing/intrinsics_x86.cc

diff --git a/compiler/optimizing/intrinsics_x86.cc b/compiler/optimizing/intrinsics_x86.cc
index 3a38864..98b3e49 100644
--- a/compiler/optimizing/intrinsics_x86.cc
+++ b/compiler/optimizing/intrinsics_x86.cc
@@ -2067,11 +2067,9 @@
 static void CreateIntIntIntIntIntToInt(ArenaAllocator* allocator,
                                        DataType::Type type,
                                        HInvoke* invoke) {
-  bool can_call = kEmitCompilerReadBarrier &&
-      kUseBakerReadBarrier &&
-      (invoke->GetIntrinsic() == Intrinsics::kUnsafeCASObject ||
-       invoke->GetIntrinsic() == Intrinsics::kJdkUnsafeCASObject ||
-       invoke->GetIntrinsic() == Intrinsics::kJdkUnsafeCompareAndSetObject);
+  const bool can_call = kEmitCompilerReadBarrier &&
+                        kUseBakerReadBarrier &&
+                        IsUnsafeCASObject(invoke);
   LocationSummary* locations =
       new (allocator) LocationSummary(invoke,
                                       can_call