[Mlir-commits] [mlir] e89bd48 - [mlir] Avoid crash in mlir-query's MatchFinder class (#145049)
llvmlistbot at llvm.org
llvmlistbot at llvm.org
Mon Dec 29 20:46:16 PST 2025
Author: Denzel-Brian Budii
Date: 2025-12-30T06:46:11+02:00
New Revision: e89bd48c563005f01b9f9b05b60a76911744fedf
URL: https://github.com/llvm/llvm-project/commit/e89bd48c563005f01b9f9b05b60a76911744fedf
DIFF: https://github.com/llvm/llvm-project/commit/e89bd48c563005f01b9f9b05b60a76911744fedf.diff
LOG: [mlir] Avoid crash in mlir-query's MatchFinder class (#145049)
It was failing for cases where the location was not a FileLineColLoc and fileLoc a nullptr.
If the following query is run:
`match getUsersByPredicate(hasOpName("memref.alloc"),
hasOpName("memref.dealloc"), true)`
on the IR illustrated below, it caused the program to crash.
``` mlir
func.func @slicing_linalg_op(%arg0 : index, %arg1 : index, %arg2 : index) {
%a = memref.alloc(%arg0, %arg2) : memref<?x?xf32>
%b = memref.alloc(%arg2, %arg1) : memref<?x?xf32>
%c = memref.alloc(%arg0, %arg1) : memref<?x?xf32>
%d = memref.alloc(%arg0, %arg1) : memref<?x?xf32>
linalg.matmul ins(%a, %b : memref<?x?xf32>, memref<?x?xf32>)
outs(%c : memref<?x?xf32>)
linalg.matmul ins(%a, %b : memref<?x?xf32>, memref<?x?xf32>)
outs(%d : memref<?x?xf32>)
memref.dealloc %c : memref<?x?xf32>
memref.dealloc %b : memref<?x?xf32>
memref.dealloc %a : memref<?x?xf32>
memref.dealloc %d : memref<?x?xf32>
return
}
```
Added:
Modified:
mlir/lib/Query/Matcher/MatchFinder.cpp
Removed:
################################################################################
diff --git a/mlir/lib/Query/Matcher/MatchFinder.cpp b/mlir/lib/Query/Matcher/MatchFinder.cpp
index 1d4817e32417d..48a24b98f9a4e 100644
--- a/mlir/lib/Query/Matcher/MatchFinder.cpp
+++ b/mlir/lib/Query/Matcher/MatchFinder.cpp
@@ -38,21 +38,23 @@ MatchFinder::collectMatches(Operation *root, DynMatcher matcher) const {
void MatchFinder::printMatch(llvm::raw_ostream &os, QuerySession &qs,
Operation *op) const {
- auto fileLoc = cast<FileLineColLoc>(op->getLoc());
- SMLoc smloc = qs.getSourceManager().FindLocForLineAndColumn(
- qs.getBufferId(), fileLoc.getLine(), fileLoc.getColumn());
- llvm::SMDiagnostic diag =
- qs.getSourceManager().GetMessage(smloc, llvm::SourceMgr::DK_Note, "");
- diag.print("", os, true, false, true);
+ if (auto fileLoc = op->getLoc()->findInstanceOf<FileLineColLoc>()) {
+ SMLoc smloc = qs.getSourceManager().FindLocForLineAndColumn(
+ qs.getBufferId(), fileLoc.getLine(), fileLoc.getColumn());
+ llvm::SMDiagnostic diag =
+ qs.getSourceManager().GetMessage(smloc, llvm::SourceMgr::DK_Note, "");
+ diag.print("", os, true, false, true);
+ }
}
void MatchFinder::printMatch(llvm::raw_ostream &os, QuerySession &qs,
Operation *op, const std::string &binding) const {
- auto fileLoc = cast<FileLineColLoc>(op->getLoc());
- auto smloc = qs.getSourceManager().FindLocForLineAndColumn(
- qs.getBufferId(), fileLoc.getLine(), fileLoc.getColumn());
- qs.getSourceManager().PrintMessage(os, smloc, llvm::SourceMgr::DK_Note,
- "\"" + binding + "\" binds here");
+ if (auto fileLoc = op->getLoc()->findInstanceOf<FileLineColLoc>()) {
+ auto smloc = qs.getSourceManager().FindLocForLineAndColumn(
+ qs.getBufferId(), fileLoc.getLine(), fileLoc.getColumn());
+ qs.getSourceManager().PrintMessage(os, smloc, llvm::SourceMgr::DK_Note,
+ "\"" + binding + "\" binds here");
+ }
}
std::vector<Operation *>
More information about the Mlir-commits
mailing list