diff options
Diffstat (limited to 'compiler/optimizing/optimizing_unit_test.h')
| -rw-r--r-- | compiler/optimizing/optimizing_unit_test.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/compiler/optimizing/optimizing_unit_test.h b/compiler/optimizing/optimizing_unit_test.h index 2e05c41f01..ceffce9333 100644 --- a/compiler/optimizing/optimizing_unit_test.h +++ b/compiler/optimizing/optimizing_unit_test.h @@ -407,8 +407,9 @@ 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->AsLoadClass() : cls->AsClinitCheck()->GetLoadClass(); + cls->IsLoadClass() ? cls->AsLoadClassOrNull() : cls->AsClinitCheckOrNull()->GetLoadClass(); return new (GetAllocator()) HNewInstance(cls, dex_pc, load->GetTypeIndex(), @@ -592,7 +593,8 @@ 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*>) { \ - f_(h->As##nm()); \ + /* TODO: Remove "OrNull". */ \ + f_(h->As##nm##OrNull()); \ } else { \ LOG(FATAL) << "Incorrect call with " << #nm; \ } \ |