From 3a73ffb70151dbc99fa41f300a237f8c29783e0e Mon Sep 17 00:00:00 2001 From: Alex Light Date: Mon, 25 Jan 2021 14:11:05 +0000 Subject: Revert^4 "Partial Load Store Elimination" This reverts commit 791df7a161ecfa28eb69862a4bc285282463b960. This unreverts commit fc1ce4e8be0d977e3d41699f5ec746d68f63c024. This unreverts commit b8686ce4c93eba7192ed7ef89e7ffd9f3aa6cd07. We incorrectly failed to include PredicatedInstanceFieldGet in a few conditions, including a DCHECK. This caused tests to fail under the read-barrier-table-lookup configuration. Reason for revert: Fixed 2 incorrect checks Bug: 67037140 Test: ./art/test/testrunner/run_build_test_target.py -j70 art-gtest-read-barrier-table-lookup Change-Id: I32b01b29fb32077fb5074e7c77a0226bd1fcaab4 --- compiler/optimizing/scheduler_test.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'compiler/optimizing/scheduler_test.cc') diff --git a/compiler/optimizing/scheduler_test.cc b/compiler/optimizing/scheduler_test.cc index c166a46082..a1cc202a89 100644 --- a/compiler/optimizing/scheduler_test.cc +++ b/compiler/optimizing/scheduler_test.cc @@ -274,7 +274,7 @@ class SchedulerTest : public OptimizingUnitTest { } HeapLocationCollector heap_location_collector( - graph_, GetScopedAllocator(), /*for_partial_elimination=*/false); + graph_, GetScopedAllocator(), LoadStoreAnalysisType::kBasic); heap_location_collector.VisitBasicBlock(entry); heap_location_collector.BuildAliasingMatrix(); TestSchedulingGraph scheduling_graph(GetScopedAllocator(), &heap_location_collector); -- cgit v1.2.3-59-g8ed1b