Automerge: [mlir][spirv] Check variable for null before dereferencing (#157457)

apach301 · github-actions[bot] · commit 1fb3db21ab56 · 2025-09-10T14:45:59.000Z
FIxes #157453
diff --git a/mlir/lib/Dialect/SPIRV/IR/SPIRVOps.cpp b/mlir/lib/Dialect/SPIRV/IR/SPIRVOps.cpp
@@ -723,7 +723,9 @@ void mlir::spirv::ConstantOp::getAsmResultNames(
   IntegerType intTy = llvm::dyn_cast<IntegerType>(type);
 
   if (IntegerAttr intCst = llvm::dyn_cast<IntegerAttr>(getValue())) {
-    if (intTy && intTy.getWidth() == 1) {
+    assert(intTy);
+
+    if (intTy.getWidth() == 1) {
       return setNameFn(getResult(), (intCst.getInt() ? "true" : "false"));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -723,7 +723,9 @@ void mlir::spirv::ConstantOp::getAsmResultNames(`
`723`	`723`	`IntegerType intTy = llvm::dyn_cast<IntegerType>(type);`
`724`	`724`
`725`	`725`	`if (IntegerAttr intCst = llvm::dyn_cast<IntegerAttr>(getValue())) {`
`726`		`- if (intTy && intTy.getWidth() == 1) {`
	`726`	`+ assert(intTy);`
	`727`	`+`
	`728`	`+ if (intTy.getWidth() == 1) {`
`727`	`729`	`return setNameFn(getResult(), (intCst.getInt() ? "true" : "false"));`
`728`	`730`	`}`
`729`	`731`