diff --git a/flang/lib/Semantics/check-omp-loop.cpp b/flang/lib/Semantics/check-omp-loop.cpp index bc96544a8a9c7..bff00a222ba92 100644 --- a/flang/lib/Semantics/check-omp-loop.cpp +++ b/flang/lib/Semantics/check-omp-loop.cpp @@ -40,9 +40,9 @@ namespace Fortran::semantics { static bool IsLoopTransforming(llvm::omp::Directive dir); static bool IsFullUnroll(const parser::OpenMPLoopConstruct &x); -static std::optional CountGeneratedLoops( +static std::optional CountGeneratedNests( const parser::ExecutionPartConstruct &epc); -static std::optional CountGeneratedLoops(const parser::Block &block); +static std::optional CountGeneratedNests(const parser::Block &block); } // namespace Fortran::semantics namespace { @@ -302,7 +302,7 @@ static bool IsFullUnroll(const parser::OpenMPLoopConstruct &x) { return false; } -static std::optional CountGeneratedLoops( +static std::optional CountGeneratedNests( const parser::ExecutionPartConstruct &epc) { if (parser::Unwrap(epc)) { return 1; @@ -330,7 +330,7 @@ static std::optional CountGeneratedLoops( if (!count || *count <= 0) { return std::nullopt; } - if (auto nestedCount{CountGeneratedLoops(std::get(omp.t))}) { + if (auto nestedCount{CountGeneratedNests(std::get(omp.t))}) { if (static_cast(*count) <= *nestedCount) return 1 + *nestedCount - static_cast(*count); } @@ -341,7 +341,7 @@ static std::optional CountGeneratedLoops( return 1; } -static std::optional CountGeneratedLoops(const parser::Block &block) { +static std::optional CountGeneratedNests(const parser::Block &block) { // Count the number of loops in the associated block. If there are any // malformed construct in there, getting the number may be meaningless. // These issues will be diagnosed elsewhere, and we should not emit any @@ -350,7 +350,7 @@ static std::optional CountGeneratedLoops(const parser::Block &block) { // keep it that way. std::optional numLoops{0}; for (auto &epc : parser::omp::LoopRange(block)) { - if (auto genCount{CountGeneratedLoops(epc)}) { + if (auto genCount{CountGeneratedNests(epc)}) { *numLoops += *genCount; } else { numLoops = std::nullopt; @@ -388,7 +388,7 @@ void OmpStructureChecker::CheckNestedConstruct( // Check if a loop-nest-associated construct has only one top-level loop // in it. - if (std::optional numLoops{CountGeneratedLoops(body)}) { + if (std::optional numLoops{CountGeneratedNests(body)}) { if (*numLoops == 0) { context_.Say(beginSpec.DirName().source, "This construct should contain a DO-loop or a loop-nest-generating OpenMP construct"_err_en_US); @@ -631,7 +631,7 @@ void OmpStructureChecker::CheckLooprangeBounds( return; } auto requiredCount{static_cast(*first + *count - 1)}; - if (auto loopCount{CountGeneratedLoops(std::get(x.t))}) { + if (auto loopCount{CountGeneratedNests(std::get(x.t))}) { if (*loopCount < requiredCount) { context_.Say(clause.source, "The specified loop range requires %zu loops, but the loop sequence has a length of %zu"_err_en_US,