Skip to content

Commit 44a3c35

Browse files
nunoplopesnunoplopes
authored
Merge branch 'main' into microsoft-abi-poison
2 parents eac0aa0 + c6f753b commit 44a3c35

File tree

307 files changed

+10915
-5486
lines changed

Some content is hidden

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

307 files changed

+10915
-5486
lines changed

‎clang-tools-extra/clang-doc/Serialize.cpp‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -236,10 +236,10 @@ static RecordDecl *getRecordDeclForType(const QualType &T) {
236236
return nullptr;
237237
}
238238

239-
TypeInfo getTypeInfoForType(const QualType &T) {
239+
TypeInfo getTypeInfoForType(const QualType &T, const PrintingPolicy &Policy) {
240240
const TagDecl *TD = getTagDeclForType(T);
241241
if (!TD)
242-
return TypeInfo(Reference(SymbolID(), T.getAsString()));
242+
return TypeInfo(Reference(SymbolID(), T.getAsString(Policy)));
243243

244244
InfoType IT;
245245
if (dyn_cast<EnumDecl>(TD)) {
@@ -250,7 +250,7 @@ TypeInfo getTypeInfoForType(const QualType &T) {
250250
IT = InfoType::IT_default;
251251
}
252252
return TypeInfo(Reference(getUSRForDecl(TD), TD->getNameAsString(), IT,
253-
T.getAsString(), getInfoRelativePath(TD)));
253+
T.getAsString(Policy), getInfoRelativePath(TD)));
254254
}
255255

