[flang][PRIF] Adding support of -fcoarray option

JDPailleux · JDPailleux · commit fdf02a95ac05 · 2025-06-17T14:43:11.000+02:00
Adding support of -fcoarray (and -fcoarray=lib as an alias of -fcoarray).
If this option is not passed, then coarray features are disabled and error is
returned if a least one feature is present at compile time.

Added lowering for `prif_init` and `prif_[error_]stop` to call them in
ProgramStart and ProgramEnd.
diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td
@@ -6860,7 +6860,6 @@ def static_libgfortran : Flag<["-"], "static-libgfortran">, Group<gfortran_Group
 // "f" options with values for gfortran.
 def fblas_matmul_limit_EQ : Joined<["-"], "fblas-matmul-limit=">, Group<gfortran_Group>;
 def fcheck_EQ : Joined<["-"], "fcheck=">, Group<gfortran_Group>;
-def fcoarray_EQ : Joined<["-"], "fcoarray=">, Group<gfortran_Group>;
 def ffpe_trap_EQ : Joined<["-"], "ffpe-trap=">, Group<gfortran_Group>;
 def ffree_line_length_VALUE : Joined<["-"], "ffree-line-length-">, Group<gfortran_Group>;
 def finit_character_EQ : Joined<["-"], "finit-character=">, Group<gfortran_Group>;
@@ -8563,6 +8562,22 @@ def fopenmp_host_ir_file_path : Separate<["-"], "fopenmp-host-ir-file-path">,
 
 } // let Visibility = [CC1Option, FC1Option]
 
+//===----------------------------------------------------------------------===//
+// Coarray Options
+//===----------------------------------------------------------------------===//
+
+let Visibility = [FlangOption, FC1Option] in {
+
+  def fcoarray : Flag<["-"], "fcoarray">,
+                 Group<f_Group>,
+                 HelpText<"Enable Coarray features">;
+  def fcoarray_EQ : Joined<["-"], "fcoarray=">,
+                    Group<f_Group>,
+                    Values<"lib">,
+                    Alias<fcoarray>;
+
+} // let Visibility = [FlangOption, FC1Option]
+
 //===----------------------------------------------------------------------===//
 // SYCL Options
 //===----------------------------------------------------------------------===//
diff --git a/clang/lib/Driver/ToolChains/Flang.cpp b/clang/lib/Driver/ToolChains/Flang.cpp
@@ -178,6 +178,11 @@ void Flang::addCodegenOptions(const ArgList &Args,
        options::OPT_fstack_repack_arrays, options::OPT_fno_stack_repack_arrays,
        options::OPT_ftime_report, options::OPT_ftime_report_EQ,
        options::OPT_funroll_loops, options::OPT_fno_unroll_loops});
