commit e98cab11d7d7441d526b6b0a16049f2e8c196a75
author Matt Arsenault <Matthew.Arsenault@amd.com> Thu Feb 07 20:44:08 2019 +0000
committer Matt Arsenault <Matthew.Arsenault@amd.com> Thu Feb 07 20:44:08 2019 +0000
tree f5e9173fdd218d42e98848678283fc9949efe4a1
parent 5fbdccd834874aad04e21b0253084a27013a3f81

GlobalISel: Try to fix bot failures

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

llvm-svn: 353460

llvm/lib/CodeGen/GlobalISel/LegalizerHelper.cpp

diff --git a/llvm/lib/CodeGen/GlobalISel/LegalizerHelper.cpp b/llvm/lib/CodeGen/GlobalISel/LegalizerHelper.cpp
index 3dd5c32..ff5b18a 100644
--- a/llvm/lib/CodeGen/GlobalISel/LegalizerHelper.cpp
+++ b/llvm/lib/CodeGen/GlobalISel/LegalizerHelper.cpp
@@ -2219,11 +2219,11 @@
       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)) {