From 94dab79b1cb768088c254349cdf8a14419e69ed6 Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Mon, 26 Aug 2024 12:07:52 +0000 Subject: ART: Clean up environment construction in gtests. Create required instruction environments in helper functions that create instructions. Test: m test-art-host-gtest Change-Id: Iacdd3c3717d95bc3e7fc3c1b676bc8eb70f2e6bc --- compiler/optimizing/instruction_simplifier_test.cc | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'compiler/optimizing/instruction_simplifier_test.cc') diff --git a/compiler/optimizing/instruction_simplifier_test.cc b/compiler/optimizing/instruction_simplifier_test.cc index e140c4d058..a2e3882c19 100644 --- a/compiler/optimizing/instruction_simplifier_test.cc +++ b/compiler/optimizing/instruction_simplifier_test.cc @@ -173,11 +173,6 @@ TEST_P(InstanceOfInstructionSimplifierTestGroup, ExactClassInstanceOfOther) { } if_block->AddInstruction(instance_of); HIf* if_inst = MakeIf(if_block, instance_of); - ManuallyBuildEnvFor(new_inst_klass, {}); - if (new_inst_klass != target_klass) { - target_klass->CopyEnvironmentFrom(new_inst_klass->GetEnvironment()); - } - new_inst->CopyEnvironmentFrom(new_inst_klass->GetEnvironment()); HInstruction* read_bottom = MakeIFieldGet(breturn, new_inst, DataType::Type::kInt32, MemberOffset(32)); @@ -222,11 +217,6 @@ TEST_P(InstanceOfInstructionSimplifierTestGroup, ExactClassCheckCastOther) { } main->AddInstruction(check_cast); MakeReturn(main, new_inst); - ManuallyBuildEnvFor(new_inst_klass, {}); - if (new_inst_klass != target_klass) { - target_klass->CopyEnvironmentFrom(new_inst_klass->GetEnvironment()); - } - new_inst->CopyEnvironmentFrom(new_inst_klass->GetEnvironment()); PerformSimplification(); -- cgit v1.2.3-59-g8ed1b