Skip to content

Commit 52d2722

Browse files
authored
Merge branch 'main' into nvptx-symbol-transform
2 parents 64e683a + 90e1c29 commit 52d2722

File tree

1,252 files changed

+80425
-10593
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,252 files changed

+80425
-10593
lines changed

.github/workflows/release-binaries-all.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,4 +91,8 @@ jobs:
9191
release-version: "${{ needs.setup-variables.outputs.release-version }}"
9292
upload: ${{ needs.setup-variables.outputs.upload == 'true'}}
9393
runs-on: "${{ matrix.runs-on }}"
94-
94+
secrets:
95+
# This will be empty for pull_request events, but that's fine, because
96+
# the release-binaries workflow does not use this secret for the
97+
# pull_request event.
98+
RELEASE_TASKS_USER_TOKEN: ${{ secrets.RELEASE_TASKS_USER_TOKEN }}

.github/workflows/release-binaries.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@ on:
3737
description: "Runner to use for the build"
3838
required: true
3939
type: string
40+
secrets:
41+
RELEASE_TASKS_USER_TOKEN:
42+
description: "Secret used to check user permissions."
43+
required: false
44+
4045

4146
permissions:
4247
contents: read # Default everything to read-only
@@ -442,7 +447,7 @@ jobs:
442447
- name: Upload Build Provenance
443448
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 #v4.3.3
444449
with:
445-
name: ${{ runner.os }}-${{ runner.arch }}-release-binary-attestation
450+
name: ${{ needs.prepare.outputs.release-binary-filename }}-attestation
446451
path: ${{ needs.prepare.outputs.release-binary-filename }}.jsonl
447452

448453
- name: Upload Release

.github/workflows/release-tasks.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ jobs:
7878
name: Build Release Binaries
7979
permissions:
8080
contents: write
81+
id-token: write
82+
attestations: write
8183
needs:
8284
- validate-tag
8385
- release-create

bolt/lib/Core/BinaryFunction.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2502,7 +2502,10 @@ void BinaryFunction::annotateCFIState() {
25022502
}
25032503
}
25042504

2505-
assert(StateStack.empty() && "corrupt CFI stack");
2505+
if (!StateStack.empty()) {
2506+
BC.errs() << "BOLT-WARNING: non-empty CFI stack at the end of " << *this
2507+
<< '\n';
2508+
}
25062509
}
25072510

25082511
namespace {

clang-tools-extra/clangd/unittests/HoverTests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1325,7 +1325,7 @@ class Foo final {})cpp";
13251325
HI.LocalScope = "";
13261326
HI.Kind = index::SymbolKind::TypeAlias;
13271327
HI.Definition = "template <typename T> using AA = A<T>";
1328-
HI.Type = {"A<T>", "type-parameter-0-0"}; // FIXME: should be 'T'
1328+
HI.Type = {"A<T>", "T"};
13291329
HI.TemplateParameters = {
13301330
{{"typename"}, std::string("T"), std::nullopt}};
13311331
}},

clang-tools-extra/test/clang-tidy/checkers/bugprone/unused-local-non-trivial-variable.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ T qux(T Generic) {
7676
async::Future<T> TemplateType;
7777
// CHECK-MESSAGES: :[[@LINE-1]]:22: warning: unused local variable 'TemplateType' of type 'async::Future<T>' [bugprone-unused-local-non-trivial-variable]
7878
a::Future<T> AliasTemplateType;
79-
// CHECK-MESSAGES: :[[@LINE-1]]:18: warning: unused local variable 'AliasTemplateType' of type 'a::Future<T>' (aka 'Future<type-parameter-0-0>') [bugprone-unused-local-non-trivial-variable]
79+
// CHECK-MESSAGES: :[[@LINE-1]]:18: warning: unused local variable 'AliasTemplateType' of type 'a::Future<T>' (aka 'Future<T>') [bugprone-unused-local-non-trivial-variable]
8080
[[maybe_unused]] async::Future<Units> MaybeUnused;
8181
return Generic;
8282
}

