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
diff --git a/compiler/optimizing/code_generator_utils.cc b/compiler/optimizing/code_generator_utils.cc
index 2306f07..9980592 100644
--- a/compiler/optimizing/code_generator_utils.cc
+++ b/compiler/optimizing/code_generator_utils.cc
@@ -140,8 +140,7 @@
// We need to find a successor basic block of HIf for the case when instr is non-negative.
// If the successor dominates target_block, instructions in target_block see a non-negative value.
- // TODO: Remove "OrNull".
- HIf* if_instr = cond->GetBlock()->GetLastInstruction()->AsIfOrNull();
+ HIf* if_instr = cond->GetBlock()->GetLastInstruction()->AsIf();
HBasicBlock* successor = nullptr;
switch (cond->GetCondition()) {
case kCondGT:
@@ -228,9 +227,7 @@
// The condition must dominate target_user to guarantee that the value is always checked
// before it is used by target_user.
if (user->GetBlock()->Dominates(target_user->GetBlock()) &&
- // TODO: Remove "OrNull".
- IsComparedValueNonNegativeInBlock(
- value, user->AsConditionOrNull(), target_user->GetBlock())) {
+ IsComparedValueNonNegativeInBlock(value, user->AsCondition(), target_user->GetBlock())) {
return true;
}
}