Merge pull request #430 from xiaohanAMD/xiao.fix-qdqaroundop-crash

xiaohanAMD · web-flow · commit b654c07c3533 · 2025-09-05T16:18:24.000+02:00
return failure if cast failed
diff --git a/src/Dialect/ONNX/Transforms/QDQAroundOpOpt.cpp b/src/Dialect/ONNX/Transforms/QDQAroundOpOpt.cpp
@@ -95,16 +95,17 @@ class RemoveQDQAroundOpPattern : public OpRewritePattern<T> {
       rewriter.replaceOp(qOp, newOp.getResult());
       return success();
     }
+    return failure();
   };
 };
 struct QDQAroundOpOptONNXToONNXPass
     : public PassWrapper<QDQAroundOpOptONNXToONNXPass,
           OperationPass<func::FuncOp>> {
   MLIR_DEFINE_EXPLICIT_INTERNAL_INLINE_TYPE_ID(QDQAroundOpOptONNXToONNXPass)
-  StringRef getArgument() const override {
+  [[nodiscard]] StringRef getArgument() const override {
     return "qdq-around-op-opt-onnx-to-onnx";
   }
-  StringRef getDescription() const override {
+  [[nodiscard]] StringRef getDescription() const override {
     return "Remove QDQ around ops if safe.";
   }
 

Original file line number	Diff line number	Diff line change
`@@ -95,16 +95,17 @@ class RemoveQDQAroundOpPattern : public OpRewritePattern<T> {`
`95`	`95`	`rewriter.replaceOp(qOp, newOp.getResult());`
`96`	`96`	`return success();`
`97`	`97`	`}`
	`98`	`+ return failure();`
`98`	`99`	`};`
`99`	`100`	`};`
`100`	`101`	`struct QDQAroundOpOptONNXToONNXPass`
`101`	`102`	`: public PassWrapper<QDQAroundOpOptONNXToONNXPass,`
`102`	`103`	`OperationPass<func::FuncOp>> {`
`103`	`104`	`MLIR_DEFINE_EXPLICIT_INTERNAL_INLINE_TYPE_ID(QDQAroundOpOptONNXToONNXPass)`
`104`		`- StringRef getArgument() const override {`
	`105`	`+ [[nodiscard]] StringRef getArgument() const override {`
`105`	`106`	`return "qdq-around-op-opt-onnx-to-onnx";`
`106`	`107`	`}`
`107`		`- StringRef getDescription() const override {`
	`108`	`+ [[nodiscard]] StringRef getDescription() const override {`
`108`	`109`	`return "Remove QDQ around ops if safe.";`
`109`	`110`	`}`
`110`	`111`