[Flang] Revert the fix of PR #80738 and re-implement it in a different way by adding a GenericDetails in GetTypeImpl.

Author: DanielCChen

flang/include/flang/Semantics/symbol.h

@@ -786,9 +786,6 @@ class Symbol {
   inline Symbol &GetUltimate();
   inline const Symbol &GetUltimate() const;
 
-  // Get the specific procedure from a potential generic symbol.
-  inline const Symbol *GetUltimateGeneric() const;
-
   inline DeclTypeSpec *GetType();
   inline const DeclTypeSpec *GetType() const;
   void SetType(const DeclTypeSpec &);
@@ -988,16 +985,6 @@ inline const Symbol &Symbol::GetUltimate() const {
   }
 }
 
-inline const Symbol *Symbol::GetUltimateGeneric() const {
-  if (this->has<GenericDetails>())
-    return this;
-  if (const auto *details{detailsIf<UseDetails>()})
-    return details->symbol().GetUltimateGeneric();
-  if (const auto *details{detailsIf<HostAssocDetails>()})
-    return details->symbol().GetUltimateGeneric();
-  return nullptr;
-}
-
 inline DeclTypeSpec *Symbol::GetType() {
   return const_cast<DeclTypeSpec *>(
       const_cast<const Symbol *>(this)->GetType());
@@ -1027,6 +1014,10 @@ inline const DeclTypeSpec *Symbol::GetTypeImpl(int depth) const {
           [&](const HostAssocDetails &x) {
             return x.symbol().GetTypeImpl(depth);
           },
+          [&](const GenericDetails &x) {
+            const Symbol *symbol{x.specific()};
+            return symbol ? symbol->GetTypeImpl(depth) : nullptr;
+          },
           [](const auto &) -> const DeclTypeSpec * { return nullptr; },
       },
       details_);

flang/lib/Semantics/resolve-names.cpp

@@ -5644,15 +5644,11 @@ void DeclarationVisitor::Post(const parser::ProcInterface &x) {
     NoteInterfaceName(*name);
   }
 }
-
 void DeclarationVisitor::Post(const parser::ProcDecl &x) {
   const auto &name{std::get<parser::Name>(x.t)};
   const Symbol *procInterface{nullptr};
   if (interfaceName_) {
-    const Symbol *ultimateGeneric{interfaceName_->symbol->GetUltimateGeneric()};
-    procInterface = ultimateGeneric
-        ? ultimateGeneric->get<GenericDetails>().specific()
-        : interfaceName_->symbol;
+    procInterface = interfaceName_->symbol;
   }
   auto attrs{HandleSaveName(name.source, GetAttrs())};
   DerivedTypeDetails *dtDetails{nullptr};