diff options
| author | 2023-04-25 16:40:06 +0000 | |
|---|---|---|
| committer | 2023-04-27 10:53:55 +0000 | |
| commit | cde6497d286337de2ed21c71c85157e2745b742b (patch) | |
| tree | 087d790efb6987f5aab1da7cd91b89bedcdc5725 /compiler/optimizing/optimizing_unit_test.h | |
| parent | 79dc217688a774fc532584f6551a0aec8b45bc4a (diff) | |
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
Diffstat (limited to 'compiler/optimizing/optimizing_unit_test.h')
| -rw-r--r-- | compiler/optimizing/optimizing_unit_test.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/compiler/optimizing/optimizing_unit_test.h b/compiler/optimizing/optimizing_unit_test.h index ceffce9333..2e05c41f01 100644 --- a/compiler/optimizing/optimizing_unit_test.h +++ b/compiler/optimizing/optimizing_unit_test.h @@ -407,9 +407,8 @@ class OptimizingUnitTestHelper { HNewInstance* MakeNewInstance(HInstruction* cls, uint32_t dex_pc = 0u) { EXPECT_TRUE(cls->IsLoadClass() || cls->IsClinitCheck()) << *cls; - // TODO: Remove "OrNull". HLoadClass* load = - cls->IsLoadClass() ? cls->AsLoadClassOrNull() : cls->AsClinitCheckOrNull()->GetLoadClass(); + cls->IsLoadClass() ? cls->AsLoadClass() : cls->AsClinitCheck()->GetLoadClass(); return new (GetAllocator()) HNewInstance(cls, dex_pc, load->GetTypeIndex(), @@ -593,8 +592,7 @@ class PatternMatchGraphVisitor final : public HGraphVisitor { explicit KindWrapper(F f) : f_(f) {} \ void operator()(HInstruction* h) override { \ if constexpr (std::is_invocable_v<F, H##nm*>) { \ - /* TODO: Remove "OrNull". */ \ - f_(h->As##nm##OrNull()); \ + f_(h->As##nm()); \ } else { \ LOG(FATAL) << "Incorrect call with " << #nm; \ } \ |