256256
static bool isPublic(const clang::AccessSpecifier AS,
@@ -379,10 +379,11 @@ static void parseFields(RecordInfo &I, const RecordDecl *D, bool PublicOnly,
379379
if (!shouldSerializeInfo(PublicOnly, /*IsInAnonymousNamespace=*/false, F))
380380
continue;
381381

382+
auto &LO = F->getLangOpts();
382383
// Use getAccessUnsafe so that we just get the default AS_none if it's not
383384
// valid, as opposed to an assert.
384385
MemberTypeInfo &NewMember = I.Members.emplace_back(
385-
getTypeInfoForType(F->getTypeSourceInfo()->getType()),
386+
getTypeInfoForType(F->getTypeSourceInfo()->getType(), LO),
386387
F->getNameAsString(),
387388
getFinalAccessSpecifier(Access, F->getAccessUnsafe()));
388389
populateMemberTypeInfo(NewMember, F);
@@ -412,9 +413,10 @@ static void parseEnumerators(EnumInfo &I, const EnumDecl *D) {
412413
}
413414

414415
static void parseParameters(FunctionInfo &I, const FunctionDecl *D) {
416+
auto &LO = D->getLangOpts();
415417
for (const ParmVarDecl *P : D->parameters()) {
416418
FieldTypeInfo &FieldInfo = I.Params.emplace_back(
417-
getTypeInfoForType(P->getOriginalType()), P->getNameAsString());
419+
getTypeInfoForType(P->getOriginalType(), LO), P->getNameAsString());
418420
FieldInfo.DefaultValue = getSourceCode(D, P->getDefaultArgRange());
419421
}
420422
}
@@ -541,7 +543,8 @@ static void populateFunctionInfo(FunctionInfo &I, const FunctionDecl *D,
541543
bool &IsInAnonymousNamespace) {
542544
populateSymbolInfo(I, D, FC, LineNumber, Filename, IsFileInRootDir,
543545
IsInAnonymousNamespace);
544-
I.ReturnType = getTypeInfoForType(D->getReturnType());
546+
auto &LO = D->getLangOpts();
547+
I.ReturnType = getTypeInfoForType(D->getReturnType(), LO);
545548
parseParameters(I, D);
546549

547550
PopulateTemplateParameters(I.Template, D);
@@ -783,7 +786,8 @@ emitInfo(const TypedefDecl *D, const FullComment *FC, int LineNumber,
783786
return {};
784787

785788
Info.DefLoc.emplace(LineNumber, File, IsFileInRootDir);
786-
Info.Underlying = getTypeInfoForType(D->getUnderlyingType());
789+
auto &LO = D->getLangOpts();
790+
Info.Underlying = getTypeInfoForType(D->getUnderlyingType(), LO);
787791
if (Info.Underlying.Type.Name.empty()) {
788792
// Typedef for an unnamed type. This is like "typedef struct { } Foo;"
789793
// The record serializer explicitly checks for this syntax and constructs
@@ -809,7 +813,8 @@ emitInfo(const TypeAliasDecl *D, const FullComment *FC, int LineNumber,
809813
return {};
810814

811815
Info.DefLoc.emplace(LineNumber, File, IsFileInRootDir);
812-
Info.Underlying = getTypeInfoForType(D->getUnderlyingType());
816+
auto &LO = D->getLangOpts();
817+
Info.Underlying = getTypeInfoForType(D->getUnderlyingType(), LO);
813818
Info.IsUsing = true;
814819

815820
// Info is wrapped in its parent scope so is returned in the second position.

‎clang-tools-extra/clang-tidy/misc/IncludeCleanerCheck.cpp‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,9 @@ struct MissingIncludeInfo {
5757
IncludeCleanerCheck::IncludeCleanerCheck(StringRef Name,
5858
ClangTidyContext *Context)
5959
: ClangTidyCheck(Name, Context),
60-
IgnoreHeaders(utils::options::parseStringList(
61-
Options.getLocalOrGlobal("IgnoreHeaders", ""))),
62-
DeduplicateFindings(
63-
Options.getLocalOrGlobal("DeduplicateFindings", true)) {
60+
IgnoreHeaders(
61+
utils::options::parseStringList(Options.get("IgnoreHeaders", ""))),
62+
DeduplicateFindings(Options.get("DeduplicateFindings", true)) {
6463
for (const auto &Header : IgnoreHeaders) {
6564
if (!llvm::Regex{Header}.isValid())
6665
configurationDiag("Invalid ignore headers regex '%0'") << Header;

‎clang-tools-extra/clang-tidy/readability/InconsistentDeclarationParameterNameCheck.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class InconsistentDeclarationParameterNameCheck : public ClangTidyCheck {
2626
ClangTidyContext *Context)
2727
: ClangTidyCheck(Name, Context),
2828
IgnoreMacros(Options.getLocalOrGlobal("IgnoreMacros", true)),
29-
Strict(Options.getLocalOrGlobal("Strict", false)) {}
29+
Strict(Options.get("Strict", false)) {}
3030

3131
void storeOptions(ClangTidyOptions::OptionMap &Opts) override;
3232
void registerMatchers(ast_matchers::MatchFinder *Finder) override;

‎clang-tools-extra/docs/ReleaseNotes.rst‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,24 @@ Improvements to clang-tidy
115115
- Improved :program:`run-clang-tidy.py` script. Fixed minor shutdown noise
116116
happening on certain platforms when interrupting the script.
117117

118+
- Removed :program:`clang-tidy`'s global options for most of checks. All options
119+
are changed to local options except `IncludeStyle`, `StrictMode` and
120+
`IgnoreMacros`.
121+
122+
.. csv-table::
123+
:header: "Check", "Options removed from global option"
124+
125+
:doc:`bugprone-reserved-identifier <clang-tidy/checks/bugprone/reserved-identifier>`, AggressiveDependentMemberLookup
126+
:doc:`bugprone-unchecked-optional-access <clang-tidy/checks/bugprone/unchecked-optional-access>`, IgnoreSmartPointerDereference
127+
:doc:`cppcoreguidelines-pro-type-member-init <clang-tidy/checks/cppcoreguidelines/pro-type-member-init>`, UseAssignment
128+
:doc:`cppcoreguidelines-rvalue-reference-param-not-moved <clang-tidy/checks/cppcoreguidelines/rvalue-reference-param-not-moved>`, AllowPartialMove; IgnoreUnnamedParams; IgnoreNonDeducedTemplateTypes
129+
:doc:`misc-include-cleaner <clang-tidy/checks/misc/include-cleaner>`, IgnoreHeaders; DeduplicateFindings
130+
:doc:`performance-inefficient-vector-operation <clang-tidy/checks/performance/inefficient-vector-operation>`, EnableProto
131+
:doc:`readability-identifier-naming <clang-tidy/checks/readability/identifier-naming>`, AggressiveDependentMemberLookup
132+
:doc:`readability-inconsistent-declaration-parameter-name <clang-tidy/checks/readability/inconsistent-declaration-parameter-name>`, Strict
133+
:doc:`readability-redundant-access-specifiers <clang-tidy/checks/readability/redundant-access-specifiers>`, CheckFirstDeclaration
134+
:doc:`readability-redundant-casting <clang-tidy/checks/readability/redundant-casting>`, IgnoreTypeAliases
135+
118136
New checks
119137
^^^^^^^^^^
120138

‎clang-tools-extra/test/clang-doc/builtin_types.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ extern bool b();
2323
// YAML-NEXT: Filename: '{{.*}}'
2424
// YAML-NEXT: ReturnType:
2525
// YAML-NEXT: Type:
26-
// YAML-NEXT: Name: '_Bool'
27-
// YAML-NEXT: QualName: '_Bool'
26+
// YAML-NEXT: Name: 'bool'
27+
// YAML-NEXT: QualName: 'bool'
2828

2929
// MD: ### b
30-
// MD: *_Bool b()*
30+
// MD: *bool b()*
3131

3232
char c();
3333

‎clang-tools-extra/test/clang-doc/templates.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ void function<bool, 0>(bool x) {}
8080
// YAML-NEXT: Filename: '{{.*}}'
8181
// YAML-NEXT: Params:
8282
// YAML-NEXT: - Type:
83-
// YAML-NEXT: Name: '_Bool'
84-
// YAML-NEXT: QualName: '_Bool'
83+
// YAML-NEXT: Name: 'bool'
84+
// YAML-NEXT: QualName: 'bool'
8585
// YAML-NEXT: Name: 'x'
8686
// YAML-NEXT: ReturnType:
8787
// YAML-NEXT: Type:
@@ -95,7 +95,7 @@ void function<bool, 0>(bool x) {}
9595
// YAML-NEXT: - Contents: '0'
9696

9797
// MD: ### function
98-
// MD: *void function(_Bool x)*
98+
// MD: *void function(bool x)*
9999
// MD: *Defined at {{.*}}templates.cpp#[[# @LINE - 26]]*
100100

101101
/// A Tuple type
@@ -136,21 +136,21 @@ tuple<int,int,bool> func_with_tuple_param(tuple<int,int,bool> t){ return t;}
136136
// YAML-NEXT: - Type:
137137
// YAML-NEXT: Type: Record
138138
// YAML-NEXT: Name: 'tuple'
139-
// YAML-NEXT: QualName: 'tuple<int, int, _Bool>'
139+
// YAML-NEXT: QualName: 'tuple<int, int, bool>'
140140
// YAML-NEXT: USR: '{{([0-9A-F]{40})}}'
141141
// YAML-NEXT: Path: 'GlobalNamespace'
142142
// YAML-NEXT: Name: 't'
143143
// YAML-NEXT: ReturnType:
144144
// YAML-NEXT: Type:
145145
// YAML-NEXT: Type: Record
146146
// YAML-NEXT: Name: 'tuple'
147-
// YAML-NEXT: QualName: 'tuple<int, int, _Bool>'
147+
// YAML-NEXT: QualName: 'tuple<int, int, bool>'
148148
// YAML-NEXT: USR: '{{([0-9A-F]{40})}}'
149149
// YAML-NEXT: Path: 'GlobalNamespace'
150150
// YAML-NEXT: ...
151151

152152
// MD: ### func_with_tuple_param
153-
// MD: *tuple<int, int, _Bool> func_with_tuple_param(tuple<int, int, _Bool> t)*
153+
// MD: *tuple<int, int, bool> func_with_tuple_param(tuple<int, int, bool> t)*
154154
// MD: *Defined at {{.*}}templates.cpp#[[# @LINE - 44]]*
155155
// MD: A function with a tuple parameter
156156
// MD: **t** The input to func_with_tuple_param

‎clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment-strict.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %check_clang_tidy %s bugprone-argument-comment %t -- \
2-
// RUN: -config="{CheckOptions: {StrictMode: true}}" --
2+
// RUN: -config="{CheckOptions: {bugprone-argument-comment.StrictMode: true}}" --
33

44
void f(int _with_underscores_);
55
void g(int x_);

‎clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-const-cast.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %check_clang_tidy -check-suffix=STRICT %s cppcoreguidelines-pro-type-const-cast %t -- -config="{CheckOptions: {StrictMode: true}}"
1+
// RUN: %check_clang_tidy -check-suffix=STRICT %s cppcoreguidelines-pro-type-const-cast %t -- -config="{CheckOptions: {cppcoreguidelines-pro-type-const-cast.StrictMode: true}}"
22
// RUN: %check_clang_tidy -check-suffix=NSTRICT %s cppcoreguidelines-pro-type-const-cast %t
33

44
namespace Const {

‎clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-static-cast-downcast.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %check_clang_tidy -check-suffixes=NSTRICT,STRICT %s cppcoreguidelines-pro-type-static-cast-downcast %t
2-
// RUN: %check_clang_tidy -check-suffix=NSTRICT %s cppcoreguidelines-pro-type-static-cast-downcast %t -- -config="{CheckOptions: {StrictMode: false}}"
2+
// RUN: %check_clang_tidy -check-suffix=NSTRICT %s cppcoreguidelines-pro-type-static-cast-downcast %t -- -config="{CheckOptions: {cppcoreguidelines-pro-type-static-cast-downcast.StrictMode: false}}"
33

44
class Base {
55
};

‎clang-tools-extra/test/clang-tidy/checkers/misc/unused-parameters-strict.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %check_clang_tidy %s misc-unused-parameters %t -- \
2-
// RUN: -config="{CheckOptions: {StrictMode: true}}" --
2+
// RUN: -config="{CheckOptions: {misc-unused-parameters.StrictMode: true}}" --
33

44
// Warn on empty function bodies in StrictMode.
55
namespace strict_mode {

0 commit comments

Comments
 (0)