Skip to content

Commit b07f1df

Browse files
ronliebronlieb
authored
merge main into amd-staging (llvm#2148)
2 parents f5ce88b + 87fcfb7 commit b07f1df

File tree

243 files changed

+3796
-1799
lines changed

Some content is hidden

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

243 files changed

+3796
-1799
lines changed

‎clang-tools-extra/include-cleaner/tool/IncludeCleaner.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -312,11 +312,11 @@ std::function<bool(llvm::StringRef)> headerFilter() {
312312

313313
// Maps absolute path of each files of each compilation commands to the
314314
// absolute path of the input file.
315-
llvm::Expected<std::map<std::string, std::string>>
315+
llvm::Expected<std::map<std::string, std::string, std::less<>>>
316316
mapInputsToAbsPaths(clang::tooling::CompilationDatabase &CDB,
317317
llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> VFS,
318318
const std::vector<std::string> &Inputs) {
319-
std::map<std::string, std::string> CDBToAbsPaths;
319+
std::map<std::string, std::string, std::less<>> CDBToAbsPaths;
320320
// Factory.editedFiles()` will contain the final code, along with the
321321
// path given in the compilation database. That path can be
322322
// absolute or relative, and if it is relative, it is relative to the
@@ -395,8 +395,7 @@ int main(int argc, const char **argv) {
395395
if (Edit) {
396396
for (const auto &NameAndContent : Factory.editedFiles()) {
397397
llvm::StringRef FileName = NameAndContent.first();
398-
if (auto It = CDBToAbsPaths->find(FileName.str());
399-
It != CDBToAbsPaths->end())
398+
if (auto It = CDBToAbsPaths->find(FileName); It != CDBToAbsPaths->end())
400399
FileName = It->second;
401400

402401
const std::string &FinalCode = NameAndContent.second;

‎clang/docs/ReleaseNotes.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -598,6 +598,8 @@ Bug Fixes in This Version
598598
``#include`` directive. (#GH138094)
599599
- Fixed a crash during constant evaluation involving invalid lambda captures
600600
(#GH138832)
601+
- Fixed a crash with an invalid member function parameter list with a default
602+
argument which contains a pragma. (#GH113722)
601603
- Fixed assertion failures when generating name lookup table in modules. (#GH61065, #GH134739)
602604

603605
Bug Fixes to Compiler Builtins

‎clang/include/clang/AST/DeclCXX.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3882,7 +3882,7 @@ class UsingPackDecl final
38823882
/// Get the set of using declarations that this pack expanded into. Note that
38833883
/// some of these may still be unresolved.
38843884
ArrayRef<NamedDecl *> expansions() const {
3885-
return llvm::ArrayRef(getTrailingObjects<NamedDecl *>(), NumExpansions);
3885+
return getTrailingObjects<NamedDecl *>(NumExpansions);
38863886
}
38873887

38883888
static UsingPackDecl *Create(ASTContext &C, DeclContext *DC,

‎clang/include/clang/AST/DeclOpenACC.h

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,7 @@ class OpenACCDeclareDecl final
7676
std::uninitialized_value_construct(
7777
getTrailingObjects<const OpenACCClause *>(),
7878
getTrailingObjects<const OpenACCClause *>() + NumClauses);
79-
setClauseList(MutableArrayRef(getTrailingObjects<const OpenACCClause *>(),
80-
NumClauses));
79+
setClauseList(getTrailingObjects<const OpenACCClause *>(NumClauses));
8180
}
8281

8382
OpenACCDeclareDecl(DeclContext *DC, SourceLocation StartLoc,
@@ -89,8 +88,7 @@ class OpenACCDeclareDecl final
8988
llvm::uninitialized_copy(Clauses,
9089
getTrailingObjects<const OpenACCClause *>());
9190

92-
setClauseList(MutableArrayRef(getTrailingObjects<const OpenACCClause *>(),
93-
Clauses.size()));
91+
setClauseList(getTrailingObjects<const OpenACCClause *>(Clauses.size()));
9492
}
9593

9694
public:
@@ -122,8 +120,7 @@ class OpenACCRoutineDecl final
122120
std::uninitialized_value_construct(
123121
getTrailingObjects<const OpenACCClause *>(),
124122
getTrailingObjects<const OpenACCClause *>() + NumClauses);
125-
setClauseList(MutableArrayRef(getTrailingObjects<const OpenACCClause *>(),
126-
NumClauses));
123+
setClauseList(getTrailingObjects<const OpenACCClause *>(NumClauses));
127124
}
128125

129126
OpenACCRoutineDecl(DeclContext *DC, SourceLocation StartLoc,
@@ -139,8 +136,7 @@ class OpenACCRoutineDecl final
139136
// Initialize the trailing storage.
140137
llvm::uninitialized_copy(Clauses,
141138
getTrailingObjects<const OpenACCClause *>());
142-
setClauseList(MutableArrayRef(getTrailingObjects<const OpenACCClause *>(),
143-
Clauses.size()));
139+
setClauseList(getTrailingObjects<const OpenACCClause *>(Clauses.size()));
144140
}
145141

146142
public:

‎clang/include/clang/AST/ExprCXX.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2945,7 +2945,7 @@ class TypeTraitExpr final
29452945

29462946
/// Retrieve the argument types.
29472947
ArrayRef<TypeSourceInfo *> getArgs() const {
2948-
return llvm::ArrayRef(getTrailingObjects<TypeSourceInfo *>(), getNumArgs());
2948+
return getTrailingObjects<TypeSourceInfo *>(getNumArgs());
29492949
}
29502950

29512951
SourceLocation getBeginLoc() const LLVM_READONLY { return Loc; }
@@ -3619,7 +3619,7 @@ class ExprWithCleanups final
36193619
ArrayRef<CleanupObject> objects);
36203620

36213621
ArrayRef<CleanupObject> getObjects() const {
3622-
return llvm::ArrayRef(getTrailingObjects<CleanupObject>(), getNumObjects());
3622+
return getTrailingObjects<CleanupObject>(getNumObjects());
36233623
}
36243624

36253625
unsigned getNumObjects() const { return ExprWithCleanupsBits.NumObjects; }
@@ -5126,19 +5126,19 @@ class CXXParenListInitExpr final
51265126
void updateDependence() { setDependence(computeDependence(this)); }
51275127

51285128
MutableArrayRef<Expr *> getInitExprs() {
5129-
return MutableArrayRef(getTrailingObjects<Expr *>(), NumExprs);
5129+
return getTrailingObjects<Expr *>(NumExprs);
51305130
}
51315131

51325132
const ArrayRef<Expr *> getInitExprs() const {
5133-
return ArrayRef(getTrailingObjects<Expr *>(), NumExprs);
5133+
return getTrailingObjects<Expr *>(NumExprs);
51345134
}
51355135

51365136
ArrayRef<Expr *> getUserSpecifiedInitExprs() {
5137-
return ArrayRef(getTrailingObjects<Expr *>(), NumUserSpecifiedExprs);
5137+
return getTrailingObjects<Expr *>(NumUserSpecifiedExprs);
51385138
}
51395139

51405140
const ArrayRef<Expr *> getUserSpecifiedInitExprs() const {
5141-
return ArrayRef(getTrailingObjects<Expr *>(), NumUserSpecifiedExprs);
5141+
return getTrailingObjects<Expr *>(NumUserSpecifiedExprs);
51425142
}
51435143

51445144
SourceLocation getBeginLoc() const LLVM_READONLY { return LParenLoc; }

‎clang/include/clang/AST/ExprOpenMP.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,12 @@ class OMPArrayShapingExpr final
7878

7979
/// Fetches the dimensions for array shaping expression.
8080
ArrayRef<Expr *> getDimensions() const {
81-
return llvm::ArrayRef(getTrailingObjects<Expr *>(), NumDims);
81+
return getTrailingObjects<Expr *>(NumDims);
8282
}
8383

8484
/// Fetches source ranges for the brackets os the array shaping expression.
8585
ArrayRef<SourceRange> getBracketsRanges() const {
86-
return llvm::ArrayRef(getTrailingObjects<SourceRange>(), NumDims);
86+
return getTrailingObjects<SourceRange>(NumDims);
8787
}
8888

8989
/// Fetches base expression of array shaping expression.

‎clang/include/clang/AST/OpenACCClause.h

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -541,8 +541,7 @@ class OpenACCWaitClause final
541541
auto *Exprs = getTrailingObjects<Expr *>();
542542
llvm::uninitialized_copy(ArrayRef(DevNumExpr), Exprs);
543543
llvm::uninitialized_copy(QueueIdExprs, Exprs + 1);
544-
setExprs(
545-
MutableArrayRef(getTrailingObjects<Expr *>(), QueueIdExprs.size() + 1));
544+
setExprs(getTrailingObjects<Expr *>(QueueIdExprs.size() + 1));
546545
}
547546

548547
public:
@@ -580,7 +579,7 @@ class OpenACCNumGangsClause final
580579
: OpenACCClauseWithExprs(OpenACCClauseKind::NumGangs, BeginLoc, LParenLoc,
581580
EndLoc) {
582581
llvm::uninitialized_copy(IntExprs, getTrailingObjects<Expr *>());
583-
setExprs(MutableArrayRef(getTrailingObjects<Expr *>(), IntExprs.size()));
582+
setExprs(getTrailingObjects<Expr *>(IntExprs.size()));
584583
}
585584

586585
public:
@@ -609,7 +608,7 @@ class OpenACCTileClause final
609608
: OpenACCClauseWithExprs(OpenACCClauseKind::Tile, BeginLoc, LParenLoc,
610609
EndLoc) {
611610
llvm::uninitialized_copy(SizeExprs, getTrailingObjects<Expr *>());
612-
setExprs(MutableArrayRef(getTrailingObjects<Expr *>(), SizeExprs.size()));
611+
setExprs(getTrailingObjects<Expr *>(SizeExprs.size()));
613612
}
614613

615614
public:
@@ -847,7 +846,7 @@ class OpenACCPrivateClause final
847846
: OpenACCClauseWithVarList(OpenACCClauseKind::Private, BeginLoc,
848847
LParenLoc, EndLoc) {
849848
llvm::uninitialized_copy(VarList, getTrailingObjects<Expr *>());
850-
setExprs(MutableArrayRef(getTrailingObjects<Expr *>(), VarList.size()));
849+
setExprs(getTrailingObjects<Expr *>(VarList.size()));
851850
}
852851

853852
public:
@@ -869,7 +868,7 @@ class OpenACCFirstPrivateClause final
869868
: OpenACCClauseWithVarList(OpenACCClauseKind::FirstPrivate, BeginLoc,
870869
LParenLoc, EndLoc) {
871870
llvm::uninitialized_copy(VarList, getTrailingObjects<Expr *>());
872-
setExprs(MutableArrayRef(getTrailingObjects<Expr *>(), VarList.size()));
871+
setExprs(getTrailingObjects<Expr *>(VarList.size()));
873872
}
874873

875874
public:
@@ -891,7 +890,7 @@ class OpenACCDevicePtrClause final
891890
: OpenACCClauseWithVarList(OpenACCClauseKind::DevicePtr, BeginLoc,
892891
LParenLoc, EndLoc) {
893892
llvm::uninitialized_copy(VarList, getTrailingObjects<Expr *>());
894-
setExprs(MutableArrayRef(getTrailingObjects<Expr *>(), VarList.size()));
893+
setExprs(getTrailingObjects<Expr *>(VarList.size()));
895894
}
896895

897896
public:
@@ -913,7 +912,7 @@ class OpenACCAttachClause final
913912
: OpenACCClauseWithVarList(OpenACCClauseKind::Attach, BeginLoc, LParenLoc,
914913
EndLoc) {
915914
llvm::uninitialized_copy(VarList, getTrailingObjects<Expr *>());
916-
setExprs(MutableArrayRef(getTrailingObjects<Expr *>(), VarList.size()));
915+
setExprs(getTrailingObjects<Expr *>(VarList.size()));
917916
}
918917

919918
public:
@@ -935,7 +934,7 @@ class OpenACCDetachClause final
935934
: OpenACCClauseWithVarList(OpenACCClauseKind::Detach, BeginLoc, LParenLoc,
936935
EndLoc) {
937936
llvm::uninitialized_copy(VarList, getTrailingObjects<Expr *>());
938-
setExprs(MutableArrayRef(getTrailingObjects<Expr *>(), VarList.size()));
937+
setExprs(getTrailingObjects<Expr *>(VarList.size()));
939938
}
940939

941940
public:
@@ -957,7 +956,7 @@ class OpenACCDeleteClause final
957956
: OpenACCClauseWithVarList(OpenACCClauseKind::Delete, BeginLoc, LParenLoc,
958957
EndLoc) {
959958
llvm::uninitialized_copy(VarList, getTrailingObjects<Expr *>());
960-
setExprs(MutableArrayRef(getTrailingObjects<Expr *>(), VarList.size()));
959+
setExprs(getTrailingObjects<Expr *>(VarList.size()));
961960
}
962961

963962
public:
@@ -979,7 +978,7 @@ class OpenACCUseDeviceClause final
979978
: OpenACCClauseWithVarList(OpenACCClauseKind::UseDevice, BeginLoc,
980979
LParenLoc, EndLoc) {
981980
llvm::uninitialized_copy(VarList, getTrailingObjects<Expr *>());
982-
setExprs(MutableArrayRef(getTrailingObjects<Expr *>(), VarList.size()));
981+
setExprs(getTrailingObjects<Expr *>(VarList.size()));
983982
}
984983

985984
public:
@@ -1001,7 +1000,7 @@ class OpenACCNoCreateClause final
10011000
: OpenACCClauseWithVarList(OpenACCClauseKind::NoCreate, BeginLoc,
10021001
LParenLoc, EndLoc) {
10031002
llvm::uninitialized_copy(VarList, getTrailingObjects<Expr *>());
1004-
setExprs(MutableArrayRef(getTrailingObjects<Expr *>(), VarList.size()));
1003+
setExprs(getTrailingObjects<Expr *>(VarList.size()));
10051004
}
10061005

10071006
public:
@@ -1023,7 +1022,7 @@ class OpenACCPresentClause final
10231022
: OpenACCClauseWithVarList(OpenACCClauseKind::Present, BeginLoc,
10241023
LParenLoc, EndLoc) {
10251024
llvm::uninitialized_copy(VarList, getTrailingObjects<Expr *>());
1026-
setExprs(MutableArrayRef(getTrailingObjects<Expr *>(), VarList.size()));
1025+
setExprs(getTrailingObjects<Expr *>(VarList.size()));
10271026
}
10281027

10291028
public:
@@ -1044,7 +1043,7 @@ class OpenACCHostClause final
10441043
: OpenACCClauseWithVarList(OpenACCClauseKind::Host, BeginLoc, LParenLoc,
10451044
EndLoc) {
10461045
llvm::uninitialized_copy(VarList, getTrailingObjects<Expr *>());
1047-
setExprs(MutableArrayRef(getTrailingObjects<Expr *>(), VarList.size()));
1046+
setExprs(getTrailingObjects<Expr *>(VarList.size()));
10481047
}
10491048

10501049
public:
@@ -1067,7 +1066,7 @@ class OpenACCDeviceClause final
10671066
: OpenACCClauseWithVarList(OpenACCClauseKind::Device, BeginLoc, LParenLoc,
10681067
EndLoc) {
10691068
llvm::uninitialized_copy(VarList, getTrailingObjects<Expr *>());
1070-
setExprs(MutableArrayRef(getTrailingObjects<Expr *>(), VarList.size()));
1069+
setExprs(getTrailingObjects<Expr *>(VarList.size()));
10711070
}
10721071

10731072
public:
@@ -1095,7 +1094,7 @@ class OpenACCCopyClause final
10951094
Spelling == OpenACCClauseKind::PresentOrCopy) &&
10961095
"Invalid clause kind for copy-clause");
10971096
llvm::uninitialized_copy(VarList, getTrailingObjects<Expr *>());
1098-
setExprs(MutableArrayRef(getTrailingObjects<Expr *>(), VarList.size()));
1097+
setExprs(getTrailingObjects<Expr *>(VarList.size()));
10991098
}
11001099

11011100
public:
@@ -1129,7 +1128,7 @@ class OpenACCCopyInClause final
11291128
Spelling == OpenACCClauseKind::PresentOrCopyIn) &&
11301129
"Invalid clause kind for copyin-clause");
11311130
llvm::uninitialized_copy(VarList, getTrailingObjects<Expr *>());
1132-
setExprs(MutableArrayRef(getTrailingObjects<Expr *>(), VarList.size()));
1131+
setExprs(getTrailingObjects<Expr *>(VarList.size()));
11331132
}
11341133

