From b22e708890b61e6a82bb8a18e98413c2bd4933c9 Mon Sep 17 00:00:00 2001 From: Santiago Aboy Solanes Date: Tue, 14 Feb 2023 14:03:38 +0000 Subject: Remove RTI validation from our checks It is possible to have untyped RTI in valid graphs due to e.g. dead code, redundant phis not replaced yet. By removing this validation, we shift the burden of the validation to the user of the RTI. Bug: 252799892 Fixes: 252799892 Test: art/test/testrunner/testrunner.py --host --64 --optimizing -b Test: dex2oat compiling the apps in the bug Change-Id: I112497bf10c180b651fd5b6e268799bc3abb27b3 --- compiler/optimizing/optimizing_unit_test.h | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'compiler/optimizing/optimizing_unit_test.h') diff --git a/compiler/optimizing/optimizing_unit_test.h b/compiler/optimizing/optimizing_unit_test.h index e62ccf0f3a..2ebaf58d65 100644 --- a/compiler/optimizing/optimizing_unit_test.h +++ b/compiler/optimizing/optimizing_unit_test.h @@ -321,25 +321,10 @@ class OptimizingUnitTestHelper { // Run GraphChecker with all checks. // // Return: the status whether the run is successful. - bool CheckGraph(HGraph* graph, std::ostream& oss = std::cerr) { - return CheckGraph(graph, /*check_ref_type_info=*/true, oss); - } - bool CheckGraph(std::ostream& oss = std::cerr) { return CheckGraph(graph_, oss); } - // Run GraphChecker with all checks except reference type information checks. - // - // Return: the status whether the run is successful. - bool CheckGraphSkipRefTypeInfoChecks(HGraph* graph, std::ostream& oss = std::cerr) { - return CheckGraph(graph, /*check_ref_type_info=*/false, oss); - } - - bool CheckGraphSkipRefTypeInfoChecks(std::ostream& oss = std::cerr) { - return CheckGraphSkipRefTypeInfoChecks(graph_, oss); - } - HEnvironment* ManuallyBuildEnvFor(HInstruction* instruction, ArenaVector* current_locals) { HEnvironment* environment = new (GetAllocator()) HEnvironment( @@ -532,9 +517,8 @@ class OptimizingUnitTestHelper { } protected: - bool CheckGraph(HGraph* graph, bool check_ref_type_info, std::ostream& oss) { + bool CheckGraph(HGraph* graph, std::ostream& oss) { GraphChecker checker(graph); - checker.SetRefTypeInfoCheckEnabled(check_ref_type_info); checker.Run(); checker.Dump(oss); return checker.IsValid(); -- cgit v1.2.3-59-g8ed1b