From f0a6a1d0536958ebb5bcaef02a0f0cda929b457b Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Mon, 8 Jan 2018 14:23:56 +0000 Subject: ARM: Replace arm::SetCc with vixl32::FlagsUpdate. And delete obsolete test header file. Test: Rely on TreeHugger. Change-Id: I15858b8462198098f21956685a2ad77908b8a186 --- compiler/optimizing/scheduler_arm.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'compiler/optimizing/scheduler_arm.cc') diff --git a/compiler/optimizing/scheduler_arm.cc b/compiler/optimizing/scheduler_arm.cc index b3c8f105d1..8dcadaad2e 100644 --- a/compiler/optimizing/scheduler_arm.cc +++ b/compiler/optimizing/scheduler_arm.cc @@ -330,10 +330,12 @@ bool SchedulingLatencyVisitorARM::CanGenerateTest(HCondition* condition) { } } else if (c == kCondLE || c == kCondGT) { if (value < std::numeric_limits::max() && - !codegen_->GetAssembler()->ShifterOperandCanHold(SBC, High32Bits(value + 1), kCcSet)) { + !codegen_->GetAssembler()->ShifterOperandCanHold( + SBC, High32Bits(value + 1), vixl32::FlagsUpdate::SetFlags)) { return false; } - } else if (!codegen_->GetAssembler()->ShifterOperandCanHold(SBC, High32Bits(value), kCcSet)) { + } else if (!codegen_->GetAssembler()->ShifterOperandCanHold( + SBC, High32Bits(value), vixl32::FlagsUpdate::SetFlags)) { return false; } } -- cgit v1.2.3-59-g8ed1b