Handle review comments (3).

abidh · abidh · commit cb9b9ecf71fe · 2025-01-28T12:26:06.000Z
Add a check to ensure we do have `DIGlobalVariableExpressionAttr` in the `ArrayAttr`.
diff --git a/flang/lib/Optimizer/CodeGen/CodeGen.cpp b/flang/lib/Optimizer/CodeGen/CodeGen.cpp
@@ -2999,7 +2999,10 @@ struct GlobalOpConversion : public fir::FIROpConversion<fir::GlobalOp> {
       if (auto gvExprAttr = mlir::dyn_cast_if_present<mlir::ArrayAttr>(
               fusedLoc.getMetadata())) {
         for (auto attr : gvExprAttr.getAsRange<mlir::Attribute>())
-          dbgExprs.push_back(attr);
+          if (auto dbgAttr =
+                  mlir::dyn_cast<mlir::LLVM::DIGlobalVariableExpressionAttr>(
+                      attr))
+            dbgExprs.push_back(dbgAttr);
       }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -2999,7 +2999,10 @@ struct GlobalOpConversion : public fir::FIROpConversion<fir::GlobalOp> {`
`2999`	`2999`	`if (auto gvExprAttr = mlir::dyn_cast_if_present<mlir::ArrayAttr>(`
`3000`	`3000`	`fusedLoc.getMetadata())) {`
`3001`	`3001`	`for (auto attr : gvExprAttr.getAsRange<mlir::Attribute>())`
`3002`		`- dbgExprs.push_back(attr);`
	`3002`	`+ if (auto dbgAttr =`
	`3003`	`+ mlir::dyn_cast<mlir::LLVM::DIGlobalVariableExpressionAttr>(`
	`3004`	`+ attr))`
	`3005`	`+ dbgExprs.push_back(dbgAttr);`
`3003`	`3006`	`}`
`3004`	`3007`	`}`
`3005`	`3008`