11351134
public:
@@ -1162,7 +1161,7 @@ class OpenACCCopyOutClause final
11621161
Spelling == OpenACCClauseKind::PresentOrCopyOut) &&
11631162
"Invalid clause kind for copyout-clause");
11641163
llvm::uninitialized_copy(VarList, getTrailingObjects<Expr *>());
1165-
setExprs(MutableArrayRef(getTrailingObjects<Expr *>(), VarList.size()));
1164+
setExprs(getTrailingObjects<Expr *>(VarList.size()));
11661165
}
11671166

11681167
public:
@@ -1195,7 +1194,7 @@ class OpenACCCreateClause final
11951194
Spelling == OpenACCClauseKind::PresentOrCreate) &&
11961195
"Invalid clause kind for create-clause");
11971196
llvm::uninitialized_copy(VarList, getTrailingObjects<Expr *>());
1198-
setExprs(MutableArrayRef(getTrailingObjects<Expr *>(), VarList.size()));
1197+
setExprs(getTrailingObjects<Expr *>(VarList.size()));
11991198
}
12001199

12011200
public:
@@ -1225,7 +1224,7 @@ class OpenACCReductionClause final
12251224
LParenLoc, EndLoc),
12261225
Op(Operator) {
12271226
llvm::uninitialized_copy(VarList, getTrailingObjects<Expr *>());
1228-
setExprs(MutableArrayRef(getTrailingObjects<Expr *>(), VarList.size()));
1227+
setExprs(getTrailingObjects<Expr *>(VarList.size()));
12291228
}
12301229

