Address review comments

Author: jsjodin

flang/lib/Lower/OpenMP/OpenMP.cpp

@@ -49,7 +49,6 @@
 using namespace Fortran::lower::omp;
 using namespace Fortran::common::openmp;
 using namespace Fortran::utils::openmp;
-using namespace Fortran::semantics;
 
 //===----------------------------------------------------------------------===//
 // Code generation helper functions

flang/lib/Lower/OpenMP/Utils.cpp

@@ -31,22 +31,23 @@
 
 #include <iterator>
 
-using namespace Fortran::semantics;
-
 template <typename T>
-MaybeIntExpr EvaluateIntExpr(SemanticsContext &context, const T &expr) {
-  if (MaybeExpr maybeExpr{
+Fortran::semantics::MaybeIntExpr
+EvaluateIntExpr(Fortran::semantics::SemanticsContext &context, const T &expr) {
+  if (Fortran::semantics::MaybeExpr maybeExpr{
           Fold(context.foldingContext(), AnalyzeExpr(context, expr))}) {
-    if (auto *intExpr{Fortran::evaluate::UnwrapExpr<SomeIntExpr>(*maybeExpr)}) {
+    if (auto *intExpr{
+            Fortran::evaluate::UnwrapExpr<Fortran::semantics::SomeIntExpr>(
+                *maybeExpr)}) {
       return std::move(*intExpr);
     }
   }
   return std::nullopt;
 }
 
 template <typename T>
-std::optional<std::int64_t> EvaluateInt64(SemanticsContext &context,
-                                          const T &expr) {
+std::optional<std::int64_t>
+EvaluateInt64(Fortran::semantics::SemanticsContext &context, const T &expr) {
   return Fortran::evaluate::ToInt64(EvaluateIntExpr(context, expr));
 }
 
@@ -602,7 +603,8 @@ static void convertLoopBounds(lower::AbstractConverter &converter,
 /// contains a loop construct with an inner tiling construct.
 void collectTileSizesFromOpenMPConstruct(
     const parser::OpenMPConstruct *ompCons,
-    llvm::SmallVectorImpl<int64_t> &tileSizes, SemanticsContext &semaCtx) {
+    llvm::SmallVectorImpl<int64_t> &tileSizes,
+    Fortran::semantics::SemanticsContext &semaCtx) {
   if (!ompCons)
     return;
 
@@ -625,7 +627,7 @@ void collectTileSizesFromOpenMPConstruct(
         // Get the size values from parse tree and convert to a vector
         const auto &innerClauseList{
             std::get<parser::OmpClauseList>(innerBegin.t)};
-        for (const auto &clause : innerClauseList.v)
+        for (const auto &clause : innerClauseList.v) {
           if (const auto tclause{
                   std::get_if<parser::OmpClause::Sizes>(&clause.u)}) {
             for (auto &tval : tclause->v) {
@@ -634,6 +636,7 @@ void collectTileSizesFromOpenMPConstruct(
             }
             break;
           }
+        }
       }
     }
   }

mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp

@@ -3047,15 +3047,15 @@ convertOmpLoopNest(Operation &opInst, llvm::IRBuilderBase &builder,
   // Do tiling.
   if (const auto &tiles = loopOp.getTileSizes()) {
     llvm::Type *ivType = loopInfos.front()->getIndVarType();
-    SmallVector<llvm::Value *> TileSizes;
+    SmallVector<llvm::Value *> tileSizes;
 
     for (auto tile : tiles.value()) {
-      llvm::Value *TileVal = llvm::ConstantInt::get(ivType, tile);
-      TileSizes.push_back(TileVal);
+      llvm::Value *tileVal = llvm::ConstantInt::get(ivType, tile);
+      tileSizes.push_back(tileVal);
     }
 
     std::vector<llvm::CanonicalLoopInfo *> newLoops =
-        ompBuilder->tileLoops(ompLoc.DL, loopInfos, TileSizes);
+        ompBuilder->tileLoops(ompLoc.DL, loopInfos, tileSizes);
 
     // Update afterIP to get the correct insertion point after
     // tiling.