+  if (Args.hasArg(clang::driver::options::OPT_fcoarray))
+    CmdArgs.push_back("-fcoarray");
+  if (Args.hasArg(clang::driver::options::OPT_fcoarray))
+    CmdArgs.push_back("-fcoarray=");
+  Args.AddLastArg(CmdArgs, options::OPT_fcoarray_EQ);
 }
 
 void Flang::addPicOptions(const ArgList &Args, ArgStringList &CmdArgs) const {
diff --git a/flang-rt/lib/runtime/coarray.cpp b/flang-rt/lib/runtime/coarray.cpp
@@ -7,6 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "flang/Runtime/coarray.h"
+#include "flang-rt/runtime/descriptor.h"
 #include "flang-rt/runtime/type-info.h"
 
 namespace Fortran::runtime {
diff --git a/flang/include/flang/Lower/Coarray.h b/flang/include/flang/Lower/Coarray.h
@@ -63,6 +63,11 @@ void genEndCriticalStmt(AbstractConverter &, pft::Evaluation &eval,
 // COARRAY utils 
 //===----------------------------------------------------------------------===//
 
+/// Check if CoarrayFeature from LoweringOptions is enabled.
+/// Emit an error if not.
+void checkCoarrayFeatureEnabled(AbstractConverter &converter,
+                                mlir::Location loc);
+
 // Compute the colower and coupper bounds for a coarray and return an array of
 // bounds.
 std::pair<mlir::Value, mlir::Value>
diff --git a/flang/include/flang/Lower/LoweringOptions.def b/flang/include/flang/Lower/LoweringOptions.def
@@ -66,5 +66,8 @@ ENUM_LOWERINGOPT(RepackArraysWhole, unsigned, 1, 0)
 /// If true, CUDA Fortran runtime check is inserted.
 ENUM_LOWERINGOPT(CUDARuntimeCheck, unsigned, 1, 0)
 
+/// Enable coarrays feature.
+ENUM_LOWERINGOPT(CoarrayFeature, unsigned, 1, 0)
+
 #undef LOWERINGOPT
 #undef ENUM_LOWERINGOPT
diff --git a/flang/include/flang/Optimizer/Builder/IntrinsicCall.h b/flang/include/flang/Optimizer/Builder/IntrinsicCall.h
@@ -586,6 +586,12 @@ struct IntrinsicLibrary {
 
   void setResultMustBeFreed() { resultMustBeFreed = true; }
 
+  // Check support of coarray features
+  void checkCoarrayEnabled() {
+    if (converter && !converter->getLoweringOptions().getCoarrayFeature())
+      mlir::emitError(loc, "Coarrays disabled, use '-fcoarray' to enable.");
+  }
+
   fir::FirOpBuilder &builder;
   mlir::Location loc;
   bool resultMustBeFreed = false;
diff --git a/flang/include/flang/Optimizer/Builder/Runtime/Coarray.h b/flang/include/flang/Optimizer/Builder/Runtime/Coarray.h
@@ -62,6 +62,14 @@ void computeLastUcobound(fir::FirOpBuilder &builder, mlir::Location loc,
 void copy1DArrayToI64Array(fir::FirOpBuilder &builder, mlir::Location loc,
                            mlir::Value from, mlir::Value to);
 
+/// Generate Call to runtime prif_init
+mlir::Value genInitCoarray(fir::FirOpBuilder &builder, mlir::Location loc);
+
+/// Generate Call to runtime prif_stop
+void genStopCoarray(fir::FirOpBuilder &builder, mlir::Location loc,
+                    mlir::Value quiet = {}, mlir::Value stopCodeInt = {},
+                    mlir::Value stopCodeChar = {}, bool isError = false);
+
 /// Generate Call to runtime prif_num_images
 mlir::Value getNumImages(fir::FirOpBuilder &builder, mlir::Location loc);
 
diff --git a/flang/include/flang/Optimizer/Builder/Runtime/Main.h b/flang/include/flang/Optimizer/Builder/Runtime/Main.h
@@ -25,7 +25,7 @@ namespace fir::runtime {
 
 void genMain(fir::FirOpBuilder &builder, mlir::Location loc,
              const std::vector<Fortran::lower::EnvironmentDefault> &defs,
-             bool initCuda = false);
+             bool initCuda = false, bool initCoarrayEnv = false);
 }
 
 #endif // FORTRAN_OPTIMIZER_BUILDER_RUNTIME_MAIN_H
diff --git a/flang/include/flang/Runtime/coarray.h b/flang/include/flang/Runtime/coarray.h
@@ -12,8 +12,8 @@
 #include "flang/Common/ISO_Fortran_binding_wrapper.h"
 #include "flang/Runtime/c-or-cpp.h"
 #include "flang/Runtime/entry-names.h"
-#include <iostream>
 #include <map>
+#include <stdio.h>
 #include <stdlib.h>
 #include <tuple>
 #include <vector>
@@ -30,97 +30,6 @@ void RTNAME(Copy1DArrayToI64Array)(
     const Descriptor &from, const Descriptor &to);
 } // namespace Fortran::runtime
 
-// FIXME: Removing all declaration later
-// Unimplemented prif runtime functions
-#define DECLARE_UNIMPLEMENTED_PRIF(func_name, ...) \
-  void _QMprifPprif_##func_name(__VA_ARGS__) { \
-    std::fprintf(stderr, "unimplemented feature : prif_" #func_name "\n"); \
-    std::exit(EXIT_FAILURE); \
-  }
-
-DECLARE_UNIMPLEMENTED_PRIF(init, void *)
-DECLARE_UNIMPLEMENTED_PRIF(stop, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(fail_image, void)
-DECLARE_UNIMPLEMENTED_PRIF(this_image_no_coarray, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(this_image_with_coarray, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(this_image_with_dim, void *, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(num_images, void *)
-DECLARE_UNIMPLEMENTED_PRIF(num_images_with_team, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(num_images_with_team_number, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(image_index, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(
-    image_index_with_team, void *, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(
-    image_index_with_team_number, void *, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(image_status, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(coshape, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(lcobound_no_dim, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(lcobound_with_dim, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(ucobound_no_dim, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(ucobound_with_dim, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(allocate_coarray, void *, void *, void *, void *,
-    void *, void *, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(deallocate_coarray, void *, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(sync_memory, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(sync_all, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(sync_images, void *, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(sync_team, void *, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(
-    lock, void *, void *, void *, void *, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(
-    unlock, void *, void *, void *, void *, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(
-    get, void *, void *, void *, void *, void *, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(get_stridded, void *, void *, void *, void *, void *,
-    void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(
-    put, void *, void *, void *, void *, void *, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(put_stridded, void *, void *, void *, void *, void *,
-    void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(co_broadcast, void *, void *, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(co_max, void *, void *, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(
-    co_max_character, void *, void *, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(co_min, void *, void *, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(
-    co_min_character, void *, void *, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(co_sum, void *, void *, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(atomic_add, void *, void *, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(atomic_and, void *, void *, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(atomic_or, void *, void *, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(atomic_xor, void *, void *, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(
-    atomic_fetch_add, void *, void *, void *, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(
-    atomic_fetch_and, void *, void *, void *, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(
-    atomic_fetch_or, void *, void *, void *, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(
-    atomic_fetch_xor, void *, void *, void *, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(
-    atomic_cas_int, void *, void *, void *, void *, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(
-    atomic_cas_logical, void *, void *, void *, void *, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(
-    atomic_define_int, void *, void *, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(
-    atomic_define_logical, void *, void *, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(
-    atomic_ref_int, void *, void *, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(
-    atomic_ref_logical, void *, void *, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(
-    form_team, void *, void *, void *, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(get_team, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(team_number, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(change_team, void *, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(end_team, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(
-    event_post, void *, void *, void *, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(event_query, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(event_wait, void *, void *, void *, void *, void *)
-DECLARE_UNIMPLEMENTED_PRIF(notify_wait, void *, void *, void *, void *, void *)
-
 FORTRAN_EXTERN_C_END
 
 #endif // FORTRAN_RUNTIME_PRIF_H_
diff --git a/flang/lib/Frontend/CompilerInvocation.cpp b/flang/lib/Frontend/CompilerInvocation.cpp
@@ -1120,6 +1120,10 @@ static bool parseDialectArgs(CompilerInvocation &res, llvm::opt::ArgList &args,
       diags.Report(diagID);
     }
   }
+  // -fcoarray
+  if (args.hasArg(clang::driver::options::OPT_fcoarray))
+    res.getLoweringOpts().setCoarrayFeature(1);
+
   return diags.getNumErrors() == numErrorsBefore;
 }
 
diff --git a/flang/lib/Lower/Bridge.cpp b/flang/lib/Lower/Bridge.cpp
@@ -461,7 +461,8 @@ class FirConverter : public Fortran::lower::AbstractConverter {
         fir::runtime::genMain(*builder, toLocation(),
                               bridge.getEnvironmentDefaults(),
                               getFoldingContext().languageFeatures().IsEnabled(
-                                  Fortran::common::LanguageFeature::CUDA));
+                                  Fortran::common::LanguageFeature::CUDA),
+                              getLoweringOptions().getCoarrayFeature());
       });
 
     finalizeOpenMPLowering(globalOmpRequiresSymbol);
diff --git a/flang/lib/Lower/Coarray.cpp b/flang/lib/Lower/Coarray.cpp
@@ -66,6 +66,7 @@ void Fortran::lower::genChangeTeamStmt(
     Fortran::lower::pft::Evaluation &,
     const Fortran::parser::ChangeTeamStmt &stmt) {
   mlir::Location loc = converter.getCurrentLocation();
+  Fortran::lower::checkCoarrayFeatureEnabled(converter, loc);
   fir::FirOpBuilder &builder = converter.getFirOpBuilder();
 
   mlir::Value errMsg, stat, team;
@@ -108,6 +109,7 @@ void Fortran::lower::genEndChangeTeamStmt(
     Fortran::lower::pft::Evaluation &,
     const Fortran::parser::EndChangeTeamStmt &stmt) {
   mlir::Location loc = converter.getCurrentLocation();
+  Fortran::lower::checkCoarrayFeatureEnabled(converter, loc);
   fir::FirOpBuilder &builder = converter.getFirOpBuilder();
 
   mlir::Value errMsg, stat;
@@ -145,6 +147,7 @@ void Fortran::lower::genFormTeamStatement(
     Fortran::lower::pft::Evaluation &,
     const Fortran::parser::FormTeamStmt &stmt) {
   mlir::Location loc = converter.getCurrentLocation();
+  Fortran::lower::checkCoarrayFeatureEnabled(converter, loc);
   fir::FirOpBuilder &builder = converter.getFirOpBuilder();
 
   mlir::Value errMsg, stat, newIndex, teamNumber, team;
@@ -360,6 +363,12 @@ Fortran::lower::genCoSubscripts(Fortran::lower::AbstractConverter &converter,
   return imageIndex;
 }
 
+void Fortran::lower::checkCoarrayFeatureEnabled(AbstractConverter &converter,
+                                                mlir::Location loc) {
+  if (!converter.getLoweringOptions().getCoarrayFeature())
+    mlir::emitError(loc, "Coarrays disabled, use '-fcoarray' to enable");
+}
+
 std::pair<mlir::Value, mlir::Value>
 Fortran::lower::genCoarrayCoBounds(Fortran::lower::AbstractConverter &converter,
                                    mlir::Location loc,
@@ -626,6 +635,7 @@ mlir::Value Fortran::lower::genAllocateCoarray(
     Fortran::lower::AbstractConverter &converter, mlir::Location loc,
     const Fortran::semantics::Symbol &sym, fir::MutableBoxValue box,
     llvm::SmallVector<mlir::Value> extents, mlir::Value errMsgAddr) {
+  Fortran::lower::checkCoarrayFeatureEnabled(converter, loc);
   fir::FirOpBuilder &builder = converter.getFirOpBuilder();
 
   // Handle LCOBOUNDS and UCOBOUNDS form the Fortran::semantics::Symbol
@@ -666,6 +676,7 @@ std::pair<mlir::Value, mlir::Value> Fortran::lower::genAllocateCoarray(
     Fortran::lower::AbstractConverter &converter, mlir::Location loc,
     const Fortran::semantics::Symbol &sym, mlir::Type allocType,
     llvm::SmallVector<mlir::Value> extents) {
+  Fortran::lower::checkCoarrayFeatureEnabled(converter, loc);
   fir::FirOpBuilder &builder = converter.getFirOpBuilder();
 
   // Handle LCOBOUNDS and UCOBOUNDS form the Fortran::semantics::Symbol
diff --git a/flang/lib/Lower/Runtime.cpp b/flang/lib/Lower/Runtime.cpp
@@ -107,6 +107,7 @@ void Fortran::lower::genStopStatement(
   mlir::func::FuncOp callee;
   mlir::FunctionType calleeType;
   // First operand is stop code (zero if absent)
+  mlir::Value stopCodeInt, stopCodeChar;
   if (const auto &code =
           std::get<std::optional<Fortran::parser::StopCode>>(stmt.t)) {
     auto expr =
@@ -123,6 +124,7 @@ void Fortran::lower::genStopStatement(
               builder.createConvert(loc, calleeType.getInput(0), x.getAddr()));
           operands.push_back(
               builder.createConvert(loc, calleeType.getInput(1), x.getLen()));
+          stopCodeChar = x.getAddr();
         },
         [&](fir::UnboxedValue x) {
           callee = fir::runtime::getRuntimeFunc<mkRTKey(StopStatement)>(
@@ -131,6 +133,7 @@ void Fortran::lower::genStopStatement(
           mlir::Value cast =
               builder.createConvert(loc, calleeType.getInput(0), x);
           operands.push_back(cast);
+          stopCodeInt = x;
         },
         [&](auto) {
           mlir::emitError(loc, "unhandled expression in STOP");
@@ -149,18 +152,26 @@ void Fortran::lower::genStopStatement(
       loc, calleeType.getInput(operands.size()), isError));
 
   // Third operand indicates QUIET (default to false).
+  mlir::Value q;
   if (const auto &quiet =
           std::get<std::optional<Fortran::parser::ScalarLogicalExpr>>(stmt.t)) {
     const SomeExpr *expr = Fortran::semantics::GetExpr(*quiet);
     assert(expr && "failed getting typed expression");
-    mlir::Value q = fir::getBase(converter.genExprValue(*expr, stmtCtx));
+    q = fir::getBase(converter.genExprValue(*expr, stmtCtx));
     operands.push_back(
         builder.createConvert(loc, calleeType.getInput(operands.size()), q));
+    q = fir::getBase(converter.genExprAddr(*expr, stmtCtx));
+    q = builder.createBox(loc, q);
   } else {
     operands.push_back(builder.createIntegerConstant(
         loc, calleeType.getInput(operands.size()), 0));
   }
 
+  if (converter.getLoweringOptions().getCoarrayFeature()) {
+    fir::runtime::genStopCoarray(builder, loc, q, stopCodeInt, stopCodeChar,
+                                 isError);
+  }
+
   builder.create<fir::CallOp>(loc, callee, operands);
   auto blockIsUnterminated = [&builder]() {
     mlir::Block *currentBlock = builder.getBlock();
@@ -252,6 +263,7 @@ void Fortran::lower::genEventPostStatement(
     Fortran::lower::AbstractConverter &converter,
     const Fortran::parser::EventPostStmt &stmt) {
   mlir::Location loc = converter.getCurrentLocation();
+  Fortran::lower::checkCoarrayFeatureEnabled(converter, loc);
   fir::FirOpBuilder &builder = converter.getFirOpBuilder();
   Fortran::lower::StatementContext stmtCtx;
 
@@ -287,6 +299,7 @@ void Fortran::lower::genEventWaitStatement(
     const Fortran::parser::EventWaitStmt &stmt) {
   fir::FirOpBuilder &builder = converter.getFirOpBuilder();
   mlir::Location loc = converter.getCurrentLocation();
+  Fortran::lower::checkCoarrayFeatureEnabled(converter, loc);
   Fortran::lower::StatementContext stmtCtx;
 
   // Handle STAT ,ERRMSG and UNTIL_COUNT
@@ -349,6 +362,7 @@ void Fortran::lower::genLockStatement(
     const Fortran::parser::LockStmt &stmt) {
   fir::FirOpBuilder &builder = converter.getFirOpBuilder();
   mlir::Location loc = converter.getCurrentLocation();
+  Fortran::lower::checkCoarrayFeatureEnabled(converter, loc);
   Fortran::lower::StatementContext stmtCtx;
 
   // Handle LOCK_VAR and REMOTE_IMAGE values
@@ -409,6 +423,7 @@ void Fortran::lower::genUnlockStatement(
     const Fortran::parser::UnlockStmt &stmt) {
   fir::FirOpBuilder &builder = converter.getFirOpBuilder();
   mlir::Location loc = converter.getCurrentLocation();
+  Fortran::lower::checkCoarrayFeatureEnabled(converter, loc);
   Fortran::lower::StatementContext stmtCtx;
 
   // Handle STAT and ERRMSG values
@@ -446,6 +461,7 @@ void Fortran::lower::genSyncAllStatement(
     Fortran::lower::AbstractConverter &converter,
     const Fortran::parser::SyncAllStmt &stmt) {
   mlir::Location loc = converter.getCurrentLocation();
+  Fortran::lower::checkCoarrayFeatureEnabled(converter, loc);
 
   // Handle STAT and ERRMSG values
   const std::list<Fortran::parser::StatOrErrmsg> &statOrErrList = stmt.v;
@@ -494,6 +510,7 @@ void Fortran::lower::genSyncMemoryStatement(
     Fortran::lower::AbstractConverter &converter,
     const Fortran::parser::SyncMemoryStmt &stmt) {
   mlir::Location loc = converter.getCurrentLocation();
+  Fortran::lower::checkCoarrayFeatureEnabled(converter, loc);
 
   // Handle STAT and ERRMSG values
   const std::list<Fortran::parser::StatOrErrmsg> &statOrErrList = stmt.v;
diff --git a/flang/lib/Optimizer/Builder/IntrinsicCall.cpp b/flang/lib/Optimizer/Builder/IntrinsicCall.cpp
diff --git a/flang/lib/Optimizer/Builder/Runtime/Coarray.cpp b/flang/lib/Optimizer/Builder/Runtime/Coarray.cpp
diff --git a/flang/lib/Optimizer/Builder/Runtime/Main.cpp b/flang/lib/Optimizer/Builder/Runtime/Main.cpp

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ namespace fir::runtime {`
`25`	`25`
`26`	`26`	`void genMain(fir::FirOpBuilder &builder, mlir::Location loc,`
`27`	`27`	`const std::vector<Fortran::lower::EnvironmentDefault> &defs,`
`28`		`- bool initCuda = false);`
	`28`	`+ bool initCuda = false, bool initCoarrayEnv = false);`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`#endif // FORTRAN_OPTIMIZER_BUILDER_RUNTIME_MAIN_H`
Original file line number	Diff line number	Diff line change
`@@ -1120,6 +1120,10 @@ static bool parseDialectArgs(CompilerInvocation &res, llvm::opt::ArgList &args,`
`1120`	`1120`	`diags.Report(diagID);`
`1121`	`1121`	`}`
`1122`	`1122`	`}`
	`1123`	`+ // -fcoarray`
	`1124`	`+ if (args.hasArg(clang::driver::options::OPT_fcoarray))`
	`1125`	`+ res.getLoweringOpts().setCoarrayFeature(1);`
	`1126`	`+`
`1123`	`1127`	`return diags.getNumErrors() == numErrorsBefore;`
`1124`	`1128`	`}`
`1125`	`1129`