12311230
public:
@@ -1251,7 +1250,7 @@ class OpenACCLinkClause final
12511250
: OpenACCClauseWithVarList(OpenACCClauseKind::Link, BeginLoc, LParenLoc,
12521251
EndLoc) {
12531252
llvm::uninitialized_copy(VarList, getTrailingObjects<Expr *>());
1254-
setExprs(MutableArrayRef(getTrailingObjects<Expr *>(), VarList.size()));
1253+
setExprs(getTrailingObjects<Expr *>(VarList.size()));
12551254
}
12561255

12571256
public:
@@ -1275,7 +1274,7 @@ class OpenACCDeviceResidentClause final
12751274
: OpenACCClauseWithVarList(OpenACCClauseKind::DeviceResident, BeginLoc,
12761275
LParenLoc, EndLoc) {
12771276
llvm::uninitialized_copy(VarList, getTrailingObjects<Expr *>());
1278-
setExprs(MutableArrayRef(getTrailingObjects<Expr *>(), VarList.size()));
1277+
setExprs(getTrailingObjects<Expr *>(VarList.size()));
12791278
}
12801279

12811280
public:

‎clang/include/clang/AST/OpenMPClause.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3820,10 +3820,10 @@ class OMPReductionClause final
38203820

38213821
/// Get the list of help private variable reduction flags
38223822
MutableArrayRef<bool> getPrivateVariableReductionFlags() {
3823-
return MutableArrayRef(getTrailingObjects<bool>(), varlist_size());
3823+
return getTrailingObjects<bool>(varlist_size());
38243824
}
38253825
ArrayRef<bool> getPrivateVariableReductionFlags() const {
3826-
return ArrayRef(getTrailingObjects<bool>(), varlist_size());
3826+
return getTrailingObjects<bool>(varlist_size());
38273827
}
38283828

38293829
/// Returns the number of Expr* objects in trailing storage
@@ -9660,8 +9660,7 @@ class OMPChildren final
96609660

96619661
/// Get the clauses storage.
96629662
MutableArrayRef<OMPClause *> getClauses() {
9663-
return llvm::MutableArrayRef(getTrailingObjects<OMPClause *>(),
9664-
NumClauses);
9663+
return getTrailingObjects<OMPClause *>(NumClauses);
96659664
}
96669665
ArrayRef<OMPClause *> getClauses() const {
96679666
return const_cast<OMPChildren *>(this)->getClauses();

0 commit comments

Comments
 (0)