diff --git a/mlir/lib/Dialect/Affine/Analysis/Utils.cpp b/mlir/lib/Dialect/Affine/Analysis/Utils.cpp
--- a/mlir/lib/Dialect/Affine/Analysis/Utils.cpp
+++ b/mlir/lib/Dialect/Affine/Analysis/Utils.cpp
@@ -1546,7 +1546,7 @@
   unpackOptionalValues(constraints.getMaybeValues(), newOperands);
   // If dims/symbols have known constant values, use those in order to simplify
   // the affine map further.
-  for (int64_t i = 0, e = constraints.getNumVars(); i < e; ++i) {
+  for (int64_t i = 0, e = constraints.getNumDimAndSymbolVars(); i < e; ++i) {
     // Skip unused operands and operands that are already constants.
     if (!newOperands[i] || getConstantIntValue(newOperands[i]))
       continue;
diff --git a/mlir/test/Dialect/Affine/transform-op-simplify-all-const-min.mlir b/mlir/test/Dialect/Affine/transform-op-simplify-all-const-min.mlir
new file mode 100644
--- /dev/null
+++ b/mlir/test/Dialect/Affine/transform-op-simplify-all-const-min.mlir
@@ -0,0 +1,27 @@
+// RUN: mlir-opt %s --scf-for-loop-canonicalization | FileCheck %s
+
+// Make sure min is transformed into zero.
+// CHECK: %[[ZERO:.+]] = arith.constant 0 : index
+// CHECK: scf.index_switch %[[ZERO]] -> i1
+
+#map6 = affine_map<(d0, d1, d2) -> (d0 floordiv 64)>
+#map29 = affine_map<(d0, d1, d2) -> (d2 * 64 - 2, 5, (d1 mod 4) floordiv 8)>  
+module {
+  func.func @func1() { 
+    %true = arith.constant true 
+    %c0 = arith.constant 0 : index 
+    %c5 = arith.constant 5 : index
+    %c11 = arith.constant 11 : index 
+    %c14 = arith.constant 14 : index
+    %c15 = arith.constant 15 : index 
+    %alloc_249 = memref.alloc() : memref<7xf32>
+    %135 = affine.apply #map6(%c15, %c0, %c14) 
+    %163 = affine.min #map29(%c5, %135, %c11)
+    %196 = scf.index_switch %163 -> i1 
+    default { 
+      memref.assume_alignment %alloc_249, 1 : memref<7xf32>
+      scf.yield %true : i1
+    } 
+    return
+  } 
+}