diff --git a/mlir/lib/Dialect/Affine/Transforms/DecomposeAffineOps.cpp b/mlir/lib/Dialect/Affine/Transforms/DecomposeAffineOps.cpp
--- a/mlir/lib/Dialect/Affine/Transforms/DecomposeAffineOps.cpp
+++ b/mlir/lib/Dialect/Affine/Transforms/DecomposeAffineOps.cpp
@@ -48,10 +48,10 @@
   int64_t numOperands = op.getNumOperands();
   SmallVector<int64_t> operandPositions =
       llvm::to_vector(llvm::seq<int64_t>(0, numOperands));
-  std::sort(operandPositions.begin(), operandPositions.end(),
-            [&numInvariant](size_t i1, size_t i2) {
-              return numInvariant[i1] > numInvariant[i2];
-            });
+  llvm::stable_sort(operandPositions.begin(), operandPositions.end(),
+                    [&numInvariant](size_t i1, size_t i2) {
+                      return numInvariant[i1] > numInvariant[i2];
+                    });
 
   SmallVector<AffineExpr> replacements(numOperands);
   SmallVector<Value> operands(numOperands);
@@ -144,10 +144,10 @@
         return i;
     return -1;
   };
-  std::sort(subExpressions.begin(), subExpressions.end(),
-            [&](AffineExpr e1, AffineExpr e2) {
-              return getMaxSymbol(e1) < getMaxSymbol(e2);
-            });
+  llvm::stable_sort(subExpressions.begin(), subExpressions.end(),
+                    [&](AffineExpr e1, AffineExpr e2) {
+                      return getMaxSymbol(e1) < getMaxSymbol(e2);
+                    });
   LLVM_DEBUG(
       llvm::interleaveComma(subExpressions, DBGS() << "--sorted subexprs: ");
       llvm::dbgs() << "\n");