From c221d6420687660b5d03df7051e5501a51a339c6 Mon Sep 17 00:00:00 2001
From: Krzysztof Parzyszek <Krzysztof.Parzyszek@amd.com>
Date: Mon, 24 Mar 2025 18:26:57 -0500
Subject: [PATCH] [flang] Remove mentions of evaluate::Variable<T> (#132805)

The template itself was not defined anywhere. The closest thing was a
forward declaration in flang/include/flang/Evaluate/variable.h.
---
 flang/include/flang/Evaluate/traverse.h   | 3 ---
 flang/include/flang/Evaluate/variable.h   | 1 -
 flang/include/flang/Semantics/dump-expr.h | 5 -----
 flang/lib/Lower/IterationSpace.cpp        | 4 ----
 4 files changed, 13 deletions(-)

diff --git a/flang/include/flang/Evaluate/traverse.h b/flang/include/flang/Evaluate/traverse.h
index dd38d64bff63..9bb677e51537 100644
--- a/flang/include/flang/Evaluate/traverse.h
+++ b/flang/include/flang/Evaluate/traverse.h
@@ -159,9 +159,6 @@ public:
   template <typename T> Result operator()(const Designator<T> &x) const {
     return visitor_(x.u);
   }
-  template <typename T> Result operator()(const Variable<T> &x) const {
-    return visitor_(x.u);
-  }
   Result operator()(const DescriptorInquiry &x) const {
     return visitor_(x.base());
   }
diff --git a/flang/include/flang/Evaluate/variable.h b/flang/include/flang/Evaluate/variable.h
index 9b597d29813d..7f1518fd26e7 100644
--- a/flang/include/flang/Evaluate/variable.h
+++ b/flang/include/flang/Evaluate/variable.h
@@ -44,7 +44,6 @@ using SymbolVector = std::vector<SymbolRef>;
 
 // Forward declarations
 struct DataRef;
-template <typename T> struct Variable;
 
 // Reference a base object in memory.  This can be a Fortran symbol,
 // static data (e.g., CHARACTER literal), or compiler-created temporary.
diff --git a/flang/include/flang/Semantics/dump-expr.h b/flang/include/flang/Semantics/dump-expr.h
index 54c41300ecf3..2f445429a10b 100644
--- a/flang/include/flang/Semantics/dump-expr.h
+++ b/flang/include/flang/Semantics/dump-expr.h
@@ -106,11 +106,6 @@ private:
     Show(x.u);
     Outdent();
   }
-  template <typename T> void Show(const evaluate::Variable<T> &x) {
-    Indent("variable");
-    Show(x.u);
-    Outdent();
-  }
   void Show(const evaluate::DescriptorInquiry &x);
   void Show(const evaluate::SpecificIntrinsic &);
   void Show(const evaluate::ProcedureDesignator &x);
diff --git a/flang/lib/Lower/IterationSpace.cpp b/flang/lib/Lower/IterationSpace.cpp
index b011b3ab9a24..203fec508f79 100644
--- a/flang/lib/Lower/IterationSpace.cpp
+++ b/flang/lib/Lower/IterationSpace.cpp
@@ -165,10 +165,6 @@ private:
   RT find(const Fortran::evaluate::Designator<T> &x) {
     return find(x.u);
   }
-  template <typename T>
-  RT find(const Fortran::evaluate::Variable<T> &x) {
-    return find(x.u);
-  }
   RT find(const Fortran::evaluate::DescriptorInquiry &) { return {}; }
   RT find(const Fortran::evaluate::SpecificIntrinsic &) { return {}; }
   RT find(const Fortran::evaluate::ProcedureDesignator &x) { return {}; }