Skip to content

Commit 984b800

Browse files
serge-sans-pailleserge-sans-paille
committed
Move from llvm::makeArrayRef to ArrayRef deduction guides - last part
This is a follow-up to https://reviews.llvm.org/D140896, split into several parts as it touches a lot of files. Differential Revision: https://reviews.llvm.org/D141298
1 parent 740d2f6 commit 984b800

File tree

181 files changed

+405
-423
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

181 files changed

+405
-423
lines changed

‎bolt/tools/bat-dump/bat-dump.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ void dumpBATFor(llvm::object::ELFObjectFileBase *InputFile) {
151151
}
152152

153153
int main(int argc, char **argv) {
154-
cl::HideUnrelatedOptions(makeArrayRef(opts::BatDumpCategories));
154+
cl::HideUnrelatedOptions(ArrayRef(opts::BatDumpCategories));
155155
cl::ParseCommandLineOptions(argc, argv, "");
156156

157157
if (!sys::fs::exists(opts::InputFilename))

‎bolt/tools/driver/llvm-bolt.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ static void printBoltRevision(llvm::raw_ostream &OS) {
9898
}
9999

100100
void perf2boltMode(int argc, char **argv) {
101-
cl::HideUnrelatedOptions(makeArrayRef(opts::Perf2BoltCategories));
101+
cl::HideUnrelatedOptions(ArrayRef(opts::Perf2BoltCategories));
102102
cl::AddExtraVersionPrinter(printBoltRevision);
103103
cl::ParseCommandLineOptions(
104104
argc, argv,
@@ -127,7 +127,7 @@ void perf2boltMode(int argc, char **argv) {
127127
}
128128

129129
void boltDiffMode(int argc, char **argv) {
130-
cl::HideUnrelatedOptions(makeArrayRef(opts::BoltDiffCategories));
130+
cl::HideUnrelatedOptions(ArrayRef(opts::BoltDiffCategories));
131131
cl::AddExtraVersionPrinter(printBoltRevision);
132132
cl::ParseCommandLineOptions(
133133
argc, argv,
@@ -153,7 +153,7 @@ void boltDiffMode(int argc, char **argv) {
153153
}
154154

155155
void boltMode(int argc, char **argv) {
156-
cl::HideUnrelatedOptions(makeArrayRef(opts::BoltCategories));
156+
cl::HideUnrelatedOptions(ArrayRef(opts::BoltCategories));
157157
// Register the target printer for --version.
158158
cl::AddExtraVersionPrinter(printBoltRevision);
159159
cl::AddExtraVersionPrinter(TargetRegistry::printRegisteredTargetsForVersion);

‎bolt/tools/heatmap/heatmap.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ static std::string GetExecutablePath(const char *Argv0) {
5050
}
5151

5252
int main(int argc, char **argv) {
53-
cl::HideUnrelatedOptions(makeArrayRef(opts::HeatmapCategories));
53+
cl::HideUnrelatedOptions(ArrayRef(opts::HeatmapCategories));
5454
cl::ParseCommandLineOptions(argc, argv, "");
5555

5656
if (opts::PerfData.empty()) {

‎clang-tools-extra/clang-apply-replacements/tool/ClangApplyReplacementsMain.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ static void printVersion(raw_ostream &OS) {
9191
}
9292

9393
int main(int argc, char **argv) {
94-
cl::HideUnrelatedOptions(makeArrayRef(VisibleCategories));
94+
cl::HideUnrelatedOptions(ArrayRef(VisibleCategories));
9595

9696
cl::SetVersionPrinter(printVersion);
9797
cl::ParseCommandLineOptions(argc, argv);

‎clang-tools-extra/clang-tidy/bugprone/ArgumentCommentCheck.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ void ArgumentCommentCheck::check(const MatchFinder::MatchResult &Result) {
353353
return;
354354

355355
checkCallArgs(Result.Context, Callee, Call->getCallee()->getEndLoc(),
356-
llvm::makeArrayRef(Call->getArgs(), Call->getNumArgs()));
356+
llvm::ArrayRef(Call->getArgs(), Call->getNumArgs()));
357357
} else {
358358
const auto *Construct = cast<CXXConstructExpr>(E);
359359
if (Construct->getNumArgs() > 0 &&
@@ -364,7 +364,7 @@ void ArgumentCommentCheck::check(const MatchFinder::MatchResult &Result) {
364364
checkCallArgs(
365365
Result.Context, Construct->getConstructor(),
366366
Construct->getParenOrBraceRange().getBegin(),
367-
llvm::makeArrayRef(Construct->getArgs(), Construct->getNumArgs()));
367+
llvm::ArrayRef(Construct->getArgs(), Construct->getNumArgs()));
368368
}
369369
}
370370

‎clang-tools-extra/clang-tidy/bugprone/SignalHandlerCheck.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ struct OptionEnumMapping<
236236
{bugprone::SignalHandlerCheck::AsyncSafeFunctionSetKind::POSIX,
237237
"POSIX"},
238238
};
239-
return makeArrayRef(Mapping);
239+
return ArrayRef(Mapping);
240240
}
241241
};
242242

‎clang-tools-extra/clang-tidy/concurrency/MtUnsafeCheck.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ template <> struct OptionEnumMapping<concurrency::MtUnsafeCheck::FunctionSet> {
270270
Mapping[] = {{concurrency::MtUnsafeCheck::FunctionSet::Posix, "posix"},
271271
{concurrency::MtUnsafeCheck::FunctionSet::Glibc, "glibc"},
272272
{concurrency::MtUnsafeCheck::FunctionSet::Any, "any"}};
273-
return makeArrayRef(Mapping);
273+
return ArrayRef(Mapping);
274274
}
275275
};
276276

‎clang-tools-extra/clang-tidy/modernize/AvoidBindCheck.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,7 @@ static void emitCaptureList(const LambdaProperties &LP,
627627

628628
static ArrayRef<BindArgument>
629629
getForwardedArgumentList(const LambdaProperties &P) {
630-
ArrayRef<BindArgument> Args = makeArrayRef(P.BindArguments);
630+
ArrayRef<BindArgument> Args = ArrayRef(P.BindArguments);
631631
if (P.Callable.Type != CT_MemberFunction)
632632
return Args;
633633

@@ -672,7 +672,7 @@ void AvoidBindCheck::check(const MatchFinder::MatchResult &Result) {
672672
emitCaptureList(LP, Result, Stream);
673673
Stream << "]";
674674

675-
ArrayRef<BindArgument> FunctionCallArgs = makeArrayRef(LP.BindArguments);
675+
ArrayRef<BindArgument> FunctionCallArgs = ArrayRef(LP.BindArguments);
676676

677677
addPlaceholderArgs(LP, Stream, PermissiveParameterList);
678678

‎clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ template <> struct OptionEnumMapping<modernize::Confidence::Level> {
3737
Mapping[] = {{modernize::Confidence::CL_Reasonable, "reasonable"},
3838
{modernize::Confidence::CL_Safe, "safe"},
3939
{modernize::Confidence::CL_Risky, "risky"}};
40-
return makeArrayRef(Mapping);
40+
return ArrayRef(Mapping);
4141
}
4242
};
4343

@@ -50,7 +50,7 @@ template <> struct OptionEnumMapping<modernize::VariableNamer::NamingStyle> {
5050
{modernize::VariableNamer::NS_CamelBack, "camelBack"},
5151
{modernize::VariableNamer::NS_LowerCase, "lower_case"},
5252
{modernize::VariableNamer::NS_UpperCase, "UPPER_CASE"}};
53-
return makeArrayRef(Mapping);
53+
return ArrayRef(Mapping);
5454
}
5555
};
5656

‎clang-tools-extra/clang-tidy/readability/IdentifierNamingCheck.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ OptionEnumMapping<
4747
"Camel_Snake_Case"},
4848
{readability::IdentifierNamingCheck::CT_CamelSnakeBack,
4949
"camel_Snake_Back"}};
50-
return llvm::makeArrayRef(Mapping);
50+
return llvm::ArrayRef(Mapping);
5151
}
5252

5353
template <>
@@ -62,7 +62,7 @@ struct OptionEnumMapping<
6262
{HungarianPrefixType::HPT_On, "On"},
6363
{HungarianPrefixType::HPT_LowerCase, "LowerCase"},
6464
{HungarianPrefixType::HPT_CamelCase, "CamelCase"}};
65-
return llvm::makeArrayRef(Mapping);
65+
return llvm::ArrayRef(Mapping);
6666
}
6767
};
6868

