Addressed review comments.

Author: vzakhari

clang/include/clang/Driver/Options.td

@@ -6974,7 +6974,7 @@ defm repack_arrays
                     " non-contiguous assumed shape dummy arrays into "
                     "contiguous memory">>,
       DocBrief<[{Create temporary copies of non-contiguous assumed shape dummy
-arrays in subprogram prologues, and destroy them in subprotram epilogues.
+arrays in subprogram prologues, and destroy them in subprogram epilogues.
 The temporary copy is initialized with values from the original array
 in the prologue, if needed. In the epilogue, the current values
 in the temporary array are copied into the original array, if needed.
@@ -7037,7 +7037,7 @@ defm stack_repack_arrays
       DocBrief<[{Controls whether the array temporaries created under
 **-frepack-arrays** are allocated on the stack or on the heap.
 
-By default, the heap is used. Allocations of the polymorphic types
+By default, the heap is used. Allocations of polymorphic types
 are always done on the heap, though this may change in future releases.
   }]>;
 

flang/include/flang/Lower/LoweringOptions.def

@@ -48,10 +48,6 @@ ENUM_LOWERINGOPT(ReallocateLHS, unsigned, 1, 1)
 /// On by default.
 ENUM_LOWERINGOPT(InitGlobalZero, unsigned, 1, 1)
 
-/// If true, the arrays of unknown size and array temporaries
-/// are requested to be allocated in stack memory.
-ENUM_LOWERINGOPT(StackArrays, unsigned, 1, 0)
-
 /// If true, the dummy assumed shape arrays are conditionally
 /// packed into contiguous memory.
 ENUM_LOWERINGOPT(RepackArrays, unsigned, 1, 0)

flang/lib/Frontend/CompilerInvocation.cpp

@@ -1728,7 +1728,6 @@ void CompilerInvocation::setLoweringOptions() {
   const Fortran::common::LangOptions &langOptions = getLangOpts();
   loweringOpts.setIntegerWrapAround(langOptions.getSignedOverflowBehavior() ==
                                     Fortran::common::LangOptions::SOB_Defined);
-  loweringOpts.setStackArrays(codegenOpts.StackArrays);
   Fortran::common::MathOptionsBase &mathOpts = loweringOpts.getMathOptions();
   // TODO: when LangOptions are finalized, we can represent
   //       the math related options using Fortran::commmon::MathOptionsBase,

flang/test/Driver/frepack-arrays-contiguity.f90

@@ -1,8 +1,11 @@
-! Test forwarding just the forwarding of -frepack-arrays-contiguity options:
+! Test forwarding of -frepack-arrays-contiguity options:
 ! RUN: %flang -frepack-arrays-contiguity=whole %s -### -fsyntax-only 2>&1 | FileCheck --check-prefix=WHOLECMD %s
 ! RUN: %flang -frepack-arrays-contiguity=innermost %s -### -fsyntax-only 2>&1 | FileCheck --check-prefix=INNERMOSTCMD %s
 ! RUN: %flang -frepack-arrays-contiguity=innermost -frepack-arrays-contiguity=whole %s -### -fsyntax-only 2>&1 | FileCheck --check-prefix=WHOLECMD %s
 ! RUN: %flang -frepack-arrays-contiguity=whole -frepack-arrays-contiguity=innermost %s -### -fsyntax-only 2>&1 | FileCheck --check-prefix=INNERMOSTCMD %s
+! RUN: not %flang -frepack-arrays-contiguity= -frepack-arrays-contiguity=innermost %s -### -fsyntax-only 2>&1 | FileCheck --check-prefix=ERROR %s
+! RUN: not %flang -frepack-arrays-contiguity=whole3 -frepack-arrays-contiguity=innermost %s -### -fsyntax-only 2>&1 | FileCheck --check-prefix=ERROR %s
+! RUN: not %flang -frepack-arrays-contiguity=innermostg -frepack-arrays-contiguity=innermost %s -### -fsyntax-only 2>&1 | FileCheck --check-prefix=ERROR %s
 
 ! Test proper setting of the lowering options:
 ! RUN: %flang_fc1 -frepack-arrays -frepack-arrays-contiguity=whole %s -emit-hlfir -o - | FileCheck --check-prefix=WHOLE %s
@@ -13,6 +16,8 @@
 ! Default setting is 'innermost':
 ! RUN: %flang_fc1 -frepack-arrays %s -emit-hlfir -o - | FileCheck --check-prefix=INNERMOST %s
 
+! ERROR: error: unsupported argument '{{.*}}' to option '-frepack-arrays-contiguity='
+
 ! WHOLECMD: "-fc1"{{.*}}"-frepack-arrays-contiguity=whole"
 ! INNERMOSTCMD: "-fc1"{{.*}}"-frepack-arrays-contiguity=innermost"
 

flang/test/Driver/frepack-arrays.f90

@@ -1,4 +1,4 @@
-! Test forwarding just the forwarding of -f[no-]repack-arrays options:
+! Test forwarding of -f[no-]repack-arrays options:
 ! RUN: %flang -frepack-arrays %s -### -fsyntax-only 2>&1 | FileCheck --check-prefix=REPACKCMD %s
 ! RUN: %flang -fno-repack-arrays %s -### -fsyntax-only 2>&1 | FileCheck --check-prefix=NOREPACKCMD %s
 ! RUN: %flang -frepack-arrays -fno-repack-arrays %s -### -fsyntax-only 2>&1 | FileCheck --check-prefix=NOREPACKCMD %s

flang/test/Driver/fstack-repack-arrays.f90

@@ -1,4 +1,4 @@
-! Test forwarding just the forwarding of -f[no-]stack-repack-arrays options:
+! Test forwarding of -f[no-]stack-repack-arrays options:
 ! RUN: %flang -fstack-repack-arrays %s -### -fsyntax-only 2>&1 | FileCheck --check-prefix=STACKCMD %s
 ! RUN: %flang -fno-stack-repack-arrays %s -### -fsyntax-only 2>&1 | FileCheck --check-prefix=HEAPCMD %s
 ! RUN: %flang -fstack-repack-arrays -fno-stack-repack-arrays %s -### -fsyntax-only 2>&1 | FileCheck --check-prefix=HEAPCMD %s

flang/tools/bbc/bbc.cpp

@@ -251,14 +251,6 @@ static llvm::cl::opt<bool>
                                  "the LHS of the intrinsic assignment"),
                   llvm::cl::init(true));
 
-// TODO: -fstack-arrays is currently unused, but it should probably be used
-// for deciding how arrays/temporaries are allocated during lowering.
-static llvm::cl::opt<bool>
-    stackArrays("fstack-arrays",
-                llvm::cl::desc("Allocate all arrays of unknown size and "
-                               "temporary arrays in stack memory"),
-                llvm::cl::init(false));
-
 static llvm::cl::opt<bool> stackRepackArrays(
     "fstack-repack-arrays",
     llvm::cl::desc("Allocate temporary arrays for -frepack-arrays "
@@ -434,7 +426,6 @@ static llvm::LogicalResult convertFortranSourceToMLIR(
   loweringOptions.setIntegerWrapAround(integerWrapAround);
   loweringOptions.setInitGlobalZero(initGlobalZero);
   loweringOptions.setReallocateLHS(reallocateLHS);
-  loweringOptions.setStackArrays(stackArrays);
   loweringOptions.setStackRepackArrays(stackRepackArrays);
   loweringOptions.setRepackArrays(repackArrays);
   loweringOptions.setRepackArraysWhole(repackArraysWhole);