Skip to content

Commit de25eac

Browse files
schweitzpgischweitzpgi
committed
Make the dumper more accessible from gdb.
1 parent 374aaf6 commit de25eac

File tree

2 files changed

+93
-59
lines changed

2 files changed

+93
-59
lines changed

‎flang/include/flang/Lower/EvExprDumper.h

Lines changed: 58 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -25,62 +25,62 @@ class DumpEvaluateExpr {
2525
DumpEvaluateExpr(llvm::raw_ostream &str) : outs(str) {}
2626

2727
template <typename A>
28-
LLVM_DUMP_METHOD static void dump(const A &x) {
28+
static void dump(const A &x) {
2929
DumpEvaluateExpr{}.show(x);
3030
}
3131
template <typename A>
32-
LLVM_DUMP_METHOD static void dump(llvm::raw_ostream &stream, const A &x) {
32+
static void dump(llvm::raw_ostream &stream, const A &x) {
3333
DumpEvaluateExpr{stream}.show(x);
3434
}
3535

3636
private:
3737
template <typename A, bool C>
38-
LLVM_DUMP_METHOD void show(const Fortran::common::Indirection<A, C> &x) {
38+
void show(const Fortran::common::Indirection<A, C> &x) {
3939
show(x.value());
4040
}
4141
template <typename A>
42-
LLVM_DUMP_METHOD void show(const Fortran::semantics::SymbolRef x) {
42+
void show(const Fortran::semantics::SymbolRef x) {
4343
show(*x);
4444
}
4545
template <typename A>
46-
LLVM_DUMP_METHOD void show(const std::unique_ptr<A> &x) {
46+
void show(const std::unique_ptr<A> &x) {
4747
show(x.get());
4848
}
4949
template <typename A>
50-
LLVM_DUMP_METHOD void show(const std::shared_ptr<A> &x) {
50+
void show(const std::shared_ptr<A> &x) {
5151
show(x.get());
5252
}
5353
template <typename A>
54-
LLVM_DUMP_METHOD void show(const A *x) {
54+
void show(const A *x) {
5555
if (x) {
5656
show(*x);
5757
return;
5858
}
5959
print("nullptr");
6060
}
6161
template <typename A>
62-
LLVM_DUMP_METHOD void show(const std::optional<A> &x) {
62+
void show(const std::optional<A> &x) {
6363
if (x) {
6464
show(*x);
6565
return;
6666
}
6767
print("None");
6868
}
6969
template <typename... A>
70-
LLVM_DUMP_METHOD void show(const std::variant<A...> &u) {
70+
void show(const std::variant<A...> &u) {
7171
std::visit([&](const auto &v) { show(v); }, u);
7272
}
7373
template <typename A>
74-
LLVM_DUMP_METHOD void show(const std::vector<A> &x) {
74+
void show(const std::vector<A> &x) {
7575
indent("vector");
7676
for (const auto &v : x)
7777
show(v);
7878
outdent();
7979
}
80-
LLVM_DUMP_METHOD void show(const Fortran::evaluate::BOZLiteralConstant &);
81-
LLVM_DUMP_METHOD void show(const Fortran::evaluate::NullPointer &);
80+
void show(const Fortran::evaluate::BOZLiteralConstant &);
81+
void show(const Fortran::evaluate::NullPointer &);
8282
template <typename T>
83-
LLVM_DUMP_METHOD void show(const Fortran::evaluate::Constant<T> &x) {
83+
void show(const Fortran::evaluate::Constant<T> &x) {
8484
if constexpr (T::category == Fortran::common::TypeCategory::Derived) {
8585
indent("derived constant");
8686
for (const auto &map : x.values())
@@ -91,103 +91,99 @@ class DumpEvaluateExpr {
9191
print("constant");
9292
}
9393
}
94-
LLVM_DUMP_METHOD void show(const Fortran::semantics::Symbol &symbol);
95-
LLVM_DUMP_METHOD void show(const Fortran::evaluate::StaticDataObject &);
96-
LLVM_DUMP_METHOD void show(const Fortran::evaluate::ImpliedDoIndex &);
97-
LLVM_DUMP_METHOD void show(const Fortran::evaluate::BaseObject &x);
98-
LLVM_DUMP_METHOD void show(const Fortran::evaluate::Component &x);
99-
LLVM_DUMP_METHOD void show(const Fortran::evaluate::NamedEntity &x);
100-
LLVM_DUMP_METHOD void show(const Fortran::evaluate::TypeParamInquiry &x);
101-
LLVM_DUMP_METHOD void show(const Fortran::evaluate::Triplet &x);
102-
LLVM_DUMP_METHOD void show(const Fortran::evaluate::Subscript &x);
103-
LLVM_DUMP_METHOD void show(const Fortran::evaluate::ArrayRef &x);
104-
LLVM_DUMP_METHOD void show(const Fortran::evaluate::CoarrayRef &x);
105-
LLVM_DUMP_METHOD void show(const Fortran::evaluate::DataRef &x);
106-
LLVM_DUMP_METHOD void show(const Fortran::evaluate::Substring &x);
107-
LLVM_DUMP_METHOD void show(const Fortran::evaluate::ComplexPart &x);
94+
void show(const Fortran::semantics::Symbol &symbol);
95+
void show(const Fortran::evaluate::StaticDataObject &);
96+
void show(const Fortran::evaluate::ImpliedDoIndex &);
97+
void show(const Fortran::evaluate::BaseObject &x);
98+
void show(const Fortran::evaluate::Component &x);
99+
void show(const Fortran::evaluate::NamedEntity &x);
100+
void show(const Fortran::evaluate::TypeParamInquiry &x);
101+
void show(const Fortran::evaluate::Triplet &x);
102+
void show(const Fortran::evaluate::Subscript &x);
103+
void show(const Fortran::evaluate::ArrayRef &x);
104+
void show(const Fortran::evaluate::CoarrayRef &x);
105+
void show(const Fortran::evaluate::DataRef &x);
106+
void show(const Fortran::evaluate::Substring &x);
107+
void show(const Fortran::evaluate::ComplexPart &x);
108108
template <typename T>
109-
LLVM_DUMP_METHOD void show(const Fortran::evaluate::Designator<T> &x) {
109+
void show(const Fortran::evaluate::Designator<T> &x) {
110110
indent("designator");
111111
show(x.u);
112112
outdent();
113113
}
114114
template <typename T>
115-
LLVM_DUMP_METHOD void show(const Fortran::evaluate::Variable<T> &x) {
115+
void show(const Fortran::evaluate::Variable<T> &x) {
116116
indent("variable");
117117
show(x.u);
118118
outdent();
119119
}
120-
LLVM_DUMP_METHOD void show(const Fortran::evaluate::DescriptorInquiry &x);
121-
LLVM_DUMP_METHOD void show(const Fortran::evaluate::SpecificIntrinsic &);
122-
LLVM_DUMP_METHOD void show(const Fortran::evaluate::ProcedureDesignator &x);
123-
LLVM_DUMP_METHOD void show(const Fortran::evaluate::ActualArgument &x);
124-
LLVM_DUMP_METHOD void show(const Fortran::evaluate::ProcedureRef &x) {
120+
void show(const Fortran::evaluate::DescriptorInquiry &x);
121+
void show(const Fortran::evaluate::SpecificIntrinsic &);
122+
void show(const Fortran::evaluate::ProcedureDesignator &x);
123+
void show(const Fortran::evaluate::ActualArgument &x);
124+
void show(const Fortran::evaluate::ProcedureRef &x) {
125125
indent("procedure ref");
126126
show(x.proc());
127127
show(x.arguments());
128128
outdent();
129129
}
130130
template <typename T>
131-
LLVM_DUMP_METHOD void show(const Fortran::evaluate::FunctionRef<T> &x) {
131+
void show(const Fortran::evaluate::FunctionRef<T> &x) {
132132
indent("function ref");
133133
show(x.proc());
134134
show(x.arguments());
135135
outdent();
136136
}
137137
template <typename T>
138-
LLVM_DUMP_METHOD void
139-
show(const Fortran::evaluate::ArrayConstructorValue<T> &x) {
138+
void show(const Fortran::evaluate::ArrayConstructorValue<T> &x) {
140139
show(x.u);
141140
}
142141
template <typename T>
143-
LLVM_DUMP_METHOD void
144-
show(const Fortran::evaluate::ArrayConstructorValues<T> &x) {
142+
void show(const Fortran::evaluate::ArrayConstructorValues<T> &x) {
145143
indent("array constructor value");
146144
for (auto &v : x)
147145
show(v);
148146
outdent();
149147
}
150148
template <typename T>
151-
LLVM_DUMP_METHOD void show(const Fortran::evaluate::ImpliedDo<T> &x) {
149+
void show(const Fortran::evaluate::ImpliedDo<T> &x) {
152150
indent("implied do");
153151
show(x.lower());
154152
show(x.upper());
155153
show(x.stride());
156154
show(x.values());
157155
outdent();
158156
}
159-
LLVM_DUMP_METHOD void show(const Fortran::semantics::ParamValue &x);
160-
LLVM_DUMP_METHOD void
157+
void show(const Fortran::semantics::ParamValue &x);
158+
void
161159
show(const Fortran::semantics::DerivedTypeSpec::ParameterMapType::value_type
162160
&x);
163-
LLVM_DUMP_METHOD void show(const Fortran::semantics::DerivedTypeSpec &x);
164-
LLVM_DUMP_METHOD void
165-
show(const Fortran::evaluate::StructureConstructorValues::value_type &x);
166-
LLVM_DUMP_METHOD void show(const Fortran::evaluate::StructureConstructor &x);
161+
void show(const Fortran::semantics::DerivedTypeSpec &x);
162+
void show(const Fortran::evaluate::StructureConstructorValues::value_type &x);
163+
void show(const Fortran::evaluate::StructureConstructor &x);
167164
template <typename D, typename R, typename O>
168-
LLVM_DUMP_METHOD void show(const Fortran::evaluate::Operation<D, R, O> &op) {
165+
void show(const Fortran::evaluate::Operation<D, R, O> &op) {
169166
indent("unary op");
170167
show(op.left());
171168
outdent();
172169
}
173170
template <typename D, typename R, typename LO, typename RO>
174-
LLVM_DUMP_METHOD void
175-
show(const Fortran::evaluate::Operation<D, R, LO, RO> &op) {
171+
void show(const Fortran::evaluate::Operation<D, R, LO, RO> &op) {
176172
indent("binary op");
177173
show(op.left());
178174
show(op.right());
179175
outdent();
180176
}
181-
LLVM_DUMP_METHOD void
177+
void
182178
show(const Fortran::evaluate::Relational<Fortran::evaluate::SomeType> &x);
183179
template <typename T>
184-
LLVM_DUMP_METHOD void show(const Fortran::evaluate::Expr<T> &x) {
180+
void show(const Fortran::evaluate::Expr<T> &x) {
185181
indent("expr T");
186182
show(x.u);
187183
outdent();
188184
}
189185

190-
llvm::StringRef getIndentString() const;
186+
const char *getIndentString() const;
191187
void print(llvm::Twine s);
192188
void indent(llvm::StringRef s);
193189
void outdent();
@@ -196,6 +192,16 @@ class DumpEvaluateExpr {
196192
unsigned level = 0;
197193
};
198194

195+
LLVM_DUMP_METHOD void
196+
dumpEvExpr(const Fortran::evaluate::Expr<Fortran::evaluate::SomeType> &x);
197+
LLVM_DUMP_METHOD void dumpEvExpr(
198+
const Fortran::evaluate::Expr<
199+
Fortran::evaluate::Type<Fortran::common::TypeCategory::Integer, 4>> &x);
200+
LLVM_DUMP_METHOD void dumpEvExpr(
201+
const Fortran::evaluate::Expr<
202+
Fortran::evaluate::Type<Fortran::common::TypeCategory::Integer, 8>> &x);
203+
LLVM_DUMP_METHOD void dumpEvExpr(const Fortran::evaluate::ArrayRef &x);
204+
199205
} // namespace Fortran::lower
200206

201207
#endif // FORTRAN_LOWER_EVEXPRDUMPER_H

‎flang/lib/Lower/EvExprDumper.cpp

Lines changed: 35 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "flang/Lower/EvExprDumper.h"
10+
#include <iostream>
1011

11-
static constexpr char white[] =
12+
static constexpr char whiteSpacePadding[] =
1213
">> ";
14+
static constexpr auto whiteSize = sizeof(whiteSpacePadding) - 1;
1315

14-
inline llvm::StringRef
15-
Fortran::lower::DumpEvaluateExpr::getIndentString() const {
16-
static constexpr auto SIZE = sizeof(white);
17-
auto count = (level * 2 > SIZE) ? SIZE : level * 2;
18-
return white + SIZE - count;
16+
inline const char *Fortran::lower::DumpEvaluateExpr::getIndentString() const {
17+
auto count = (level * 2 >= whiteSize) ? whiteSize : level * 2;
18+
return whiteSpacePadding + whiteSize - count;
1919
}
2020

2121
void Fortran::lower::DumpEvaluateExpr::show(
@@ -225,6 +225,34 @@ void Fortran::lower::DumpEvaluateExpr::indent(llvm::StringRef s) {
225225
}
226226

227227
void Fortran::lower::DumpEvaluateExpr::outdent() {
228-
level--;
228+
if (level)
229+
level--;
229230
print("}");
230231
}
232+
233+
//===----------------------------------------------------------------------===//
234+
// Boilerplate entry points that the debugger can find.
235+
//===----------------------------------------------------------------------===//
236+
237+
void Fortran::lower::dumpEvExpr(
238+
const Fortran::evaluate::Expr<Fortran::evaluate::SomeType> &x) {
239+
DumpEvaluateExpr::dump(x);
240+
}
241+
242+
void Fortran::lower::dumpEvExpr(
243+
const Fortran::evaluate::Expr<
244+
Fortran::evaluate::Type<Fortran::common::TypeCategory::Integer, 4>>
245+
&x) {
246+
DumpEvaluateExpr::dump(x);
247+
}
248+
249+
void Fortran::lower::dumpEvExpr(
250+
const Fortran::evaluate::Expr<
251+
Fortran::evaluate::Type<Fortran::common::TypeCategory::Integer, 8>>
252+
&x) {
253+
DumpEvaluateExpr::dump(x);
254+
}
255+
256+
void Fortran::lower::dumpEvExpr(const Fortran::evaluate::ArrayRef &x) {
257+
DumpEvaluateExpr::dump(x);
258+
}

0 commit comments

Comments
 (0)