[rebase] apply fir-dev formatting changes lost in rebase

Author: jeanPerier

flang/include/flang/Optimizer/Analysis/IteratedDominanceFrontier.h

@@ -45,31 +45,31 @@ namespace fir {
 template <class NodeTy, bool IsPostDom>
 class IDFCalculator {
 public:
-  IDFCalculator(mlir::DominanceInfo &DT) : DT(DT), useLiveIn(false) {}
+  IDFCalculator(mlir::DominanceInfo &dt) : dt(dt), useLiveIn(false) {}
 
   /// Give the IDF calculator the set of blocks in which the value is
   /// defined.  This is equivalent to the set of starting blocks it should be
   /// calculating the IDF for (though later gets pruned based on liveness).
   ///
   /// Note: This set *must* live for the entire lifetime of the IDF calculator.
-  void setDefiningBlocks(const llvm::SmallPtrSetImpl<NodeTy *> &Blocks) {
-    DefBlocks = &Blocks;
+  void setDefiningBlocks(const llvm::SmallPtrSetImpl<NodeTy *> &blocks) {
+    defBlocks = &blocks;
   }
 
   /// Give the IDF calculator the set of blocks in which the value is
   /// live on entry to the block.   This is used to prune the IDF calculation to
   /// not include blocks where any phi insertion would be dead.
   ///
   /// Note: This set *must* live for the entire lifetime of the IDF calculator.
-  void setLiveInBlocks(const llvm::SmallPtrSetImpl<NodeTy *> &Blocks) {
-    LiveInBlocks = &Blocks;
+  void setLiveInBlocks(const llvm::SmallPtrSetImpl<NodeTy *> &blocks) {
+    liveInBlocks = &blocks;
     useLiveIn = true;
   }
 
   /// Reset the live-in block set to be empty, and tell the IDF
   /// calculator to not use liveness anymore.
   void resetLiveInBlocks() {
-    LiveInBlocks = nullptr;
+    liveInBlocks = nullptr;
     useLiveIn = false;
   }
 
@@ -79,13 +79,13 @@ class IDFCalculator {
   /// the file-level comment.  It performs DF->IDF pruning using the live-in
   /// set, to avoid computing the IDF for blocks where an inserted PHI node
   /// would be dead.
-  void calculate(llvm::SmallVectorImpl<NodeTy *> &IDFBlocks);
+  void calculate(llvm::SmallVectorImpl<NodeTy *> &idfBlocks);
 
 private:
-  mlir::DominanceInfo &DT;
+  mlir::DominanceInfo &dt;
   bool useLiveIn;
-  const llvm::SmallPtrSetImpl<NodeTy *> *LiveInBlocks;
-  const llvm::SmallPtrSetImpl<NodeTy *> *DefBlocks;
+  const llvm::SmallPtrSetImpl<NodeTy *> *liveInBlocks;
+  const llvm::SmallPtrSetImpl<NodeTy *> *defBlocks;
 };
 
 typedef IDFCalculator<mlir::Block, false> ForwardIDFCalculator;

flang/include/flang/Optimizer/Builder/BoxValue.h

@@ -413,7 +413,7 @@ class ExtendedValue : public details::matcher<ExtendedValue> {
   template <typename A, typename = std::enable_if_t<
                             !std::is_same_v<std::decay_t<A>, ExtendedValue>>>
   constexpr ExtendedValue(A &&a) : box{std::forward<A>(a)} {
-    if (auto b = getUnboxed()) {
+    if (const auto *b = getUnboxed()) {
       if (*b) {
         auto type = b->getType();
         if (type.template isa<fir::BoxCharType>())

flang/include/flang/Optimizer/CodeGen/CodeGen.h

@@ -44,7 +44,7 @@ using LLVMIRLoweringPrinter =
 std::unique_ptr<mlir::Pass> createLLVMDialectToLLVMPass(
     llvm::raw_ostream &output,
     LLVMIRLoweringPrinter printer =
-        [](llvm::Module &M, llvm::raw_ostream &out) { M.print(out, nullptr); });
+        [](llvm::Module &m, llvm::raw_ostream &out) { m.print(out, nullptr); });
 
 // declarative passes
 #define GEN_PASS_REGISTRATION

flang/lib/Optimizer/Builder/FIRBuilder.cpp

@@ -92,23 +92,21 @@ mlir::Value
 fir::FirOpBuilder::createRealConstant(mlir::Location loc, mlir::Type fltTy,
                                       llvm::APFloat::integerPart val) {
   auto apf = [&]() -> llvm::APFloat {
-    if (auto ty = fltTy.dyn_cast<fir::RealType>()) {
+    if (auto ty = fltTy.dyn_cast<fir::RealType>())
       return llvm::APFloat(kindMap.getFloatSemantics(ty.getFKind()), val);
-    } else {
-      if (fltTy.isF16())
-        return llvm::APFloat(llvm::APFloat::IEEEhalf(), val);
-      if (fltTy.isBF16())
-        return llvm::APFloat(llvm::APFloat::BFloat(), val);
-      if (fltTy.isF32())
-        return llvm::APFloat(llvm::APFloat::IEEEsingle(), val);
-      if (fltTy.isF64())
-        return llvm::APFloat(llvm::APFloat::IEEEdouble(), val);
-      if (fltTy.isF80())
-        return llvm::APFloat(llvm::APFloat::x87DoubleExtended(), val);
-      if (fltTy.isF128())
-        return llvm::APFloat(llvm::APFloat::IEEEquad(), val);
-      llvm_unreachable("unhandled MLIR floating-point type");
-    }
+    if (fltTy.isF16())
+      return llvm::APFloat(llvm::APFloat::IEEEhalf(), val);
+    if (fltTy.isBF16())
+      return llvm::APFloat(llvm::APFloat::BFloat(), val);
+    if (fltTy.isF32())
+      return llvm::APFloat(llvm::APFloat::IEEEsingle(), val);
+    if (fltTy.isF64())
+      return llvm::APFloat(llvm::APFloat::IEEEdouble(), val);
+    if (fltTy.isF80())
+      return llvm::APFloat(llvm::APFloat::x87DoubleExtended(), val);
+    if (fltTy.isF128())
+      return llvm::APFloat(llvm::APFloat::IEEEquad(), val);
+    llvm_unreachable("unhandled MLIR floating-point type");
   };
   return createRealConstant(loc, fltTy, apf());
 }

flang/lib/Optimizer/Dialect/FIRAttr.cpp

@@ -14,8 +14,8 @@
 #include "flang/Optimizer/Dialect/FIRDialect.h"
 #include "flang/Optimizer/Support/KindMapping.h"
 #include "mlir/IR/AttributeSupport.h"
-#include "mlir/IR/DialectImplementation.h"
 #include "mlir/IR/BuiltinTypes.h"
+#include "mlir/IR/DialectImplementation.h"
 #include "llvm/ADT/SmallString.h"
 
 using namespace fir;