Merge pull request #1000 from flang-compiler/jpr-elemental-explicit-result

Lower elemental character function and elemental internal procedure

Author: jeanPerier

flang/include/flang/Lower/CallInterface.h

@@ -28,6 +28,7 @@
 #define FORTRAN_LOWER_CALLINTERFACE_H
 
 #include "flang/Common/reference.h"
+#include "flang/Evaluate/characteristics.h"
 #include "mlir/IR/BuiltinOps.h"
 #include <memory>
 #include <optional>
@@ -40,19 +41,6 @@ namespace mlir {
 class Location;
 }
 
-namespace Fortran::evaluate {
-class ProcedureRef;
-struct ProcedureDesignator;
-class ActualArgument;
-template <typename T>
-class Expr;
-struct SomeType;
-namespace characteristics {
-struct Procedure;
-struct DummyArgument;
-} // namespace characteristics
-} // namespace Fortran::evaluate
-
 namespace Fortran::lower {
 class AbstractConverter;
 class SymMap;
@@ -238,7 +226,8 @@ class CallInterface {
   Fortran::lower::AbstractConverter &converter;
   /// Store characteristic once created, it is required for further information
   /// (e.g. getting the length of character result)
-  std::unique_ptr<Fortran::evaluate::characteristics::Procedure> characteristic;
+  std::optional<Fortran::evaluate::characteristics::Procedure> characteristic =
+      std::nullopt;
 };
 
 //===----------------------------------------------------------------------===//

flang/lib/Lower/CallInterface.cpp

@@ -8,7 +8,6 @@
 
 #include "flang/Lower/CallInterface.h"
 #include "StatementContext.h"
-#include "flang/Evaluate/characteristics.h"
 #include "flang/Evaluate/fold.h"
 #include "flang/Lower/Bridge.h"
 #include "flang/Lower/FIRBuilder.h"
@@ -347,9 +346,7 @@ static void addSymbolAttribute(mlir::FuncOp func,
 template <typename T>
 void Fortran::lower::CallInterface<T>::declare() {
   if (!side().isMainProgram()) {
-    characteristic =
-        std::make_unique<Fortran::evaluate::characteristics::Procedure>(
-            side().characterize());
+    characteristic.emplace(side().characterize());
     auto isImplicit = characteristic->CanBeCalledViaImplicitInterface();
     determineInterface(isImplicit, *characteristic);
   }