‎clang-tools-extra/clang-tidy/utils/IncludeSorter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ OptionEnumMapping<utils::IncludeSorter::IncludeStyle>::getEnumMapping() {
231231
Mapping[] = {{utils::IncludeSorter::IS_LLVM, "llvm"},
232232
{utils::IncludeSorter::IS_Google, "google"},
233233
{utils::IncludeSorter::IS_Google_ObjC, "google-objc"}};
234-
return makeArrayRef(Mapping);
234+
return ArrayRef(Mapping);
235235
}
236236
} // namespace tidy
237237
} // namespace clang

‎clang-tools-extra/clangd/ClangdLSPServer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ void ClangdLSPServer::onInitialize(const InitializeParams &Params,
505505
}
506506
auto Mangler = CommandMangler::detect();
507507
Mangler.SystemIncludeExtractor =
508-
getSystemIncludeExtractor(llvm::makeArrayRef(Opts.QueryDriverGlobs));
508+
getSystemIncludeExtractor(llvm::ArrayRef(Opts.QueryDriverGlobs));
509509
if (Opts.ResourceDir)
510510
Mangler.ResourceDir = *Opts.ResourceDir;
511511
CDB.emplace(BaseCDB.get(), Params.initializationOptions.fallbackFlags,

‎clang-tools-extra/clangd/CompileCommands.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,15 +211,15 @@ void CommandMangler::operator()(tooling::CompileCommand &Command,
211211
for (const auto &S : Cmd)
212212
OriginalArgs.push_back(S.c_str());
213213
bool IsCLMode = driver::IsClangCL(driver::getDriverMode(
214-
OriginalArgs[0], llvm::makeArrayRef(OriginalArgs).slice(1)));
214+
OriginalArgs[0], llvm::ArrayRef(OriginalArgs).slice(1)));
215215
// ParseArgs propagates missig arg/opt counts on error, but preserves
216216
// everything it could parse in ArgList. So we just ignore those counts.
217217
unsigned IgnoredCount;
218218
// Drop the executable name, as ParseArgs doesn't expect it. This means
219219
// indices are actually of by one between ArgList and OriginalArgs.
220220
llvm::opt::InputArgList ArgList;
221221
ArgList = OptTable.ParseArgs(
222-
llvm::makeArrayRef(OriginalArgs).drop_front(), IgnoredCount, IgnoredCount,
222+
llvm::ArrayRef(OriginalArgs).drop_front(), IgnoredCount, IgnoredCount,
223223
/*FlagsToInclude=*/
224224
IsCLMode ? (driver::options::CLOption | driver::options::CoreOption |
225225
driver::options::CLDXCOption)

‎clang-tools-extra/clangd/FindSymbols.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,7 @@ std::vector<DocumentSymbol> collectDocSymbols(ParsedAST &AST) {
644644
DocumentSymbol Root;
645645
Root.children = std::move(Syms);
646646
Root.range = EntireFile;
647-
mergePragmas(Root, llvm::makeArrayRef(Pragmas));
647+
mergePragmas(Root, llvm::ArrayRef(Pragmas));
648648
return Root.children;
649649
}
650650

‎clang-tools-extra/clangd/Preamble.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ bool compileCommandsAreEqual(const tooling::CompileCommand &LHS,
5858
const tooling::CompileCommand &RHS) {
5959
// We don't check for Output, it should not matter to clangd.
6060
return LHS.Directory == RHS.Directory && LHS.Filename == RHS.Filename &&
61-
llvm::makeArrayRef(LHS.CommandLine).equals(RHS.CommandLine);
61+
llvm::ArrayRef(LHS.CommandLine).equals(RHS.CommandLine);
6262
}
6363

6464
class CppFilePreambleCallbacks : public PreambleCallbacks {

‎clang-tools-extra/clangd/Selection.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ class SelectionTester {
262262
SelFirst, AllSpelledTokens.end(), [&](const syntax::Token &Tok) {
263263
return SM.getFileOffset(Tok.location()) < SelEnd;
264264
});
265-
auto Sel = llvm::makeArrayRef(SelFirst, SelLimit);
265+
auto Sel = llvm::ArrayRef(SelFirst, SelLimit);
266266
// Find which of these are preprocessed to nothing and should be ignored.
267267
llvm::BitVector PPIgnored(Sel.size(), false);
268268
for (const syntax::TokenBuffer::Expansion &X :
@@ -419,7 +419,7 @@ class SelectionTester {
419419
if (EndInvalid)
420420
End = Toks.expandedTokens().end();
421421

422-
return llvm::makeArrayRef(Start, End);
422+
return llvm::ArrayRef(Start, End);
423423
}
424424

425425
// Hit-test a consecutive range of tokens from a single file ID.

‎clang-tools-extra/clangd/XRefs.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -726,12 +726,12 @@ const syntax::Token *findNearbyIdentifier(const SpelledWord &Word,
726726
return T.location() < Word.Location; // Comparison OK: same file.
727727
});
728728
// Search for matches after the cursor.
729-
for (const syntax::Token &Tok : llvm::makeArrayRef(I, SpelledTokens.end()))
729+
for (const syntax::Token &Tok : llvm::ArrayRef(I, SpelledTokens.end()))
730730
if (Consider(Tok))
731731
break; // costs of later tokens are greater...
732732
// Search for matches before the cursor.
733733
for (const syntax::Token &Tok :
734-
llvm::reverse(llvm::makeArrayRef(SpelledTokens.begin(), I)))
734+
llvm::reverse(llvm::ArrayRef(SpelledTokens.begin(), I)))
735735
if (Consider(Tok))
736736
break;
737737

‎clang-tools-extra/clangd/refactor/tweaks/DefineOutline.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ getFunctionSourceCode(const FunctionDecl *FD, llvm::StringRef TargetNamespace,
242242
if (Tok.kind() != Kind)
243243
continue;
244244
FoundAny = true;
245-
auto Spelling = TokBuf.spelledForExpanded(llvm::makeArrayRef(Tok));
245+
auto Spelling = TokBuf.spelledForExpanded(llvm::ArrayRef(Tok));
246246
if (!Spelling) {
247247
Errors = llvm::joinErrors(
248248
std::move(Errors),

‎clang-tools-extra/clangd/tool/Check.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ class Checker {
145145
std::make_unique<DirectoryBasedGlobalCompilationDatabase>(CDBOpts);
146146
auto Mangler = CommandMangler::detect();
147147
Mangler.SystemIncludeExtractor =
148-
getSystemIncludeExtractor(llvm::makeArrayRef(Opts.QueryDriverGlobs));
148+
getSystemIncludeExtractor(llvm::ArrayRef(Opts.QueryDriverGlobs));
149149
if (Opts.ResourceDir)
150150
Mangler.ResourceDir = *Opts.ResourceDir;
151151
auto CDB = std::make_unique<OverlayCDB>(
@@ -228,7 +228,7 @@ class Checker {
228228
elog("Failed to build AST");
229229
return false;
230230
}
231-
ErrCount += showErrors(llvm::makeArrayRef(*AST->getDiagnostics())
231+
ErrCount += showErrors(llvm::ArrayRef(*AST->getDiagnostics())
232232
.drop_front(Preamble->Diags.size()));
233233

234234
if (Opts.BuildDynamicSymbolIndex) {

‎clang-tools-extra/clangd/unittests/CompileCommandsTests.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -375,9 +375,9 @@ TEST(CommandMangler, InputsAfterDashDash) {
375375
tooling::CompileCommand Cmd;
376376
Cmd.CommandLine = {"clang", "/Users/foo.cc"};
377377
Mangler(Cmd, "/Users/foo.cc");
378-
EXPECT_THAT(llvm::makeArrayRef(Cmd.CommandLine).take_back(2),
378+
EXPECT_THAT(llvm::ArrayRef(Cmd.CommandLine).take_back(2),
379379
ElementsAre("--", "/Users/foo.cc"));
380-
EXPECT_THAT(llvm::makeArrayRef(Cmd.CommandLine).drop_back(2),
380+
EXPECT_THAT(llvm::ArrayRef(Cmd.CommandLine).drop_back(2),
381381
Not(Contains("/Users/foo.cc")));
382382
}
383383
// In CL mode /U triggers an undef operation, hence `/Users/foo.cc` shouldn't
@@ -386,20 +386,20 @@ TEST(CommandMangler, InputsAfterDashDash) {
386386
tooling::CompileCommand Cmd;
387387
Cmd.CommandLine = {"clang", "--driver-mode=cl", "bar.cc", "/Users/foo.cc"};
388388
Mangler(Cmd, "bar.cc");
389-
EXPECT_THAT(llvm::makeArrayRef(Cmd.CommandLine).take_back(2),
389+
EXPECT_THAT(llvm::ArrayRef(Cmd.CommandLine).take_back(2),
390390
ElementsAre("--", "bar.cc"));
391-
EXPECT_THAT(llvm::makeArrayRef(Cmd.CommandLine).drop_back(2),
391+
EXPECT_THAT(llvm::ArrayRef(Cmd.CommandLine).drop_back(2),
392392
Not(Contains("bar.cc")));
393393
}
394394
// All inputs but the main file is dropped.
395395
{
396396
tooling::CompileCommand Cmd;
397397
Cmd.CommandLine = {"clang", "foo.cc", "bar.cc"};
398398
Mangler(Cmd, "baz.cc");
399-
EXPECT_THAT(llvm::makeArrayRef(Cmd.CommandLine).take_back(2),
399+
EXPECT_THAT(llvm::ArrayRef(Cmd.CommandLine).take_back(2),
400400
ElementsAre("--", "baz.cc"));
401401
EXPECT_THAT(
402-
llvm::makeArrayRef(Cmd.CommandLine).drop_back(2),
402+
llvm::ArrayRef(Cmd.CommandLine).drop_back(2),
403403
testing::AllOf(Not(Contains("foo.cc")), Not(Contains("bar.cc"))));
404404
}
405405
}

‎clang-tools-extra/include-cleaner/lib/HTMLReport.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ class Reporter {
460460
return std::make_pair(Refs[A].Offset, Refs[A].Type != RefType::Implicit) <
461461
std::make_pair(Refs[B].Offset, Refs[B].Type != RefType::Implicit);
462462
});
463-
auto Rest = llvm::makeArrayRef(RefOrder);
463+
auto Rest = llvm::ArrayRef(RefOrder);
464464
unsigned End = 0;
465465
StartLine();
466466
for (unsigned I = 0; I < Code.size(); ++I) {

‎clang-tools-extra/pseudo/include/clang-pseudo/Forest.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,7 @@ class alignas(class ForestNode *) ForestNode {
139139

140140
// Retrieves the trailing array.
141141
llvm::ArrayRef<const ForestNode *> children(uint16_t Num) const {
142-
return llvm::makeArrayRef(reinterpret_cast<ForestNode *const *>(this + 1),
143-
Num);
142+
return llvm::ArrayRef(reinterpret_cast<ForestNode *const *>(this + 1), Num);
144143
}
145144
llvm::MutableArrayRef<ForestNode *> children(uint16_t Num) {
146145
return llvm::makeMutableArrayRef(reinterpret_cast<ForestNode **>(this + 1),

‎clang-tools-extra/pseudo/include/clang-pseudo/GLR.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ struct GSS {
8383
const ForestNode *Payload = nullptr;
8484

8585
llvm::ArrayRef<const Node *> parents() const {
86-
return llvm::makeArrayRef(reinterpret_cast<const Node *const *>(this + 1),
87-
ParentCount);
86+
return llvm::ArrayRef(reinterpret_cast<const Node *const *>(this + 1),
87+
ParentCount);
8888
};
8989
// Parents are stored as a trailing array of Node*.
9090
};

‎clang-tools-extra/pseudo/include/clang-pseudo/grammar/LRTable.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ class LRTable {
9898
// }
9999
llvm::ArrayRef<RuleID> getReduceRules(StateID State) const {
100100
assert(State + 1u < ReduceOffset.size());
101-
return llvm::makeArrayRef(Reduces.data() + ReduceOffset[State],
102-
Reduces.data() + ReduceOffset[State+1]);
101+
return llvm::ArrayRef(Reduces.data() + ReduceOffset[State],
102+
Reduces.data() + ReduceOffset[State + 1]);
103103
}
104104
// Returns whether Terminal can follow Nonterminal in a valid source file.
105105
bool canFollow(SymbolID Nonterminal, SymbolID Terminal) const {
@@ -113,8 +113,8 @@ class LRTable {
113113

114114
// Looks up available recovery actions if we stopped parsing in this state.
115115
llvm::ArrayRef<Recovery> getRecovery(StateID State) const {
116-
return llvm::makeArrayRef(Recoveries.data() + RecoveryOffset[State],
117-
Recoveries.data() + RecoveryOffset[State + 1]);
116+
return llvm::ArrayRef(Recoveries.data() + RecoveryOffset[State],
117+
Recoveries.data() + RecoveryOffset[State + 1]);
118118
}
119119

120120
// Returns the state from which the LR parser should start to parse the input

‎clang-tools-extra/pseudo/lib/Forest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ ForestArena::createTerminals(const TokenStream &Code) {
192192
/*Start=*/Index, /*TerminalData*/ 0);
193193
++Index;
194194
NodeCount = Index;
195-
return llvm::makeArrayRef(Terminals, Index);
195+
return llvm::ArrayRef(Terminals, Index);
196196
}
197197

198198
} // namespace pseudo

‎clang-tools-extra/pseudo/lib/GLR.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ void glrShift(llvm::ArrayRef<const GSS::Node *> OldHeads,
237237
Shifts.push_back({*S, H});
238238
llvm::stable_sort(Shifts, llvm::less_first{});
239239

240-
auto Rest = llvm::makeArrayRef(Shifts);
240+
auto Rest = llvm::ArrayRef(Shifts);
241241
llvm::SmallVector<const GSS::Node *> Parents;
242242
while (!Rest.empty()) {
243243
// Collect the batch of PendingShift that have compatible shift states.

‎clang-tools-extra/pseudo/lib/grammar/Grammar.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ llvm::ArrayRef<Rule> Grammar::rulesFor(SymbolID SID) const {
3232
assert(isNonterminal(SID));
3333
const auto &R = T->Nonterminals[SID].RuleRange;
3434
assert(R.End <= T->Rules.size());
35-
return llvm::makeArrayRef(&T->Rules[R.Start], R.End - R.Start);
35+
return llvm::ArrayRef(&T->Rules[R.Start], R.End - R.Start);
3636
}
3737

3838
const Rule &Grammar::lookupRule(RuleID RID) const {
@@ -180,7 +180,7 @@ static llvm::ArrayRef<std::string> getTerminalNames() {
180180
TerminalNames[tok::kw_##Keyword] = llvm::StringRef(#Keyword).upper();
181181
#define TOK(Tok) TerminalNames[tok::Tok] = llvm::StringRef(#Tok).upper();
182182
#include "clang/Basic/TokenKinds.def"
183-
return llvm::makeArrayRef(TerminalNames, NumTerminals);
183+
return llvm::ArrayRef(TerminalNames, NumTerminals);
184184
}();
185185
return TerminalNames;
186186
}

‎clang-tools-extra/unittests/clang-tidy/ClangTidyOptionsTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ template <> struct OptionEnumMapping<Colours> {
2020
{Colours::Yellow, "Yellow"}, {Colours::Green, "Green"},
2121
{Colours::Blue, "Blue"}, {Colours::Indigo, "Indigo"},
2222
{Colours::Violet, "Violet"}};
23-
return makeArrayRef(Mapping);
23+
return ArrayRef(Mapping);
2424
}
2525
};
2626

0 commit comments

Comments
 (0)