Lower elemental subroutine calls (outside of user assignment case)

flang/include/flang/Lower/ConvertExpr.h

@@ -186,6 +186,16 @@ createSomeArrayBox(AbstractConverter &converter,
                    const evaluate::Expr<evaluate::SomeType> &expr,
                    SymMap &symMap, StatementContext &stmtCtx);
 
+/// Lower a subroutine call. This handles both elemental and non elemental
+/// subroutines. \p isUserDefAssignment must be set if this is called in the
+/// context of a user defined assignment. For subroutines with alternate
+/// returns, the returned value indicates which label the code should jump to.
+/// The returned value is null otherwise.
+mlir::Value createSubroutineCall(AbstractConverter &converter,
+                                 const evaluate::Expr<evaluate::SomeType> &call,
+                                 SymMap &symMap, StatementContext &stmtCtx,
+                                 bool isUserDefAssignment);
+
 // Attribute for an alloca that is a trivial adaptor for converting a value to
 // pass-by-ref semantics for a VALUE parameter. The optimizer may be able to
 // eliminate these.

flang/lib/Lower/Bridge.cpp

@@ -662,7 +662,8 @@ class FirConverter : public Fortran::lower::AbstractConverter {
     assert(stmt.typedCall && "Call was not analyzed");
     // Call statement lowering shares code with function call lowering.
     Fortran::semantics::SomeExpr expr{*stmt.typedCall};
-    auto res = createFIRExpr(toLocation(), &expr, stmtCtx);
+    auto res = Fortran::lower::createSubroutineCall(
+        *this, expr, localSymbols, stmtCtx, /*isUserDefAssignment=*/false);
     if (!res)
       return; // "Normal" subroutine call.
     // Call with alternate return specifiers.
@@ -1939,11 +1940,13 @@ class FirConverter : public Fortran::lower::AbstractConverter {
             [&](const Fortran::evaluate::ProcedureRef &procRef) {
               if (implicitIterationSpace())
                 TODO(loc, "user defined assignment within WHERE");
+
               Fortran::semantics::SomeExpr expr{procRef};
-              createFIRExpr(toLocation(), &expr,
-                            explicitIterationSpace()
-                                ? explicitIterSpace.stmtContext()
-                                : stmtCtx);
+              auto &ctx = explicitIterationSpace()
+                              ? explicitIterSpace.stmtContext()
+                              : stmtCtx;
+              Fortran::lower::createSubroutineCall(
+                  *this, expr, localSymbols, ctx, /*isUserDefAssignment=*/true);
             },
 
             // [3] Pointer assignment with possibly empty bounds-spec. R1035: a