Fix missing terminator in user-defined assignment case.

Fix bug and examine arguments of elemental procedures.
Comments from review.
Fix shape differences between successive passes. Rip out some usage of
GetShape.
Throw away unused code left over from refactoring.
Fix tests.

Author: schweitzpgi

flang/include/flang/Lower/ConvertExpr.h

@@ -166,7 +166,6 @@ void createAllocatableArrayAssignment(
 /// is fully evaluated prior to being assigned back to a temporary array.
 fir::ExtendedValue
 createSomeArrayTempValue(AbstractConverter &converter,
-                         const std::optional<evaluate::Shape> &shape,
                          const evaluate::Expr<evaluate::SomeType> &expr,
                          SymMap &symMap, StatementContext &stmtCtx);
 

flang/include/flang/Optimizer/Builder/FIRBuilder.h

@@ -250,7 +250,7 @@ class FirOpBuilder : public mlir::OpBuilder {
   /// Construct one of the two forms of shape op from an array box.
   mlir::Value genShape(mlir::Location loc, const fir::AbstractArrayBox &arr);
   mlir::Value genShape(mlir::Location loc, llvm::ArrayRef<mlir::Value> shift,
-                        llvm::ArrayRef<mlir::Value> exts);
+                       llvm::ArrayRef<mlir::Value> exts);
   mlir::Value genShape(mlir::Location loc, llvm::ArrayRef<mlir::Value> exts);
 
   /// Create one of the shape ops given an extended value. For a boxed value,
@@ -340,6 +340,12 @@ class FirOpBuilder : public mlir::OpBuilder {
   /// Generate code testing \p addr is a null address.
   mlir::Value genIsNull(mlir::Location loc, mlir::Value addr);
 
+  /// Compute the extent of (lb:ub:step) as max((ub-lb+step)/step, 0). See
+  /// Fortran 2018 9.5.3.3.2 section for more details.
+  mlir::Value genExtentFromTriplet(mlir::Location loc, mlir::Value lb,
+                                   mlir::Value ub, mlir::Value step,
+                                   mlir::Type type);
+
 private:
   const KindMapping &kindMap;
 };
@@ -454,11 +460,6 @@ void genRecordAssignment(fir::FirOpBuilder &builder, mlir::Location loc,
                          const fir::ExtendedValue &lhs,
                          const fir::ExtendedValue &rhs);
 
-/// Compute the extent of (lb:ub:step) as max((ub-lb+step)/step, 0). See Fortran
-/// 2018 9.5.3.3.2 section for more details.
-mlir::Value computeTripletExtent(fir::FirOpBuilder &builder, mlir::Location loc,
-                                 mlir::Value lb, mlir::Value ub,
-                                 mlir::Value step, mlir::Type type);
 } // namespace fir::factory
 
 #endif // FORTRAN_OPTIMIZER_BUILDER_FIRBUILDER_H

flang/include/flang/Optimizer/Dialect/FIRType.h

@@ -162,6 +162,16 @@ inline bool sequenceWithNonConstantShape(fir::SequenceType seqTy) {
 /// Returns true iff the type `t` does not have a constant size.
 bool hasDynamicSize(mlir::Type t);
 
+inline unsigned getRankOfShapeType(mlir::Type t) {
+  if (auto shTy = t.dyn_cast<fir::ShapeType>())
+    return shTy.getRank();
+  if (auto shTy = t.dyn_cast<fir::ShapeShiftType>())
+    return shTy.getRank();
+  if (auto shTy = t.dyn_cast<fir::ShiftType>())
+    return shTy.getRank();
+  return 0;
+}
+
 /// If `t` is a SequenceType return its element type, otherwise return `t`.
 inline mlir::Type unwrapSequenceType(mlir::Type t) {
   if (auto seqTy = t.dyn_cast<fir::SequenceType>())

flang/lib/Lower/Bridge.cpp

@@ -1947,6 +1947,9 @@ class FirConverter : public Fortran::lower::AbstractConverter {
                               : stmtCtx;
               Fortran::lower::createSubroutineCall(
                   *this, expr, localSymbols, ctx, /*isUserDefAssignment=*/true);
+              if (explicitIterationSpace())
+                builder->create<fir::ResultOp>(
+                    loc, explicitIterSpace.getInnerArgs());
             },
 
             // [3] Pointer assignment with possibly empty bounds-spec. R1035: a