From e05bc3e1d03e8cba0c16a1b738591a2e972235b6 Mon Sep 17 00:00:00 2001 From: Santiago Aboy Solanes Date: Mon, 20 Feb 2023 14:26:23 +0000 Subject: Set more RTI only if they are valid Follow-up to aosp/2442280. We haven't seen crashes with these ones, but we can't guarantee that the RTI will be valid in these code paths. Test: art/test/testrunner/testrunner.py --host --64 --optimizing -b Change-Id: I80da85a6549ba0275a80027016363e0cf9fb8045 --- compiler/optimizing/select_generator.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'compiler/optimizing/select_generator.cc') diff --git a/compiler/optimizing/select_generator.cc b/compiler/optimizing/select_generator.cc index 761e7b562e..6a10440d11 100644 --- a/compiler/optimizing/select_generator.cc +++ b/compiler/optimizing/select_generator.cc @@ -160,7 +160,7 @@ bool HSelectGenerator::TryGenerateSelectSimpleDiamondPattern( ReferenceTypePropagation::FixUpInstructionType(select, graph_->GetHandleCache()); } } else if (phi->GetType() == DataType::Type::kReference) { - select->SetReferenceTypeInfo(phi->GetReferenceTypeInfo()); + select->SetReferenceTypeInfoIfValid(phi->GetReferenceTypeInfo()); } block->InsertInstructionBefore(select, if_instruction); -- cgit v1.2.3-59-g8ed1b