[flang-commits] [flang] 606245a - [flang] Fixed build issue after 88f07a736bbc3f0062d7d8f4032f0b54aff5c018

[Slava Zakharin via flang-commits]

Author: Slava Zakharin
Date: 2022-10-05T12:59:31-07:00
New Revision: 606245ad542491400a5475c796df86a99f5c8c12

URL: https://github.com/llvm/llvm-project/commit/606245ad542491400a5475c796df86a99f5c8c12
DIFF: https://github.com/llvm/llvm-project/commit/606245ad542491400a5475c796df86a99f5c8c12.diff

LOG: [flang] Fixed build issue after 88f07a736bbc3f0062d7d8f4032f0b54aff5c018

nullptr matches both against ::mlir::UnitAttr and ::mlir::TypeRange,
so the following two candidates fit:
static void mlir::omp::OrderedRegionOp::build(::mlir::OpBuilder &odsBuilder,
    ::mlir::OperationState &odsState,
    /*optional*/::mlir::UnitAttr simd)
static void mlir::omp::OrderedRegionOp::build(::mlir::OpBuilder &odsBuilder,
    ::mlir::OperationState &odsState,
    ::mlir::TypeRange resultTypes,
    /*optional*/bool simd = false)

Added: 
    

Modified: 
    flang/lib/Lower/OpenMP.cpp

Removed: 
    


################################################################################
diff  --git a/flang/lib/Lower/OpenMP.cpp b/flang/lib/Lower/OpenMP.cpp
index 31709d68ee8a..82c04ab366b8 100644
--- a/flang/lib/Lower/OpenMP.cpp
+++ b/flang/lib/Lower/OpenMP.cpp
@@ -841,7 +841,7 @@ genOMP(Fortran::lower::AbstractConverter &converter,
                                   &opClauseList);
   } else if (blockDirective.v == llvm::omp::OMPD_ordered) {
     auto orderedOp = firOpBuilder.create<mlir::omp::OrderedRegionOp>(
-        currentLocation, /*simd=*/nullptr);
+        currentLocation, /*simd=*/false);
     createBodyOfOp<omp::OrderedRegionOp>(orderedOp, converter, currentLocation,
                                          eval);
   } else if (blockDirective.v == llvm::omp::OMPD_task) {