[rebase] reproduce upstream fix to CallOp builder

jeanPerier · jeanPerier · commit 62ef7253a6a3 · 2021-10-27T08:16:04.000-07:00
diff --git a/flang/lib/Optimizer/Dialect/FIROps.cpp b/flang/lib/Optimizer/Dialect/FIROps.cpp
@@ -657,7 +657,8 @@ void fir::CallOp::build(mlir::OpBuilder &builder, mlir::OperationState &result,
                         llvm::ArrayRef<mlir::Type> results,
                         mlir::ValueRange operands) {
   result.addOperands(operands);
-  result.addAttribute(getCalleeAttrName(), callee);
+  if (callee)
+    result.addAttribute(getCalleeAttrName(), callee);
   result.addTypes(results);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -657,7 +657,8 @@ void fir::CallOp::build(mlir::OpBuilder &builder, mlir::OperationState &result,`
`657`	`657`	`llvm::ArrayRef<mlir::Type> results,`
`658`	`658`	`mlir::ValueRange operands) {`
`659`	`659`	`result.addOperands(operands);`
`660`		`- result.addAttribute(getCalleeAttrName(), callee);`
	`660`	`+ if (callee)`
	`661`	`+ result.addAttribute(getCalleeAttrName(), callee);`
`661`	`662`	`result.addTypes(results);`
`662`	`663`	`}`
`663`	`664`