Skip to content

Commit 55e176f

Browse files
Update LLVM namespace (#89)
LLVM change: llvm/llvm-project#87288
1 parent e6cbcfd commit 55e176f

File tree

2 files changed

+16
-9
lines changed

2 files changed

+16
-9
lines changed

include/llvm-dialects/TableGen/Format.h

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,13 @@
3535

3636
namespace llvm_dialects {
3737

38+
namespace llvm_support_detail =
39+
#if !defined(LLVM_MAIN_REVISION) || LLVM_MAIN_REVISION >= 494496
40+
llvm::support::detail;
41+
#else
42+
llvm::detail;
43+
#endif
44+
3845
/// Format context containing substitutions for special placeholders.
3946
///
4047
/// This context divides special placeholders into two categories: builtin ones
@@ -185,14 +192,14 @@ class FmtObjectBase {
185192
// std::vector<Base*>.
186193
struct CreateAdapters {
187194
template <typename... Ts>
188-
std::vector<llvm::detail::format_adapter *> operator()(Ts &...items) {
189-
return std::vector<llvm::detail::format_adapter *>{&items...};
195+
std::vector<llvm_support_detail::format_adapter *> operator()(Ts &...items) {
196+
return std::vector<llvm_support_detail::format_adapter *>{&items...};
190197
}
191198
};
192199

193200
llvm::StringRef fmt;
194201
const FmtContext *context;
195-
std::vector<llvm::detail::format_adapter *> adapters;
202+
std::vector<llvm_support_detail::format_adapter *> adapters;
196203
std::vector<FmtReplacement> replacements;
197204

198205
public:
@@ -253,7 +260,7 @@ template <typename Tuple> class FmtObject : public FmtObjectBase {
253260
class FmtStrVecObject : public FmtObjectBase {
254261
public:
255262
using StrFormatAdapter =
256-
decltype(llvm::detail::build_format_adapter(std::declval<std::string>()));
263+
decltype(llvm_support_detail::build_format_adapter(std::declval<std::string>()));
257264

258265
FmtStrVecObject(llvm::StringRef fmt, const FmtContext *ctx,
259266
llvm::ArrayRef<std::string> params);
@@ -313,13 +320,13 @@ class FmtStrVecObject : public FmtObjectBase {
313320
template <typename... Ts>
314321
inline auto tgfmt(llvm::StringRef fmt, const FmtContext *ctx, Ts &&...vals)
315322
-> FmtObject<decltype(std::make_tuple(
316-
llvm::detail::build_format_adapter(std::forward<Ts>(vals))...))> {
323+
llvm_support_detail::build_format_adapter(std::forward<Ts>(vals))...))> {
317324
using ParamTuple = decltype(std::make_tuple(
318-
llvm::detail::build_format_adapter(std::forward<Ts>(vals))...));
325+
llvm_support_detail::build_format_adapter(std::forward<Ts>(vals))...));
319326
return FmtObject<ParamTuple>(
320327
fmt, ctx,
321328
std::make_tuple(
322-
llvm::detail::build_format_adapter(std::forward<Ts>(vals))...));
329+
llvm_support_detail::build_format_adapter(std::forward<Ts>(vals))...));
323330
}
324331

325332
inline FmtStrVecObject tgfmt(llvm::StringRef fmt, const FmtContext *ctx,

lib/TableGen/Format.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ void FmtObjectBase::format(raw_ostream &s) const {
218218
s << repl.spec << kMarkerForNoSubst;
219219
continue;
220220
}
221-
auto range = ArrayRef<llvm::detail::format_adapter *>(adapters);
221+
auto range = ArrayRef<llvm_support_detail::format_adapter *>(adapters);
222222
range = range.drop_front(repl.index);
223223
llvm::interleaveComma(range, s,
224224
[&](auto &x) { x->format(s, /*Options=*/""); });
@@ -254,7 +254,7 @@ FmtStrVecObject::FmtStrVecObject(StringRef fmt, const FmtContext *ctx,
254254
: FmtObjectBase(fmt, ctx, params.size()) {
255255
parameters.reserve(params.size());
256256
for (std::string p : params)
257-
parameters.push_back(llvm::detail::build_format_adapter(std::move(p)));
257+
parameters.push_back(llvm_support_detail::build_format_adapter(std::move(p)));
258258

259259
adapters.reserve(parameters.size());
260260
for (auto &p : parameters)

0 commit comments

Comments
 (0)