commit cde6497d286337de2ed21c71c85157e2745b742b
author Vladimir Marko <vmarko@google.com> Tue Apr 25 16:40:06 2023 +0000
committer Vladimir Marko <vmarko@google.com> Thu Apr 27 10:53:55 2023 +0000
tree 087d790efb6987f5aab1da7cd91b89bedcdc5725
parent 79dc217688a774fc532584f6551a0aec8b45bc4a

Optimizing: Add `HInstruction::As##type()`.

After the old implementation was renamed in
    https://android-review.googlesource.com/2526708 ,
we introduce a new function with the old name but new
behavior, just `DCHECK()`-ing the instruction kind before
casting down the pointer. We change appropriate calls from
`As##type##OrNull()` to `As##type()` to avoid unncessary
run-time checks and reduce the size of libart-compiler.so.

Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Test: run-gtests.sh
Test: testrunner.py --target --optimizing
Bug: 181943478
Change-Id: I025681612a77ca2157fed4886ca47f2053975d4e

compiler/optimizing/write_barrier_elimination.cc

diff --git a/compiler/optimizing/write_barrier_elimination.cc b/compiler/optimizing/write_barrier_elimination.cc
index 390c6e9..eb70b67 100644
--- a/compiler/optimizing/write_barrier_elimination.cc
+++ b/compiler/optimizing/write_barrier_elimination.cc
@@ -52,13 +52,10 @@
     auto it = current_write_barriers_.find(obj);
     if (it != current_write_barriers_.end()) {
       DCHECK(it->second->IsInstanceFieldSet());
-      // TODO: Remove "OrNull".
-      DCHECK(it->second->AsInstanceFieldSetOrNull()->GetWriteBarrierKind() !=
+      DCHECK(it->second->AsInstanceFieldSet()->GetWriteBarrierKind() !=
              WriteBarrierKind::kDontEmit);
       DCHECK_EQ(it->second->GetBlock(), instruction->GetBlock());
-      // TODO: Remove "OrNull".
-      it->second->AsInstanceFieldSetOrNull()->SetWriteBarrierKind(
-          WriteBarrierKind::kEmitNoNullCheck);
+      it->second->AsInstanceFieldSet()->SetWriteBarrierKind(WriteBarrierKind::kEmitNoNullCheck);
       instruction->SetWriteBarrierKind(WriteBarrierKind::kDontEmit);
       MaybeRecordStat(stats_, MethodCompilationStat::kRemovedWriteBarrier);
     } else {
@@ -82,12 +79,9 @@
     auto it = current_write_barriers_.find(cls);
     if (it != current_write_barriers_.end()) {
       DCHECK(it->second->IsStaticFieldSet());
-      // TODO: Remove "OrNull".
-      DCHECK(it->second->AsStaticFieldSetOrNull()->GetWriteBarrierKind() !=
-             WriteBarrierKind::kDontEmit);
+      DCHECK(it->second->AsStaticFieldSet()->GetWriteBarrierKind() != WriteBarrierKind::kDontEmit);
       DCHECK_EQ(it->second->GetBlock(), instruction->GetBlock());
-      // TODO: Remove "OrNull".
-      it->second->AsStaticFieldSetOrNull()->SetWriteBarrierKind(WriteBarrierKind::kEmitNoNullCheck);
+      it->second->AsStaticFieldSet()->SetWriteBarrierKind(WriteBarrierKind::kEmitNoNullCheck);
       instruction->SetWriteBarrierKind(WriteBarrierKind::kDontEmit);
       MaybeRecordStat(stats_, MethodCompilationStat::kRemovedWriteBarrier);
     } else {
@@ -113,13 +107,10 @@
     auto it = current_write_barriers_.find(arr);
     if (it != current_write_barriers_.end()) {
       DCHECK(it->second->IsArraySet());
-      // TODO: Remove "OrNull".
-      DCHECK(it->second->AsArraySetOrNull()->GetWriteBarrierKind() != WriteBarrierKind::kDontEmit);
+      DCHECK(it->second->AsArraySet()->GetWriteBarrierKind() != WriteBarrierKind::kDontEmit);
       DCHECK_EQ(it->second->GetBlock(), instruction->GetBlock());
       // We never skip the null check in ArraySets so that value is already set.
-      // TODO: Remove "OrNull".
-      DCHECK(it->second->AsArraySetOrNull()->GetWriteBarrierKind() ==
-             WriteBarrierKind::kEmitNoNullCheck);
+      DCHECK(it->second->AsArraySet()->GetWriteBarrierKind() == WriteBarrierKind::kEmitNoNullCheck);
       instruction->SetWriteBarrierKind(WriteBarrierKind::kDontEmit);
       MaybeRecordStat(stats_, MethodCompilationStat::kRemovedWriteBarrier);
     } else {