Avoid unused var error when assertion is turned off (Xilinx#916)

erwei-xilinx · web-flow · commit b373250d6e8f · 2025-02-25T16:50:19.000Z
diff --git a/mlir/lib/Conversion/ConvertToAIRPass.cpp b/mlir/lib/Conversion/ConvertToAIRPass.cpp
@@ -1079,7 +1079,8 @@ ConvertForallToParallelInFilteredOps(SmallPtrSet<Operation *, 8> &filteredOps,
     fAdded.push_back(newPar);
   }
   for (auto e : fErased)
-    assert(filteredOps.erase(e));
+    if (!filteredOps.erase(e))
+      return failure();
   filteredOps.insert(fAdded.begin(), fAdded.end());
   return success();
 }
@@ -1465,8 +1466,6 @@ struct InsertEmptyLaunchOverHerdPass
   }
 };
 
-
-
 // Identifies arith operations where all operands are either constants, or
 // produced by IndexCastOp casting from IndexType. If detected, canonicalize
 // IndexCast ops by changing the arith op's input/output types to IndexType.

Original file line number	Diff line number	Diff line change
`@@ -1079,7 +1079,8 @@ ConvertForallToParallelInFilteredOps(SmallPtrSet<Operation *, 8> &filteredOps,`
`1079`	`1079`	`fAdded.push_back(newPar);`
`1080`	`1080`	`}`
`1081`	`1081`	`for (auto e : fErased)`
`1082`		`- assert(filteredOps.erase(e));`
	`1082`	`+ if (!filteredOps.erase(e))`
	`1083`	`+ return failure();`
`1083`	`1084`	`filteredOps.insert(fAdded.begin(), fAdded.end());`
`1084`	`1085`	`return success();`
`1085`	`1086`	`}`
`@@ -1465,8 +1466,6 @@ struct InsertEmptyLaunchOverHerdPass`
`1465`	`1466`	`}`
`1466`	`1467`	`};`
`1467`	`1468`
`1468`		`-`
`1469`		`-`
`1470`	`1469`	`// Identifies arith operations where all operands are either constants, or`
`1471`	`1470`	`// produced by IndexCastOp casting from IndexType. If detected, canonicalize`
`1472`	`1471`	`// IndexCast ops by changing the arith op's input/output types to IndexType.`