Skip to content

Commit 93e44d2

Browse files
committed
Merge from 'main' to 'sycl-web' (128 commits)
CONFLICT (content): Merge conflict in clang/tools/clang-offload-bundler/ClangOffloadBundler.cpp
2 parents effa8f2 + d5fe633 commit 93e44d2

File tree

1,485 files changed

+29868
-9643
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,485 files changed

+29868
-9643
lines changed

.github/workflows/libcxx-restart-preempted-jobs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ jobs:
145145
with:
146146
script: |
147147
const FAILURE_REGEX = /Process completed with exit code 1./
148-
const PREEMPTION_REGEX = /The runner has received a shutdown signal|The operation was canceled/
148+
const PREEMPTION_REGEX = /(The runner has received a shutdown signal)|(The operation was canceled)/
149149
150150
function log(msg) {
151151
core.notice(msg)

clang-tools-extra/clangd/index/dex/Dex.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,8 @@ class Dex : public SymbolIndex {
146146
// Set of files which were used during this index build.
147147
llvm::StringSet<> Files;
148148
// Contents of the index (symbols, references, etc.)
149+
// This is only populated if `Files` is, which applies to some but not all
150+
// consumers of this class.
149151
IndexContents IdxContents = IndexContents::None;
150152
// Size of memory retained by KeepAlive.
151153
size_t BackingDataSize = 0;

clang/docs/LanguageExtensions.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -648,7 +648,8 @@ elementwise to the input.
648648
Unless specified otherwise operation(±0) = ±0 and operation(±infinity) = ±infinity
649649

650650
The integer elementwise intrinsics, including ``__builtin_elementwise_popcount``,
651-
``__builtin_elementwise_bitreverse``, can be called in a ``constexpr`` context.
651+
``__builtin_elementwise_bitreverse``, ``__builtin_elementwise_add_sat``,
652+
``__builtin_elementwise_sub_sat`` can be called in a ``constexpr`` context.
652653

653654
============================================== ====================================================================== =========================================
654655
Name Operation Supported element types

clang/docs/RealtimeSanitizer.rst

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,10 @@ A **partial** list of flags RealtimeSanitizer respects:
196196
- ``""``
197197
- path
198198
- If set to a valid suppressions file, will suppress issue reporting. See details in `Disabling and Suppressing`_.
199-
199+
* - ``verify_interceptors``
200+
- ``true``
201+
- boolean
202+
- If true, verifies interceptors are working at initialization. The program will abort with error ``==ERROR: Interceptors are not working. This may be because RealtimeSanitizer is loaded too late (e.g. via dlopen)`` if an issue is detected.
200203

201204
Some issues with flags can be debugged using the ``verbosity=$NUM`` flag:
202205

clang/docs/ReleaseNotes.rst

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -408,12 +408,11 @@ Non-comprehensive list of changes in this release
408408
The flexible array member (FAM) can now be accessed immediately without causing
409409
issues with the sanitizer because the counter is automatically set.
410410

411-
- ``__builtin_reduce_add`` function can now be used in constant expressions.
412-
- ``__builtin_reduce_mul`` function can now be used in constant expressions.
413-
- ``__builtin_reduce_and`` function can now be used in constant expressions.
414-
- ``__builtin_reduce_or`` and ``__builtin_reduce_xor`` functions can now be used in constant expressions.
415-
- ``__builtin_elementwise_popcount`` function can now be used in constant expressions.
416-
- ``__builtin_elementwise_bitreverse`` function can now be used in constant expressions.
411+
- The following builtins can now be used in constant expressions: ``__builtin_reduce_add``,
412+
``__builtin_reduce_mul``, ``__builtin_reduce_and``, ``__builtin_reduce_or``,
413+
``__builtin_reduce_xor``, ``__builtin_elementwise_popcount``,
414+
``__builtin_elementwise_bitreverse``, ``__builtin_elementwise_add_sat``,
415+
``__builtin_elementwise_sub_sat``.
417416

418417
New Compiler Flags
419418
------------------
@@ -528,6 +527,9 @@ Attribute Changes in Clang
528527

529528
- The ``target_version`` attribute is now only supported for AArch64 and RISC-V architectures.
530529

530+
- Clang now permits the usage of the placement new operator in ``[[msvc::constexpr]]``
531+
context outside of the std namespace. (#GH74924)
532+
531533
Improvements to Clang's diagnostics
532534
-----------------------------------
533535

@@ -796,9 +798,11 @@ Bug Fixes to C++ Support
796798
- Fixed a bug where bounds of partially expanded pack indexing expressions were checked too early. (#GH116105)
797799
- Fixed an assertion failure caused by using ``consteval`` in condition in consumed analyses. (#GH117385)
798800
- Fix a crash caused by incorrect argument position in merging deduced template arguments. (#GH113659)
801+
- Fixed a parser crash when using pack indexing as a nested name specifier. (#GH119072)
799802
- Fixed an assertion failure caused by mangled names with invalid identifiers. (#GH112205)
800803
- Fixed an incorrect lambda scope of generic lambdas that caused Clang to crash when computing potential lambda
801804
captures at the end of a full expression. (#GH115931)
805+
- Clang no longer rejects deleting a pointer of incomplete enumeration type. (#GH99278)
802806

803807
Bug Fixes to AST Handling
804808
^^^^^^^^^^^^^^^^^^^^^^^^^

clang/docs/tools/dump_format_help.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ def validate(text, columns):
5757

5858
p = argparse.ArgumentParser()
5959
p.add_argument("-d", "--directory", help="directory of clang-format")
60+
p.add_argument("-o", "--output", help="path of output file")
6061
opts = p.parse_args()
6162

6263
binary = "clang-format"
@@ -66,10 +67,10 @@ def validate(text, columns):
6667
help_text = get_help_text()
6768
validate(help_text, 100)
6869

69-
with open(DOC_FILE) as f:
70+
with open(DOC_FILE, encoding="utf-8") as f:
7071
contents = f.read()
7172

7273
contents = substitute(contents, "FORMAT_HELP", help_text)
7374

74-
with open(DOC_FILE, "wb") as output:
75+
with open(opts.output if opts.output else DOC_FILE, "wb") as output:
7576
output.write(contents.encode())

clang/docs/tools/dump_format_style.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# documentation in ../ClangFormatStyleOptions.rst automatically.
44
# Run from the directory in which this file is located to update the docs.
55

6+
import argparse
67
import inspect
78
import os
89
import re
@@ -474,6 +475,10 @@ class State:
474475
return options
475476

476477

478+
p = argparse.ArgumentParser()
479+
p.add_argument("-o", "--output", help="path of output file")
480+
args = p.parse_args()
481+
477482
with open(FORMAT_STYLE_FILE) as f:
478483
opts = OptionsReader(f).read_options()
479484
with open(INCLUDE_STYLE_FILE) as f:
@@ -487,6 +492,5 @@ class State:
487492

488493
contents = substitute(contents, "FORMAT_STYLE_OPTIONS", options_text)
489494

490-
output_file_path = sys.argv[1] if len(sys.argv) == 2 else DOC_FILE
491-
with open(output_file_path, "wb") as output:
495+
with open(args.output if args.output else DOC_FILE, "wb") as output:
492496
output.write(contents.encode())

0 commit comments

Comments
 (0)