[llvm] r353460 - GlobalISel: Try to fix bot failures

[Matt Arsenault via llvm-commits]

Author: arsenm
Date: Thu Feb  7 12:44:08 2019
New Revision: 353460

URL: http://llvm.org/viewvc/llvm-project?rev=353460&view=rev
Log:
GlobalISel: Try to fix bot failures

Don't rely on order of evaluation of function arguments.

Modified:
    llvm/trunk/lib/CodeGen/GlobalISel/LegalizerHelper.cpp

Modified: llvm/trunk/lib/CodeGen/GlobalISel/LegalizerHelper.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/GlobalISel/LegalizerHelper.cpp?rev=353460&r1=353459&r2=353460&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/GlobalISel/LegalizerHelper.cpp (original)
+++ llvm/trunk/lib/CodeGen/GlobalISel/LegalizerHelper.cpp Thu Feb  7 12:44:08 2019
@@ -2219,11 +2219,11 @@ LegalizerHelper::narrowScalarShiftByCons
       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)) {