[flang] Changes from review

Original-commit: flang-compiler/f18@feafc0c216
Reviewed-on: https://github.com/flang-compiler/f18/pull/440

flang/lib/evaluate/call.cc

@@ -143,15 +143,14 @@ const Symbol *ProcedureDesignator::GetSymbol() const {
       u);
 }
 
-parser::CharBlock ProcedureDesignator::GetName() const {
+std::string ProcedureDesignator::GetName() const {
   return std::visit(
       common::visitors{
-          [](const SpecificIntrinsic &i) -> parser::CharBlock {
-            return i.name;
+          [](const SpecificIntrinsic &i) { return i.name; },
+          [](const Symbol *sym) { return sym->name().ToString(); },
+          [](const common::CopyableIndirection<Component> &c) {
+            return c.value().GetLastSymbol().name().ToString();
           },
-          [](const Symbol *sym) -> parser::CharBlock { return sym->name(); },
-          [](const common::CopyableIndirection<Component> &c)
-              -> parser::CharBlock { return c.value().GetLastSymbol().name(); },
       },
       u);
 }

flang/lib/evaluate/call.h

@@ -148,7 +148,7 @@ struct ProcedureDesignator {
   // Always null if the procedure is intrinsic.
   const Component *GetComponent() const;
 
-  parser::CharBlock GetName() const;
+  std::string GetName() const;
   std::optional<DynamicType> GetType() const;
   int Rank() const;
   bool IsElemental() const;

flang/lib/evaluate/shape.cc

@@ -18,6 +18,7 @@
 #include "traversal.h"
 #include "../common/idioms.h"
 #include "../common/template.h"
+#include "../parser/message.h"
 #include "../semantics/symbol.h"
 
 namespace Fortran::evaluate {

flang/lib/evaluate/shape.h

@@ -22,10 +22,13 @@
 #include "tools.h"
 #include "type.h"
 #include "../common/indirection.h"
-#include "../parser/message.h"
 #include <optional>
 #include <variant>
 
+namespace Fortran::parser {
+class ContextualMessages;
+}
+
 namespace Fortran::evaluate {
 
 class FoldingContext;