Skip to content

Commit e7aa612

Browse files
committed
Merge from 'main' to 'sycl-web' (149 commits)
CONFLICT (content): Merge conflict in clang/lib/Sema/SemaTemplateInstantiateDecl.cpp CONFLICT (content): Merge conflict in clang/lib/Sema/SemaDeclAttr.cpp
2 parents 7ea39ab + 5d086cc commit e7aa612

File tree

1,040 files changed

+14603
-8603
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,040 files changed

+14603
-8603
lines changed

bolt/test/AArch64/double_jump.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// RUN: %clang %cflags -O0 %s -o %t.exe
44
// RUN: llvm-bolt %t.exe -o %t.bolt --peepholes=double-jumps | \
55
// RUN: FileCheck %s -check-prefix=CHECKBOLT
6-
// RUN: llvm-objdump -d %t.bolt | FileCheck %s
6+
// RUN: llvm-objdump --no-print-imm-hex -d %t.bolt | FileCheck %s
77

88
// CHECKBOLT: BOLT-INFO: Peephole: 1 double jumps patched.
99

bolt/test/runtime/AArch64/adrrelaxationpass.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# RUN: %s -o %t.o
88
# RUN: %clang %cflags %t.o -o %t.exe -Wl,-q
99
# RUN: llvm-bolt %t.exe -o %t.bolt --adr-relaxation=true
10-
# RUN: llvm-objdump -d --disassemble-symbols=main %t.bolt | FileCheck %s
10+
# RUN: llvm-objdump --no-print-imm-hex -d --disassemble-symbols=main %t.bolt | FileCheck %s
1111
# RUN: %t.bolt
1212

1313
.data

