[flang] replace GenericExprWrapper with Expr<SomeType>

Original-commit: flang-compiler/f18@0821d00cb8b7499a7e98f4f402cf6b7ed29a825d
Reviewed-on: https://github.com/flang-compiler/f18/pull/354
Tree-same-pre-rewrite: false

diff --git a/flang/lib/FIR/afforestation.cc b/flang/lib/FIR/afforestation.cc
index 242a16b..f30262f 100644 (file)
--- a/flang/lib/FIR/afforestation.cc
+++ b/flang/lib/FIR/afforestation.cc
@@ -25,9 +25,9 @@
 
 namespace Fortran::FIR {
 namespace {
-Expression *ExprRef(const parser::Expr &a) { return a.typedExpr.get(); }
+Expression *ExprRef(const parser::Expr &a) { return a.typedExpr.get()->v; }
 Expression *ExprRef(const common::Indirection<parser::Expr> &a) {
-  return a.value().typedExpr.get();
+  return a.value().typedExpr.get()->v;
 }
 
 struct LinearOp;

diff --git a/flang/lib/FIR/common.h b/flang/lib/FIR/common.h
index cb964a3..05d3664 100644 (file)
--- a/flang/lib/FIR/common.h
+++ b/flang/lib/FIR/common.h
@@ -66,7 +66,7 @@ struct Attribute {
 using FunctionType = evaluate::SomeType;  // TODO: what should this be?
 using AttributeList = std::vector<Attribute>;
 enum struct LinkageTypes { Public, Hidden, External };
-using Expression = evaluate::GenericExprWrapper;
+using Expression = evaluate::Expr<evaluate::SomeType>;
 using Variable = const semantics::Symbol *;
 using PathVariable = const parser::Variable;
 using Scope = const semantics::Scope;

diff --git a/flang/lib/FIR/statements.cc b/flang/lib/FIR/statements.cc
index 41a3ad3..809967e 100644 (file)
--- a/flang/lib/FIR/statements.cc
+++ b/flang/lib/FIR/statements.cc
@@ -30,7 +30,7 @@ Addressable_impl *GetAddressable(Statement *stmt) {
 
 static std::string dump(const Expression &e) {
   std::stringstream stringStream;
-  e.v.AsFortran(stringStream);
+  e.AsFortran(stringStream);
   return stringStream.str();
 }