[flang] [llvm] Reland [flang] In AllocMemOp lowering, convert types for calling malloc on 32-bit (PR #130384)

[via llvm-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 cf1964af5a461196904b663ede04c26555fcff69 3a89328312912996fa9009249f5ea89f64e3f20d --extensions cpp,h -- flang-rt/lib/runtime/execute.cpp flang-rt/lib/runtime/extensions.cpp flang-rt/lib/runtime/file.cpp flang/include/flang/Optimizer/Builder/FIRBuilder.h flang/include/flang/Optimizer/Builder/Runtime/RTBuilder.h flang/lib/Lower/Allocatable.cpp flang/lib/Lower/IO.cpp flang/lib/Optimizer/Builder/FIRBuilder.cpp flang/lib/Optimizer/Builder/Runtime/Intrinsics.cpp flang/lib/Optimizer/Builder/Runtime/Numeric.cpp flang/lib/Optimizer/Builder/Runtime/Reduction.cpp flang/lib/Optimizer/Builder/Runtime/Support.cpp flang/lib/Optimizer/Builder/Runtime/Transformational.cpp flang/lib/Optimizer/CodeGen/Target.cpp
``````````

</details>

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

``````````diff
diff --git a/flang/include/flang/Optimizer/Builder/FIRBuilder.h b/flang/include/flang/Optimizer/Builder/FIRBuilder.h
index fe496d3481..61f71459ef 100644
--- a/flang/include/flang/Optimizer/Builder/FIRBuilder.h
+++ b/flang/include/flang/Optimizer/Builder/FIRBuilder.h
@@ -92,8 +92,7 @@ public:
     setListener(this);
   }
   explicit FirOpBuilder(mlir::OpBuilder &builder, mlir::ModuleOp mod)
-      : OpBuilder(builder), OpBuilder::Listener(),
-        kindMap{getKindMapping(mod)},
+      : OpBuilder(builder), OpBuilder::Listener(), kindMap{getKindMapping(mod)},
         cTargetInfo{fir::getTargetTriple(getModule())} {
     setListener(this);
   }
@@ -116,8 +115,7 @@ public:
       : OpBuilder(other), OpBuilder::Listener(), kindMap{other.kindMap},
         fastMathFlags{other.fastMathFlags},
         integerOverflowFlags{other.integerOverflowFlags},
-        symbolTable{other.symbolTable},
-        cTargetInfo{other.cTargetInfo} {
+        symbolTable{other.symbolTable}, cTargetInfo{other.cTargetInfo} {
     setListener(this);
   }
 
@@ -125,8 +123,7 @@ public:
       : OpBuilder(other), OpBuilder::Listener(),
         kindMap{std::move(other.kindMap)}, fastMathFlags{other.fastMathFlags},
         integerOverflowFlags{other.integerOverflowFlags},
-        symbolTable{other.symbolTable},
-        cTargetInfo{other.cTargetInfo} {
+        symbolTable{other.symbolTable}, cTargetInfo{other.cTargetInfo} {
     setListener(this);
   }
 
@@ -191,27 +188,19 @@ public:
 
   /// Get the integer type whose bit width corresponds to the width of
   /// the `char` type in C
-  mlir::Type getCCharType() {
-    return getIntegerType(cTargetInfo.CharWidth);
-  }
+  mlir::Type getCCharType() { return getIntegerType(cTargetInfo.CharWidth); }
 
   /// Get the integer type whose bit width corresponds to the width of
   /// the `short` type in C
-  mlir::Type getCShortType() {
-    return getIntegerType(cTargetInfo.ShortWidth);
-  }
+  mlir::Type getCShortType() { return getIntegerType(cTargetInfo.ShortWidth); }
 
   /// Get the integer type whose bit width corresponds to the width of
   /// the `int` type in C
-  mlir::Type getCIntType() {
-    return getIntegerType(cTargetInfo.IntWidth);
-  }
+  mlir::Type getCIntType() { return getIntegerType(cTargetInfo.IntWidth); }
 
   /// Get the integer type whose bit width corresponds to the width of
   /// the `long` type in C
-  mlir::Type getCLongType() {
-    return getIntegerType(cTargetInfo.LongWidth);
-  }
+  mlir::Type getCLongType() { return getIntegerType(cTargetInfo.LongWidth); }
 
   /// Get the integer type whose bit width corresponds to the width of
   /// the `long long` type in C
@@ -221,9 +210,7 @@ public:
 
   /// Get the integer type whose bit width corresponds to the width of
   /// enums in C
-  mlir::Type getCEnumType() {
-    return getIntegerType(cTargetInfo.EnumWidth);
-  }
+  mlir::Type getCEnumType() { return getIntegerType(cTargetInfo.EnumWidth); }
 
   /// Wrap `str` to a SymbolRefAttr.
   mlir::SymbolRefAttr getSymbolRefAttr(llvm::StringRef str) {
diff --git a/flang/lib/Lower/IO.cpp b/flang/lib/Lower/IO.cpp
index 280c911b14..b4b8f5ed09 100644
--- a/flang/lib/Lower/IO.cpp
+++ b/flang/lib/Lower/IO.cpp
@@ -266,8 +266,7 @@ getNonTbpDefinedIoTableAddr(Fortran::lower::AbstractConverter &converter,
 
   mlir::StringAttr linkOnce = builder.createLinkOnceLinkage();
   mlir::Type idxTy = builder.getIndexType();
-  mlir::Type sizeTy =
-      fir::runtime::getModel<std::size_t>()(builder);
+  mlir::Type sizeTy = fir::runtime::getModel<std::size_t>()(builder);
   mlir::Type intTy = fir::runtime::getModel<int>()(builder);
   mlir::Type boolTy = fir::runtime::getModel<bool>()(builder);
   mlir::Type listTy = fir::SequenceType::get(
@@ -426,8 +425,7 @@ getNamelistGroup(Fortran::lower::AbstractConverter &converter,
   mlir::MLIRContext *context = builder.getContext();
   mlir::StringAttr linkOnce = builder.createLinkOnceLinkage();
   mlir::Type idxTy = builder.getIndexType();
-  mlir::Type sizeTy =
-      fir::runtime::getModel<std::size_t>()(builder);
+  mlir::Type sizeTy = fir::runtime::getModel<std::size_t>()(builder);
   mlir::Type charRefTy = fir::ReferenceType::get(builder.getIntegerType(8));
   mlir::Type descRefTy =
       fir::ReferenceType::get(fir::BoxType::get(mlir::NoneType::get(context)));
diff --git a/flang/lib/Optimizer/CodeGen/Target.cpp b/flang/lib/Optimizer/CodeGen/Target.cpp
index 932c5fbcb9..7da3ee737c 100644
--- a/flang/lib/Optimizer/CodeGen/Target.cpp
+++ b/flang/lib/Optimizer/CodeGen/Target.cpp
@@ -1845,10 +1845,10 @@ struct TargetWasm32 : public GenericTarget<TargetWasm32> {
     CodeGenSpecifics::Marshalling marshal;
     // Use a type that will be translated into LLVM as:
     // { t, t }   struct of 2 eleTy, sret, align 4
-    auto structTy = mlir::TupleType::get(eleTy.getContext(),
-                                          mlir::TypeRange{eleTy, eleTy});
+    auto structTy =
+        mlir::TupleType::get(eleTy.getContext(), mlir::TypeRange{eleTy, eleTy});
     marshal.emplace_back(fir::ReferenceType::get(structTy),
-                          AT{/*alignment=*/4, /*byval=*/false, /*sret=*/true});
+                         AT{/*alignment=*/4, /*byval=*/false, /*sret=*/true});
     return marshal;
   }
 };

``````````

</details>


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