clang/cmake/caches/Fuchsia-stage2.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ foreach(target armv6m-none-eabi;armv7m-none-eabi;armv8m.main-none-eabi)
328328
# TODO: The preprocessor defines workaround various issues in libc and libc++ integration.
329329
# These should be addressed and removed over time.
330330
set(RUNTIMES_${target}_CMAKE_${lang}_local_flags "--target=${target} -mthumb -Wno-atomic-alignment \"-Dvfprintf(stream, format, vlist)=vprintf(format, vlist)\" \"-Dfprintf(stream, format, ...)=printf(format)\" \"-Dtimeval=struct timeval{int tv_sec; int tv_usec;}\" \"-Dgettimeofday(tv, tz)\" -D_LIBCPP_PRINT=1")
331-
if(${target} STREQUAL "armv8m.main-unknown-eabi")
331+
if(${target} STREQUAL "armv8m.main-none-eabi")
332332
set(RUNTIMES_${target}_CMAKE_${lang}_local_flags "${RUNTIMES_${target}_CMAKE_${lang}_local_flags} -mfloat-abi=softfp -march=armv8m.main+fp+dsp -mcpu=cortex-m33" CACHE STRING "")
333333
endif()
334334
set(RUNTIMES_${target}_CMAKE_${lang}_FLAGS "${RUNTIMES_${target}_CMAKE_${lang}_local_flags}" CACHE STRING "")

clang/docs/ClangFormatStyleOptions.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1484,7 +1484,7 @@ the configuration (without a prefix: ``Auto``).
14841484
* ``OAS_AlignAfterOperator`` (in configuration: ``AlignAfterOperator``)
14851485
Horizontally align operands of binary and ternary expressions.
14861486

1487-
This is similar to ``AO_Align``, except when
1487+
This is similar to ``OAS_Align``, except when
14881488
``BreakBeforeBinaryOperators`` is set, the operator is un-indented so
14891489
that the wrapped operand is aligned with the operand on the first line.
14901490

clang/docs/LanguageExtensions.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1503,6 +1503,7 @@ Conditional ``explicit`` __cpp_conditional_explicit C+
15031503
``static operator()`` __cpp_static_call_operator C++23 C++03
15041504
Attributes on Lambda-Expressions C++23 C++11
15051505
Attributes on Structured Bindings __cpp_structured_bindings C++26 C++03
1506+
Pack Indexing __cpp_pack_indexing C++26 C++03
15061507
``= delete ("should have a reason");`` __cpp_deleted_function C++26 C++03
15071508
-------------------------------------------- -------------------------------- ------------- -------------
15081509
Designated initializers (N494) C99 C89

clang/docs/OpenMPSupport.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ implementation.
314314
+------------------------------+--------------------------------------------------------------+--------------------------+-----------------------------------------------------------------------+
315315
| misc | assumes directives | :part:`worked on` | |
316316
+------------------------------+--------------------------------------------------------------+--------------------------+-----------------------------------------------------------------------+
317-
| misc | assume directive | :part:`worked on` | |
317+
| misc | assume directive | :good:`done` | |
318318
+------------------------------+--------------------------------------------------------------+--------------------------+-----------------------------------------------------------------------+
319319
| misc | nothing directive | :good:`done` | D123286 |
320320
+------------------------------+--------------------------------------------------------------+--------------------------+-----------------------------------------------------------------------+
@@ -363,5 +363,7 @@ considered for standardization. Please post on the
363363
| device extension | `'ompx_bare' clause on 'target teams' construct | :good:`prototyped` | #66844, #70612 |
364364
| | <https://www.osti.gov/servlets/purl/2205717>`_ | | |
365365
+------------------------------+-----------------------------------------------------------------------------------+--------------------------+--------------------------------------------------------+
366+
| device extension | Multi-dim 'num_teams' clause on 'target teams ompx_bare' construct | :good:`partial` | #99732, #101407 |
367+
+------------------------------+-----------------------------------------------------------------------------------+--------------------------+--------------------------------------------------------+
366368

367369
.. _Discourse forums (Runtimes - OpenMP category): https://discourse.llvm.org/c/runtimes/openmp/35

0 commit comments

Comments
 (0)