More readability improvments

Author: tblah

flang/lib/Lower/OpenMP/DataSharingProcessor.cpp

@@ -100,8 +100,7 @@ void DataSharingProcessor::cloneSymbol(const semantics::Symbol *sym) {
   // If we are doing eager-privatization on a symbol created using delayed
   // privatization there could be incompatible types here e.g.
   // fir.ref<fir.box<fir.array<>>>
-  bool success = false;
-  [&]() {
+  bool success = [&]() -> bool {
     const auto *details =
         sym->detailsIf<Fortran::semantics::HostAssocDetails>();
     assert(details && "No host-association found");
@@ -134,20 +133,19 @@ void DataSharingProcessor::cloneSymbol(const semantics::Symbol *sym) {
                                               nullptr, {}, nullptr);
 
           // This can't be a CharArrayBoxValue because otherwise
-          // boxTy.getElementType() would be a charcater type.
+          // boxTy.getElementType() would be a character type.
           // Assume the array element type isn't polymorphic because we are
           // privatizing.
           fir::ExtendedValue newExv = fir::ArrayBoxValue{box, extents};
 
           converter.bindSymbol(*sym, newExv);
-          success = true;
-          return;
+          return true;
         }
       }
     }
 
     // Normal case:
-    success = converter.createHostAssociateVarClone(
+    return converter.createHostAssociateVarClone(
         *sym, /*skipDefaultInit=*/isFirstPrivate);
   }();
   (void)success;

flang/lib/Lower/OpenMP/PrivateReductionUtils.cpp

@@ -167,11 +167,7 @@ static void initializeIfDerivedTypeBox(fir::FirOpBuilder &builder,
     return;
 
   // remove pointer and array types in the middle
-  mlir::Type eleTy;
-  if (boxTy)
-    eleTy = boxTy.getElementType();
-  if (classTy)
-    eleTy = classTy.getEleTy();
+  mlir::Type eleTy = boxTy ? boxTy.getElementType() : classTy.getEleTy();
   mlir::Type derivedTy = fir::unwrapRefType(eleTy);
   if (auto array = mlir::dyn_cast<fir::SequenceType>(derivedTy))
     derivedTy = array.getElementType();
@@ -231,7 +227,7 @@ static mlir::Value generateZeroShapeForRank(fir::FirOpBuilder &builder,
   fir::SequenceType seqTy =
       mlir::dyn_cast_if_present<fir::SequenceType>(eleType);
   if (!seqTy)
-    return nullptr;
+    return mlir::Value{};
 
   unsigned rank = seqTy.getShape().size();
   mlir::Value zero =
@@ -289,9 +285,9 @@ void Fortran::lower::omp::populateByRefInitAndCleanupRegions(
     fir::IfOp ifOp = builder.create<fir::IfOp>(loc, isNotAllocated,
                                                /*withElseRegion=*/true);
     builder.setInsertionPointToStart(&ifOp.getThenRegion().front());
-    // just embox the null address and return
-    // we have to give the embox a shape so that the LLVM box structure has the
-    // right rank. This returns nullptr if the types don't match.
+    // Just embox the null address and return.
+    // We have to give the embox a shape so that the LLVM box structure has the
+    // right rank. This returns an empty value if the types don't match.
     mlir::Value shape = generateZeroShapeForRank(builder, loc, moldArg);
 
     mlir::Value nullBox =

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

@@ -1335,9 +1335,9 @@ findAssociatedValue(Value privateVar, llvm::IRBuilderBase &builder,
   return moduleTranslation.lookupValue(privateVar);
 }
 
-/// Allocate delayed private variables. Returns the basic block which comes
-/// after all of these allocations. llvm::Value * for each of these private
-/// variables are populated in llvmPrivateVars.
+/// Allocate and initialize delayed private variables. Returns the basic block
+/// which comes after all of these allocations. llvm::Value * for each of these
+/// private variables are populated in llvmPrivateVars.
 static llvm::Expected<llvm::BasicBlock *> allocateAndInitPrivateVars(
     llvm::IRBuilderBase &builder, LLVM::ModuleTranslation &moduleTranslation,
     MutableArrayRef<BlockArgument> privateBlockArgs,