clang-tools-extra/clang-doc/Generators.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ void Generator::addInfoToIndex(Index &Idx, const doc::Info *Info) {
6565
for (const auto &R : llvm::reverse(Info->Namespace)) {
6666
// Look for the current namespace in the children of the index I is
6767
// pointing.
68-
auto It = std::find(I->Children.begin(), I->Children.end(), R.USR);
68+
auto It = llvm::find(I->Children, R.USR);
6969
if (It != I->Children.end()) {
7070
// If it is found, just change I to point the namespace reference found.
7171
I = &*It;
@@ -79,7 +79,7 @@ void Generator::addInfoToIndex(Index &Idx, const doc::Info *Info) {
7979
// Look for Info in the vector where it is supposed to be; it could already
8080
// exist if it is a parent namespace of an Info already passed to this
8181
// function.
82-
auto It = std::find(I->Children.begin(), I->Children.end(), Info->USR);
82+
auto It = llvm::find(I->Children, Info->USR);
8383
if (It == I->Children.end()) {
8484
// If it is not in the vector it is inserted
8585
I->Children.emplace_back(Info->USR, Info->extractName(), Info->IT,

clang-tools-extra/clang-tidy/misc/ConfusableIdentifierCheck.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,7 @@ std::string ConfusableIdentifierCheck::skeleton(StringRef Name) {
7878
UTF8 *BufferStart = std::begin(Buffer);
7979
UTF8 *IBuffer = BufferStart;
8080
const UTF32 *ValuesStart = std::begin(Where->values);
81-
const UTF32 *ValuesEnd =
82-
std::find(std::begin(Where->values), std::end(Where->values), '\0');
81+
const UTF32 *ValuesEnd = llvm::find(Where->values, '\0');
8382
if (ConvertUTF32toUTF8(&ValuesStart, ValuesEnd, &IBuffer,
8483
std::end(Buffer),
8584
strictConversion) != conversionOK) {

clang-tools-extra/clang-tidy/misc/MisleadingBidirectional.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ static bool containsMisleadingBidi(StringRef Buffer,
7575
BidiContexts.push_back(PDI);
7676
// Close a PDI Context.
7777
else if (CodePoint == PDI) {
78-
auto R = std::find(BidiContexts.rbegin(), BidiContexts.rend(), PDI);
78+
auto R = llvm::find(llvm::reverse(BidiContexts), PDI);
7979
if (R != BidiContexts.rend())
8080
BidiContexts.resize(BidiContexts.rend() - R - 1);
8181
}

clang-tools-extra/clang-tidy/performance/UnnecessaryValueParamCheck.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,7 @@ void UnnecessaryValueParamCheck::check(const MatchFinder::MatchResult &Result) {
120120
}
121121
}
122122

123-
const size_t Index = std::find(Function->parameters().begin(),
124-
Function->parameters().end(), Param) -
123+
const size_t Index = llvm::find(Function->parameters(), Param) -
125124
Function->parameters().begin();
126125

127126
auto Diag =

clang-tools-extra/clangd/InlayHints.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -581,9 +581,8 @@ class InlayHintVisitor : public RecursiveASTVisitor<InlayHintVisitor> {
581581
static const ParmVarDecl *getParamDefinition(const ParmVarDecl *P) {
582582
if (auto *Callee = dyn_cast<FunctionDecl>(P->getDeclContext())) {
583583
if (auto *Def = Callee->getDefinition()) {
584-
auto I = std::distance(
585-
Callee->param_begin(),
586-
std::find(Callee->param_begin(), Callee->param_end(), P));
584+
auto I = std::distance(Callee->param_begin(),
585+
llvm::find(Callee->parameters(), P));
587586
if (I < Callee->getNumParams()) {
588587
return Def->getParamDecl(I);
589588
}

clang/docs/ClangFormatStyleOptions.rst

Lines changed: 78 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -846,14 +846,86 @@ the configuration (without a prefix: ``Auto``).
846846

847847

848848

849-
**AlignTrailingComments** (``Boolean``) :versionbadge:`clang-format 3.7`
850-
If ``true``, aligns trailing comments.
849+
**AlignTrailingComments** (``TrailingCommentsAlignmentStyle``) :versionbadge:`clang-format 3.7`
850+
Control of trailing comments.
851851

852-
.. code-block:: c++
852+
NOTE: As of clang-format 16 this option is not a bool but can be set
853+
to the options. Conventional bool options still can be parsed as before.
854+
855+
856+
.. code-block:: yaml
857+
858+
# Example of usage:
859+
AlignTrailingComments:
860+
Kind: Always
861+
OverEmptyLines: 2
862+
863+
Nested configuration flags:
864+
865+
Alignment options
866+
867+
* ``TrailingCommentsAlignmentKinds Kind``
868+
Specifies the way to align trailing comments
869+
870+
Possible values:
871+
872+
* ``TCAS_Leave`` (in configuration: ``Leave``)
873+
Leave trailing comments as they are.
874+
875+
.. code-block:: c++
876+
877+
int a; // comment
878+
int ab; // comment
879+
880+
int abc; // comment
881+
int abcd; // comment
882+
883+
* ``TCAS_Always`` (in configuration: ``Always``)
884+
Align trailing comments.
885+
886+
.. code-block:: c++
887+
888+
int a; // comment
889+
int ab; // comment
890+
891+
int abc; // comment
892+
int abcd; // comment
893+
894+
* ``TCAS_Never`` (in configuration: ``Never``)
895+
Don't align trailing comments but other formatter applies.
896+
897+
.. code-block:: c++
898+
899+
int a; // comment
900+
int ab; // comment
901+
902+
int abc; // comment
903+
int abcd; // comment
904+
905+
906+
* ``unsigned OverEmptyLines`` How many empty lines to apply alignment
907+
With ``MaxEmptyLinesToKeep`` is 2 and ``OverEmptyLines`` is 2,
908+
909+
.. code-block:: c++
910+
911+
int a; // all these
912+
913+
int ab; // comments are
914+
915+
916+
int abcdef; // aligned
917+
918+
And with ``MaxEmptyLinesToKeep`` is 2 and ``OverEmptyLines`` is 1,
919+
920+
.. code-block:: c++
921+
922+
int a; // these are
923+
924+
int ab; // aligned
925+
926+
927+
int abcdef; // but this isn't
853928

854-
true: false:
855-
int a; // My comment a vs. int a; // My comment a
856-
int b = 2; // comment b int b = 2; // comment about b
857929

858930
**AllowAllArgumentsOnNextLine** (``Boolean``) :versionbadge:`clang-format 9`
859931
If a function call or braced initializer list doesn't fit on a

clang/docs/CommandGuide/clang.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ Language Selection and Mode Options
201201
202202
Working draft for ISO C++ 2023 with GNU extensions
203203

204-
The default C++ language standard is ``gnu++14``.
204+
The default C++ language standard is ``gnu++17``.
205205

206206
Supported values for the OpenCL language are:
207207

clang/docs/ReleaseNotes.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -618,9 +618,9 @@ ABI Changes in Clang
618618
You can switch back to the old ABI behavior with the flag:
619619
``-fclang-abi-compat=15.0``.
620620
- GCC allows POD types to have defaulted special members. Clang historically
621-
classified such types as non-POD. Clang now matches the gcc behavior (except
622-
on Darwin and PS4). You can switch back to the old ABI behavior with the flag:
623-
``-fclang-abi-compat=15.0``.
621+
classified such types as non-POD (for the purposes of Itanium ABI). Clang now
622+
matches the gcc behavior (except on Darwin and PS4). You can switch back to
623+
the old ABI behavior with the flag: ``-fclang-abi-compat=15.0``.
624624

625625
OpenMP Support in Clang
626626
-----------------------

0 commit comments

Comments
 (0)