Skip to content

[flang] Show types in DumpEvExpr #143743

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 18, 2025
Merged

[flang] Show types in DumpEvExpr #143743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
98f8ca7
[flang] Show types in DumpEvExpr
kparzysz Mar 24, 2025
d4d8095
format
kparzysz Jun 11, 2025
8babecf
Reorder declarations
kparzysz Jun 11, 2025
f29be61
Fix for MSVC
kparzysz Jun 11, 2025
f7a2234
Fix for MSVC
kparzysz Jun 16, 2025
375b7d0
Guard more code
kparzysz Jun 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 47 additions & 9 deletions flang/include/flang/Semantics/dump-expr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

#include <memory>
#include <optional>
#include <string>
#include <variant>
#include <vector>

Expand All @@ -38,6 +39,43 @@ class DumpEvaluateExpr {
}

private:
template <typename T> struct TypeOf {
static constexpr std::string_view get() {
#if defined(__GNUC__)
#define DUMP_EXPR_SHOW_TYPE
std::string_view v(__PRETTY_FUNCTION__);
// Extract the "xyz" from the "pretty function" string:
// "... [with T = xyz; std::string_view = ...]"
std::string_view front("with T = ");
std::string_view back("; std::string_view =");

#elif defined(_MSC_VER)
#define DUMP_EXPR_SHOW_TYPE
std::string_view v(__FUNCSIG__);
// Extract the "xyz" from the "pretty function" string:
// "...TypeOf<xyz>::get(void)"
std::string_view front("TypeOf<");
std::string_view back(">::get(void)");

#endif

#if defined(DUMP_EXPR_SHOW_TYPE)
#undef DUMP_EXPR_SHOW_TYPE
if (auto fpos{v.find(front)}; fpos != v.npos) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it not an issue for the #else case to contain code referencing variables that were not defined even if that is after the return ""; statement?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is fixed now.

v.remove_prefix(fpos + front.size());
if (auto bpos{v.find(back)}; bpos != v.npos) {
v.remove_suffix(v.size() - bpos);
return v;
}
}
#endif

return "";
}

static constexpr std::string_view name{TypeOf<T>::get()};
};

template <typename A, bool C> void Show(const common::Indirection<A, C> &x) {
Show(x.value());
}
Expand Down Expand Up @@ -76,15 +114,15 @@ class DumpEvaluateExpr {
void Show(const evaluate::NullPointer &);
template <typename T> void Show(const evaluate::Constant<T> &x) {
if constexpr (T::category == common::TypeCategory::Derived) {
Indent("derived constant");
Indent("derived constant "s + std::string(TypeOf<T>::name));
for (const auto &map : x.values()) {
for (const auto &pair : map) {
Show(pair.second.value());
}
}
Outdent();
} else {
Print("constant");
Print("constant "s + std::string(TypeOf<T>::name));
}
}
void Show(const Symbol &symbol);
Expand All @@ -102,7 +140,7 @@ class DumpEvaluateExpr {
void Show(const evaluate::Substring &x);
void Show(const evaluate::ComplexPart &x);
template <typename T> void Show(const evaluate::Designator<T> &x) {
Indent("designator");
Indent("designator "s + std::string(TypeOf<T>::name));
Show(x.u);
Outdent();
}
Expand All @@ -117,7 +155,7 @@ class DumpEvaluateExpr {
Outdent();
}
template <typename T> void Show(const evaluate::FunctionRef<T> &x) {
Indent("function ref");
Indent("function ref "s + std::string(TypeOf<T>::name));
Show(x.proc());
Show(x.arguments());
Outdent();
Expand All @@ -127,14 +165,14 @@ class DumpEvaluateExpr {
}
template <typename T>
void Show(const evaluate::ArrayConstructorValues<T> &x) {
Indent("array constructor value");
Indent("array constructor value "s + std::string(TypeOf<T>::name));
for (auto &v : x) {
Show(v);
}
Outdent();
}
template <typename T> void Show(const evaluate::ImpliedDo<T> &x) {
Indent("implied do");
Indent("implied do "s + std::string(TypeOf<T>::name));
Show(x.lower());
Show(x.upper());
Show(x.stride());
Expand All @@ -148,20 +186,20 @@ class DumpEvaluateExpr {
void Show(const evaluate::StructureConstructor &x);
template <typename D, typename R, typename O>
void Show(const evaluate::Operation<D, R, O> &op) {
Indent("unary op");
Indent("unary op "s + std::string(TypeOf<D>::name));
Show(op.left());
Outdent();
}
template <typename D, typename R, typename LO, typename RO>
void Show(const evaluate::Operation<D, R, LO, RO> &op) {
Indent("binary op");
Indent("binary op "s + std::string(TypeOf<D>::name));
Show(op.left());
Show(op.right());
Outdent();
}
void Show(const evaluate::Relational<evaluate::SomeType> &x);
template <typename T> void Show(const evaluate::Expr<T> &x) {
Indent("expr T");
Indent("expr <" + std::string(TypeOf<T>::name) + ">");
Show(x.u);
Outdent();
}
Expand Down
2 changes: 1 addition & 1 deletion flang/lib/Semantics/dump-expr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ void DumpEvaluateExpr::Show(const evaluate::StructureConstructor &x) {
}

void DumpEvaluateExpr::Show(const evaluate::Relational<evaluate::SomeType> &x) {
Indent("expr some type");
Indent("relational some type");
Show(x.u);
Outdent();
}
Expand Down
Loading