From ef001e8e8a76135dfb82d14fce09785fbc526dc1 Mon Sep 17 00:00:00 2001 From: Matt Arsenault Date: Thu, 7 Feb 2019 20:44:08 +0000 Subject: [PATCH] GlobalISel: Try to fix bot failures Don't rely on order of evaluation of function arguments. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@353460 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/GlobalISel/LegalizerHelper.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/CodeGen/GlobalISel/LegalizerHelper.cpp b/lib/CodeGen/GlobalISel/LegalizerHelper.cpp index 3dd5c32f5d0..ff5b18a5a76 100644 --- a/lib/CodeGen/GlobalISel/LegalizerHelper.cpp +++ b/lib/CodeGen/GlobalISel/LegalizerHelper.cpp @@ -2219,11 +2219,11 @@ LegalizerHelper::narrowScalarShiftByConstant(MachineInstr &MI, const APInt &Amt, Hi = InL; } else { Lo = MIRBuilder.buildShl(NVT, InL, MIRBuilder.buildConstant(AmtTy, Amt)); - Hi = MIRBuilder.buildOr( - NVT, - MIRBuilder.buildShl(NVT, InH, MIRBuilder.buildConstant(AmtTy, Amt)), - MIRBuilder.buildLShr( - NVT, InL, MIRBuilder.buildConstant(AmtTy, -Amt + NVTBits))); + auto OrLHS = + MIRBuilder.buildShl(NVT, InH, MIRBuilder.buildConstant(AmtTy, Amt)); + auto OrRHS = MIRBuilder.buildLShr( + NVT, InL, MIRBuilder.buildConstant(AmtTy, -Amt + NVTBits)); + Hi = MIRBuilder.buildOr(NVT, OrLHS, OrRHS); } } else if (MI.getOpcode() == TargetOpcode::G_LSHR) { if (Amt.ugt(VTBits)) { -- 2.40.0