Skip to content

Commit 7142db9

Browse files
author
Valery N Dmitriev
committed
Merge from 'master' to 'sycl-web' (intel#4)
 CONFLICT (content): Merge conflict in llvm/test/CMakeLists.txt
2 parents 9d2ef43 + dd405f1 commit 7142db9

File tree

1,435 files changed

+37612
-26982
lines changed

Some content is hidden

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

1,435 files changed

+37612
-26982
lines changed

‎.git-blame-ignore-revs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,12 @@ b9c1b51e45b845debb76d8658edabca70ca56079
2222

2323
# r302496: That is the revert of r302421
2424
ff63090b0e1072bd398b8efef8ae2291613a6ec9
25+
26+
# Fix more line endings changed in r320089. NFC.
27+
d8f0e6caa91e230a486c948ab643174e40bdf215
28+
29+
# Correct line endings that got mixed up in r320089; NFC.
30+
29dc5ded45447915d96ef7ca3f02acf2232282e0
31+
32+
# Remove line-endings added by r320089. NFC.
33+
100a0eedc00b2bf48bcdc6c209c000745a4a0e48

‎clang-tools-extra/clang-tidy/ClangTidyCheck.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,10 +168,9 @@ void ClangTidyCheck::OptionsView::store<bool>(
168168
store(Options, LocalName, Value ? StringRef("true") : StringRef("false"));
169169
}
170170

171-
llvm::Expected<int64_t>
172-
ClangTidyCheck::OptionsView::getEnumInt(StringRef LocalName,
173-
ArrayRef<NameAndValue> Mapping,
174-
bool CheckGlobal, bool IgnoreCase) {
171+
llvm::Expected<int64_t> ClangTidyCheck::OptionsView::getEnumInt(
172+
StringRef LocalName, ArrayRef<NameAndValue> Mapping, bool CheckGlobal,
173+
bool IgnoreCase) const {
175174
auto Iter = CheckGlobal
176175
? findPriorityOption(CheckOptions, NamePrefix, LocalName)
177176
: CheckOptions.find((NamePrefix + LocalName).str());

‎clang-tools-extra/clang-tidy/ClangTidyCheck.h

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ class ClangTidyCheck : public ast_matchers::MatchFinder::MatchCallback {
330330
/// supply the mapping required to convert between ``T`` and a string.
331331
template <typename T>
332332
std::enable_if_t<std::is_enum<T>::value, llvm::Expected<T>>
333-
get(StringRef LocalName, bool IgnoreCase = false) {
333+
get(StringRef LocalName, bool IgnoreCase = false) const {
334334
if (llvm::Expected<int64_t> ValueOr =
335335
getEnumInt(LocalName, typeEraseMapping<T>(), false, IgnoreCase))
336336
return static_cast<T>(*ValueOr);
@@ -349,7 +349,7 @@ class ClangTidyCheck : public ast_matchers::MatchFinder::MatchCallback {
349349
/// supply the mapping required to convert between ``T`` and a string.
350350
template <typename T>
351351
std::enable_if_t<std::is_enum<T>::value, T>
352-
get(StringRef LocalName, T Default, bool IgnoreCase = false) {
352+
get(StringRef LocalName, T Default, bool IgnoreCase = false) const {
353353
if (auto ValueOr = get<T>(LocalName, IgnoreCase))
354354
return *ValueOr;
355355
else
@@ -370,8 +370,7 @@ class ClangTidyCheck : public ast_matchers::MatchFinder::MatchCallback {
370370
/// supply the mapping required to convert between ``T`` and a string.
371371
template <typename T>
372372
std::enable_if_t<std::is_enum<T>::value, llvm::Expected<T>>
373-
getLocalOrGlobal(StringRef LocalName,
374-
bool IgnoreCase = false) {
373+
getLocalOrGlobal(StringRef LocalName, bool IgnoreCase = false) const {
375374
if (llvm::Expected<int64_t> ValueOr =
376375
getEnumInt(LocalName, typeEraseMapping<T>(), true, IgnoreCase))
377376
return static_cast<T>(*ValueOr);
@@ -391,7 +390,8 @@ class ClangTidyCheck : public ast_matchers::MatchFinder::MatchCallback {
391390
/// supply the mapping required to convert between ``T`` and a string.
392391
template <typename T>
393392
std::enable_if_t<std::is_enum<T>::value, T>
394-
getLocalOrGlobal(StringRef LocalName, T Default, bool IgnoreCase = false) {
393+
getLocalOrGlobal(StringRef LocalName, T Default,
394+
bool IgnoreCase = false) const {
395395
if (auto ValueOr = getLocalOrGlobal<T>(LocalName, IgnoreCase))
396396
return *ValueOr;
397397
else
@@ -420,7 +420,8 @@ class ClangTidyCheck : public ast_matchers::MatchFinder::MatchCallback {
420420
/// supply the mapping required to convert between ``T`` and a string.
421421
template <typename T>
422422
std::enable_if_t<std::is_enum<T>::value>
423-
store(ClangTidyOptions::OptionMap &Options, StringRef LocalName, T Value) {
423+
store(ClangTidyOptions::OptionMap &Options, StringRef LocalName,
424+
T Value) const {
424425
ArrayRef<std::pair<T, StringRef>> Mapping =
425426
OptionEnumMapping<T>::getEnumMapping();
426427
auto Iter = llvm::find_if(
@@ -436,11 +437,11 @@ class ClangTidyCheck : public ast_matchers::MatchFinder::MatchCallback {
436437

437438
llvm::Expected<int64_t> getEnumInt(StringRef LocalName,
438439
ArrayRef<NameAndValue> Mapping,
439-
bool CheckGlobal, bool IgnoreCase);
440+
bool CheckGlobal, bool IgnoreCase) const;
440441

441442
template <typename T>
442443
std::enable_if_t<std::is_enum<T>::value, std::vector<NameAndValue>>
443-
typeEraseMapping() {
444+
typeEraseMapping() const {
444445
ArrayRef<std::pair<T, StringRef>> Mapping =
445446
OptionEnumMapping<T>::getEnumMapping();
446447
std::vector<NameAndValue> Result;

‎clang-tools-extra/clang-tidy/abseil/StringFindStartswithCheck.cpp

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ StringFindStartswithCheck::StringFindStartswithCheck(StringRef Name,
2626
: ClangTidyCheck(Name, Context),
2727
StringLikeClasses(utils::options::parseStringList(
2828
Options.get("StringLikeClasses", "::std::basic_string"))),
29-
IncludeStyle(Options.getLocalOrGlobal("IncludeStyle",
30-
utils::IncludeSorter::IS_LLVM)),
29+
IncludeInserter(Options.getLocalOrGlobal("IncludeStyle",
30+
utils::IncludeSorter::IS_LLVM)),
3131
AbseilStringsMatchHeader(
3232
Options.get("AbseilStringsMatchHeader", "absl/strings/match.h")) {}
3333

@@ -105,23 +105,21 @@ void StringFindStartswithCheck::check(const MatchFinder::MatchResult &Result) {
105105

106106
// Create a preprocessor #include FixIt hint (CreateIncludeInsertion checks
107107
// whether this already exists).
108-
Diagnostic << IncludeInserter->CreateIncludeInsertion(
108+
Diagnostic << IncludeInserter.createIncludeInsertion(
109109
Source.getFileID(ComparisonExpr->getBeginLoc()), AbseilStringsMatchHeader,
110110
false);
111111
}
112112

113113
void StringFindStartswithCheck::registerPPCallbacks(
114114
const SourceManager &SM, Preprocessor *PP, Preprocessor *ModuleExpanderPP) {
115-
IncludeInserter = std::make_unique<utils::IncludeInserter>(SM, getLangOpts(),
116-
IncludeStyle);
117-
PP->addPPCallbacks(IncludeInserter->CreatePPCallbacks());
115+
IncludeInserter.registerPreprocessor(PP);
118116
}
119117

120118
void StringFindStartswithCheck::storeOptions(
121119
ClangTidyOptions::OptionMap &Opts) {
122120
Options.store(Opts, "StringLikeClasses",
123121
utils::options::serializeStringList(StringLikeClasses));
124-
Options.store(Opts, "IncludeStyle", IncludeStyle);
122+
Options.store(Opts, "IncludeStyle", IncludeInserter.getStyle());
125123
Options.store(Opts, "AbseilStringsMatchHeader", AbseilStringsMatchHeader);
126124
}
127125

‎clang-tools-extra/clang-tidy/abseil/StringFindStartswithCheck.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,8 @@ class StringFindStartswithCheck : public ClangTidyCheck {
3535
void storeOptions(ClangTidyOptions::OptionMap &Opts) override;
3636

3737
private:
38-
std::unique_ptr<clang::tidy::utils::IncludeInserter> IncludeInserter;
3938
const std::vector<std::string> StringLikeClasses;
40-
const utils::IncludeSorter::IncludeStyle IncludeStyle;
39+
utils::IncludeInserter IncludeInserter;
4140
const std::string AbseilStringsMatchHeader;
4241
};
4342

‎clang-tools-extra/clang-tidy/cppcoreguidelines/InitVariablesCheck.cpp

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ AST_MATCHER(VarDecl, isLocalVarDecl) { return Node.isLocalVarDecl(); }
2626
InitVariablesCheck::InitVariablesCheck(StringRef Name,
2727
ClangTidyContext *Context)
2828
: ClangTidyCheck(Name, Context),
29-
IncludeStyle(Options.getLocalOrGlobal("IncludeStyle",
30-
utils::IncludeSorter::IS_LLVM)),
29+
IncludeInserter(Options.getLocalOrGlobal("IncludeStyle",
30+
utils::IncludeSorter::IS_LLVM)),
3131
MathHeader(Options.get("MathHeader", "math.h")) {}
3232

3333
void InitVariablesCheck::storeOptions(ClangTidyOptions::OptionMap &Opts) {
34-
Options.store(Opts, "IncludeStyle", IncludeStyle);
34+
Options.store(Opts, "IncludeStyle", IncludeInserter.getStyle());
3535
Options.store(Opts, "MathHeader", MathHeader);
3636
}
3737

@@ -51,9 +51,7 @@ void InitVariablesCheck::registerMatchers(MatchFinder *Finder) {
5151
void InitVariablesCheck::registerPPCallbacks(const SourceManager &SM,
5252
Preprocessor *PP,
5353
Preprocessor *ModuleExpanderPP) {
54-
IncludeInserter =
55-
std::make_unique<utils::IncludeInserter>(SM, getLangOpts(), IncludeStyle);
56-
PP->addPPCallbacks(IncludeInserter->CreatePPCallbacks());
54+
IncludeInserter.registerPreprocessor(PP);
5755
}
5856

5957
void InitVariablesCheck::check(const MatchFinder::MatchResult &Result) {
@@ -104,7 +102,7 @@ void InitVariablesCheck::check(const MatchFinder::MatchResult &Result) {
104102
MatchedDecl->getName().size()),
105103
InitializationString);
106104
if (AddMathInclude) {
107-
Diagnostic << IncludeInserter->CreateIncludeInsertion(
105+
Diagnostic << IncludeInserter.createIncludeInsertion(
108106
Source.getFileID(MatchedDecl->getBeginLoc()), MathHeader, false);
109107
}
110108
}

‎clang-tools-extra/clang-tidy/cppcoreguidelines/InitVariablesCheck.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ class InitVariablesCheck : public ClangTidyCheck {
3131
void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
3232

3333
private:
34-
std::unique_ptr<clang::tidy::utils::IncludeInserter> IncludeInserter;
35-
const utils::IncludeSorter::IncludeStyle IncludeStyle;
34+
utils::IncludeInserter IncludeInserter;
3635
const std::string MathHeader;
3736
};
3837

‎clang-tools-extra/clang-tidy/cppcoreguidelines/ProBoundsConstantArrayIndexCheck.cpp

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,18 @@ namespace cppcoreguidelines {
2121
ProBoundsConstantArrayIndexCheck::ProBoundsConstantArrayIndexCheck(
2222
StringRef Name, ClangTidyContext *Context)
2323
: ClangTidyCheck(Name, Context), GslHeader(Options.get("GslHeader", "")),
24-
IncludeStyle(Options.getLocalOrGlobal("IncludeStyle",
25-
utils::IncludeSorter::IS_LLVM)) {}
24+
Inserter(Options.getLocalOrGlobal("IncludeStyle",
25+
utils::IncludeSorter::IS_LLVM)) {}
2626

2727
void ProBoundsConstantArrayIndexCheck::storeOptions(
2828
ClangTidyOptions::OptionMap &Opts) {
2929
Options.store(Opts, "GslHeader", GslHeader);
30-
Options.store(Opts, "IncludeStyle", IncludeStyle);
30+
Options.store(Opts, "IncludeStyle", Inserter.getStyle());
3131
}
3232

3333
void ProBoundsConstantArrayIndexCheck::registerPPCallbacks(
3434
const SourceManager &SM, Preprocessor *PP, Preprocessor *ModuleExpanderPP) {
35-
Inserter = std::make_unique<utils::IncludeInserter>(SM, getLangOpts(),
36-
IncludeStyle);
37-
PP->addPPCallbacks(Inserter->CreatePPCallbacks());
35+
Inserter.registerPreprocessor(PP);
3836
}
3937

4038
void ProBoundsConstantArrayIndexCheck::registerMatchers(MatchFinder *Finder) {
@@ -87,9 +85,8 @@ void ProBoundsConstantArrayIndexCheck::check(
8785
IndexRange.getBegin().getLocWithOffset(-1)),
8886
", ")
8987
<< FixItHint::CreateReplacement(Matched->getEndLoc(), ")")
90-
<< Inserter->CreateIncludeInsertion(
91-
Result.SourceManager->getMainFileID(), GslHeader,
92-
/*IsAngled=*/false);
88+
<< Inserter.createMainFileIncludeInsertion(GslHeader,
89+
/*IsAngled=*/false);
9390
}
9491
return;
9592
}

‎clang-tools-extra/clang-tidy/cppcoreguidelines/ProBoundsConstantArrayIndexCheck.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ namespace cppcoreguidelines {
2323
/// http://clang.llvm.org/extra/clang-tidy/checks/cppcoreguidelines-pro-bounds-constant-array-index.html
2424
class ProBoundsConstantArrayIndexCheck : public ClangTidyCheck {
2525
const std::string GslHeader;
26-
const utils::IncludeSorter::IncludeStyle IncludeStyle;
27-
std::unique_ptr<utils::IncludeInserter> Inserter;
26+
utils::IncludeInserter Inserter;
2827

2928
public:
3029
ProBoundsConstantArrayIndexCheck(StringRef Name, ClangTidyContext *Context);

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,16 @@ const char MakeSmartPtrCheck::PointerType[] = "pointerType";
4444
MakeSmartPtrCheck::MakeSmartPtrCheck(StringRef Name, ClangTidyContext *Context,
4545
StringRef MakeSmartPtrFunctionName)
4646
: ClangTidyCheck(Name, Context),
47-
IncludeStyle(Options.getLocalOrGlobal("IncludeStyle",
48-
utils::IncludeSorter::IS_LLVM)),
47+
Inserter(Options.getLocalOrGlobal("IncludeStyle",
48+
utils::IncludeSorter::IS_LLVM)),
4949
MakeSmartPtrFunctionHeader(
5050
Options.get("MakeSmartPtrFunctionHeader", StdMemoryHeader)),
5151
MakeSmartPtrFunctionName(
5252
Options.get("MakeSmartPtrFunction", MakeSmartPtrFunctionName)),
5353
IgnoreMacros(Options.getLocalOrGlobal("IgnoreMacros", true)) {}
5454

5555
void MakeSmartPtrCheck::storeOptions(ClangTidyOptions::OptionMap &Opts) {
56-
Options.store(Opts, "IncludeStyle", IncludeStyle);
56+
Options.store(Opts, "IncludeStyle", Inserter.getStyle());
5757
Options.store(Opts, "MakeSmartPtrFunctionHeader", MakeSmartPtrFunctionHeader);
5858
Options.store(Opts, "MakeSmartPtrFunction", MakeSmartPtrFunctionName);
5959
Options.store(Opts, "IgnoreMacros", IgnoreMacros);
@@ -67,9 +67,7 @@ bool MakeSmartPtrCheck::isLanguageVersionSupported(
6767
void MakeSmartPtrCheck::registerPPCallbacks(const SourceManager &SM,
6868
Preprocessor *PP,
6969
Preprocessor *ModuleExpanderPP) {
70-
Inserter = std::make_unique<utils::IncludeInserter>(SM, getLangOpts(),
71-
IncludeStyle);
72-
PP->addPPCallbacks(Inserter->CreatePPCallbacks());
70+
Inserter.registerPreprocessor(PP);
7371
}
7472

7573
void MakeSmartPtrCheck::registerMatchers(ast_matchers::MatchFinder *Finder) {
@@ -432,7 +430,7 @@ void MakeSmartPtrCheck::insertHeader(DiagnosticBuilder &Diag, FileID FD) {
432430
if (MakeSmartPtrFunctionHeader.empty()) {
433431
return;
434432
}
435-
Diag << Inserter->CreateIncludeInsertion(
433+
Diag << Inserter.createIncludeInsertion(
436434
FD, MakeSmartPtrFunctionHeader,
437435
/*IsAngled=*/MakeSmartPtrFunctionHeader == StdMemoryHeader);
438436
}

‎clang-tools-extra/clang-tidy/modernize/MakeSmartPtrCheck.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ class MakeSmartPtrCheck : public ClangTidyCheck {
4646
static const char PointerType[];
4747

4848
private:
49-
std::unique_ptr<utils::IncludeInserter> Inserter;
50-
const utils::IncludeSorter::IncludeStyle IncludeStyle;
49+
utils::IncludeInserter Inserter;
5150
const std::string MakeSmartPtrFunctionHeader;
5251
const std::string MakeSmartPtrFunctionName;
5352
const bool IgnoreMacros;

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,12 @@ collectParamDecls(const CXXConstructorDecl *Ctor,
120120

121121
PassByValueCheck::PassByValueCheck(StringRef Name, ClangTidyContext *Context)
122122
: ClangTidyCheck(Name, Context),
123-
IncludeStyle(Options.getLocalOrGlobal("IncludeStyle",
124-
utils::IncludeSorter::IS_LLVM)),
123+
Inserter(Options.getLocalOrGlobal("IncludeStyle",
124+
utils::IncludeSorter::IS_LLVM)),
125125
ValuesOnly(Options.get("ValuesOnly", false)) {}
126126

127127
void PassByValueCheck::storeOptions(ClangTidyOptions::OptionMap &Opts) {
128-
Options.store(Opts, "IncludeStyle", IncludeStyle);
128+
Options.store(Opts, "IncludeStyle", Inserter.getStyle());
129129
Options.store(Opts, "ValuesOnly", ValuesOnly);
130130
}
131131

@@ -167,9 +167,7 @@ void PassByValueCheck::registerMatchers(MatchFinder *Finder) {
167167
void PassByValueCheck::registerPPCallbacks(const SourceManager &SM,
168168
Preprocessor *PP,
169169
Preprocessor *ModuleExpanderPP) {
170-
Inserter = std::make_unique<utils::IncludeInserter>(SM, getLangOpts(),
171-
IncludeStyle);
172-
PP->addPPCallbacks(Inserter->CreatePPCallbacks());
170+
Inserter.registerPreprocessor(PP);
173171
}
174172

175173
void PassByValueCheck::check(const MatchFinder::MatchResult &Result) {
@@ -216,7 +214,7 @@ void PassByValueCheck::check(const MatchFinder::MatchResult &Result) {
216214
Diag << FixItHint::CreateInsertion(Initializer->getRParenLoc(), ")")
217215
<< FixItHint::CreateInsertion(
218216
Initializer->getLParenLoc().getLocWithOffset(1), "std::move(")
219-
<< Inserter->CreateIncludeInsertion(
217+
<< Inserter.createIncludeInsertion(
220218
Result.SourceManager->getFileID(Initializer->getSourceLocation()),
221219
"utility",
222220
/*IsAngled=*/true);

‎clang-tools-extra/clang-tidy/modernize/PassByValueCheck.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ class PassByValueCheck : public ClangTidyCheck {
3131
void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
3232

3333
private:
34-
std::unique_ptr<utils::IncludeInserter> Inserter;
35-
const utils::IncludeSorter::IncludeStyle IncludeStyle;
34+
utils::IncludeInserter Inserter;
3635
const bool ValuesOnly;
3736
};
3837

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

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@ AST_MATCHER(Decl, isFromStdNamespace) {
7474
ReplaceAutoPtrCheck::ReplaceAutoPtrCheck(StringRef Name,
7575
ClangTidyContext *Context)
7676
: ClangTidyCheck(Name, Context),
77-
IncludeStyle(Options.getLocalOrGlobal("IncludeStyle",
78-
utils::IncludeSorter::IS_LLVM)) {}
77+
Inserter(Options.getLocalOrGlobal("IncludeStyle",
78+
utils::IncludeSorter::IS_LLVM)) {}
7979

8080
void ReplaceAutoPtrCheck::storeOptions(ClangTidyOptions::OptionMap &Opts) {
81-
Options.store(Opts, "IncludeStyle", IncludeStyle);
81+
Options.store(Opts, "IncludeStyle", Inserter.getStyle());
8282
}
8383

8484
void ReplaceAutoPtrCheck::registerMatchers(MatchFinder *Finder) {
@@ -131,9 +131,7 @@ void ReplaceAutoPtrCheck::registerMatchers(MatchFinder *Finder) {
131131
void ReplaceAutoPtrCheck::registerPPCallbacks(const SourceManager &SM,
132132
Preprocessor *PP,
133133
Preprocessor *ModuleExpanderPP) {
134-
Inserter = std::make_unique<utils::IncludeInserter>(SM, getLangOpts(),
135-
IncludeStyle);
136-
PP->addPPCallbacks(Inserter->CreatePPCallbacks());
134+
Inserter.registerPreprocessor(PP);
137135
}
138136

139137
void ReplaceAutoPtrCheck::check(const MatchFinder::MatchResult &Result) {
@@ -146,12 +144,11 @@ void ReplaceAutoPtrCheck::check(const MatchFinder::MatchResult &Result) {
146144
if (Range.isInvalid())
147145
return;
148146

149-
auto Diag =
150-
diag(Range.getBegin(), "use std::move to transfer ownership")
151-
<< FixItHint::CreateInsertion(Range.getBegin(), "std::move(")
152-
<< FixItHint::CreateInsertion(Range.getEnd(), ")")
153-
<< Inserter->CreateIncludeInsertion(SM.getMainFileID(), "utility",
154-
/*IsAngled=*/true);
147+
auto Diag = diag(Range.getBegin(), "use std::move to transfer ownership")
148+
<< FixItHint::CreateInsertion(Range.getBegin(), "std::move(")
149+
<< FixItHint::CreateInsertion(Range.getEnd(), ")")
150+
<< Inserter.createMainFileIncludeInsertion("utility",
151+
/*IsAngled=*/true);
155152

156153
return;
157154
}

‎clang-tools-extra/clang-tidy/modernize/ReplaceAutoPtrCheck.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ class ReplaceAutoPtrCheck : public ClangTidyCheck {
5353
void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
5454

5555
private:
56-
std::unique_ptr<utils::IncludeInserter> Inserter;
57-
const utils::IncludeSorter::IncludeStyle IncludeStyle;
56+
utils::IncludeInserter Inserter;
5857
};
5958

6059
} // namespace modernize

0 commit comments

Comments
 (0)