[flang-commits] [flang] [flang] fix regression with optional after PR125059 (PR #125215)

[via flang-commits]

github-actions[bot] wrote:

<!--LLVM CODE FORMAT COMMENT: {clang-format}-->


:warning: C/C++ code formatter, clang-format found issues in your code. :warning:

<details>
<summary>
You can test this locally with the following command:
</summary>

``````````bash
git-clang-format --diff 41910f72638354cfd27cf7c518dde47e9eb9deab b8b72cde4b0deff7f56b0c25f42df0f589e57bd0 --extensions h,cpp -- flang/include/flang/Optimizer/Builder/HLFIRTools.h flang/lib/Optimizer/Builder/HLFIRTools.cpp flang/lib/Optimizer/HLFIR/Transforms/LowerHLFIRIntrinsics.cpp
``````````

</details>

<details>
<summary>
View the diff from clang-format here.
</summary>

``````````diff
diff --git a/flang/lib/Optimizer/Builder/HLFIRTools.cpp b/flang/lib/Optimizer/Builder/HLFIRTools.cpp
index 63a02677fa..42a28a748b 100644
--- a/flang/lib/Optimizer/Builder/HLFIRTools.cpp
+++ b/flang/lib/Optimizer/Builder/HLFIRTools.cpp
@@ -221,7 +221,7 @@ bool hlfir::Entity::mayHaveNonDefaultLowerBounds() const {
   return true;
 }
 
-mlir::Operation* traverseConverts(mlir::Operation *op) {
+mlir::Operation *traverseConverts(mlir::Operation *op) {
   while (auto convert = llvm::dyn_cast_or_null<fir::ConvertOp>(op))
     op = convert.getValue().getDefiningOp();
   return op;
@@ -233,7 +233,7 @@ bool hlfir::Entity::mayBeOptional() const {
   if (!isVariable())
     return false;
   // TODO: introduce a fir type to better identify optionals.
-  if (mlir::Operation* op = traverseConverts(getDefiningOp()))
+  if (mlir::Operation *op = traverseConverts(getDefiningOp()))
     return !llvm::isa<fir::AllocaOp, fir::AllocMemOp, fir::ReboxOp,
                       fir::EmboxOp>(op);
   return true;
@@ -1042,7 +1042,8 @@ conditionnalyEvaluate(mlir::Location loc, fir::FirOpBuilder &builder,
 
 static fir::ExtendedValue translateVariableToExtendedValue(
     mlir::Location loc, fir::FirOpBuilder &builder, hlfir::Entity variable,
-    bool forceHlfirBase = false, bool contiguousHint = false, bool keepScalarOptionalBoxed = false) {
+    bool forceHlfirBase = false, bool contiguousHint = false,
+    bool keepScalarOptionalBoxed = false) {
   assert(variable.isVariable() && "must be a variable");
   // When going towards FIR, use the original base value to avoid
   // introducing descriptors at runtime when they are not required.
@@ -1061,8 +1062,7 @@ static fir::ExtendedValue translateVariableToExtendedValue(
     const bool contiguous = variable.isSimplyContiguous() || contiguousHint;
     const bool isAssumedRank = variable.isAssumedRank();
     if (!contiguous || variable.isPolymorphic() ||
-        variable.isDerivedWithLengthParameters() ||
-        isAssumedRank) {
+        variable.isDerivedWithLengthParameters() || isAssumedRank) {
       llvm::SmallVector<mlir::Value> nonDefaultLbounds;
       if (!isAssumedRank)
         nonDefaultLbounds = getNonDefaultLowerBounds(loc, builder, variable);
@@ -1084,7 +1084,8 @@ static fir::ExtendedValue translateVariableToExtendedValue(
               return base;
             });
       }
-      llvm::SmallVector<mlir::Value> nonDefaultLbounds = getNonDefaultLowerBounds(loc, builder, variable);
+      llvm::SmallVector<mlir::Value> nonDefaultLbounds =
+          getNonDefaultLowerBounds(loc, builder, variable);
       return fir::BoxValue(base, nonDefaultLbounds,
                            getExplicitTypeParams(variable));
     }

``````````

</details>


https://github.com/llvm/llvm-project/pull/125215