Skip to content

Commit c99c3bc

Browse files
ronliebronlieb
committed
merge main into amd-staging
2 parents 6335f74 + 3310c0b commit c99c3bc

File tree

230 files changed

+9089
-4403
lines changed

Some content is hidden

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

230 files changed

+9089
-4403
lines changed

‎.ci/generate_test_report_lib.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ def plural(num_tests):
267267
report.extend(
268268
[
269269
"",
270-
"All tests passed but another part of the build **failed**. "
270+
"All executed tests passed, but another part of the build **failed**. "
271271
"Information about the build failure could not be automatically "
272272
"obtained.",
273273
"",
@@ -278,7 +278,7 @@ def plural(num_tests):
278278
report.extend(
279279
[
280280
"",
281-
"All tests passed but another part of the build **failed**. Click on "
281+
"All executed tests passed, but another part of the build **failed**. Click on "
282282
"a failure below to see the details.",
283283
"",
284284
]

‎.ci/generate_test_report_lib_test.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ def test_no_failures_build_failed(self):
343343
344344
* 1 test passed
345345
346-
All tests passed but another part of the build **failed**. Information about the build failure could not be automatically obtained.
346+
All executed tests passed, but another part of the build **failed**. Information about the build failure could not be automatically obtained.
347347
348348
Download the build's log file to see the details.
349349
@@ -390,7 +390,7 @@ def test_no_failures_build_failed_ninja_log(self):
390390
391391
* 1 test passed
392392
393-
All tests passed but another part of the build **failed**. Click on a failure below to see the details.
393+
All executed tests passed, but another part of the build **failed**. Click on a failure below to see the details.
394394
395395
<details>
396396
<summary>test/4.stamp</summary>
@@ -476,7 +476,7 @@ def test_no_failures_multiple_build_failed_ninja_log(self):
476476
477477
* 1 test passed
478478
479-
All tests passed but another part of the build **failed**. Click on a failure below to see the details.
479+
All executed tests passed, but another part of the build **failed**. Click on a failure below to see the details.
480480
481481
<details>
482482
<summary>touch test/2.stamp</summary>
@@ -978,7 +978,7 @@ def test_generate_report_end_to_end(self):
978978
979979
* 1 test passed
980980
981-
All tests passed but another part of the build **failed**. Click on a failure below to see the details.
981+
All executed tests passed, but another part of the build **failed**. Click on a failure below to see the details.
982982
983983
<details>
984984
<summary>test/4.stamp</summary>

‎.github/workflows/libc-overlay-tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
# Set fail-fast to false to ensure that feedback is delivered for all matrix combinations.
1717
fail-fast: false
1818
matrix:
19-
os: [ubuntu-24.04, ubuntu-24.04-arm, windows-2022, windows-2025, macos-14]
19+
os: [ubuntu-24.04, ubuntu-24.04-arm, windows-2022, windows-2025, macos-15]
2020
include:
2121
# TODO: add linux gcc when it is fixed
2222
- os: ubuntu-24.04
@@ -35,7 +35,7 @@ jobs:
3535
compiler:
3636
c_compiler: clang-cl
3737
cpp_compiler: clang-cl
38-
- os: macos-14
38+
- os: macos-15
3939
compiler:
4040
c_compiler: clang
4141
cpp_compiler: clang++

‎bolt/lib/Passes/PAuthGadgetScanner.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ class SrcSafetyAnalysis {
547547

548548
// Being trusted is a strictly stronger property than being
549549
// safe-to-dereference.
550-
assert(!Next.TrustedRegs.test(Next.SafeToDerefRegs) &&
550+
assert(Next.TrustedRegs.subsetOf(Next.SafeToDerefRegs) &&
551551
"SafeToDerefRegs should contain all TrustedRegs");
552552

553553
return Next;

‎bolt/test/runtime/AArch64/pacret-synchronous-unwind.cpp‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,15 @@
1111
// RUN: -fno-asynchronous-unwind-tables \
1212
// RUN: %s -o %t.exe -Wl,-q
1313
// RUN: llvm-bolt %t.exe -o %t.bolt | FileCheck %s --check-prefix=CHECK
14-
//
15-
// CHECK: PointerAuthCFIAnalyzer ran on 3 functions. Ignored
16-
// CHECK-NOT: 0 functions (0.00%) because of CFI inconsistencies
17-
// CHECK-SAME: 1 functions (33.33%) because of CFI inconsistencies
18-
// CHECK-NEXT: BOLT-WARNING: PointerAuthCFIAnalyzer only supports asynchronous
19-
// CHECK-SAME: unwind tables. For C compilers, see -fasynchronous-unwind-tables.
14+
15+
// Number of functions with .cfi-negate-ra-state in the binary is
16+
// platform-dependent.
17+
// CHECK: BOLT-INFO: PointerAuthCFIAnalyzer ran on {{[0-9]+}} functions.
18+
// CHECK-SAME: Ignored {{[0-9]}} functions ({{[0-9.]+}}%) because of CFI
19+
// CHECK-SAME: inconsistencies
20+
// CHECK-NEXT: BOLT-WARNING: PointerAuthCFIAnalyzer only supports
21+
// CHECK-SAME: asynchronous unwind tables. For C compilers, see
22+
// CHECK-SAME: -fasynchronous-unwind-tables.
2023

2124
#include <cstdio>
2225
#include <stdexcept>

‎clang-tools-extra/clang-doc/CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ add_clang_library(clangDoc STATIC
1616
Representation.cpp
1717
Serialize.cpp
1818
YAMLGenerator.cpp
19-
HTMLMustacheGenerator.cpp
2019
JSONGenerator.cpp
2120

2221
DEPENDS

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,6 @@ void Generator::addInfoToIndex(Index &Idx, const doc::Info *Info) {
243243
[[maybe_unused]] static int YAMLGeneratorAnchorDest = YAMLGeneratorAnchorSource;
244244
[[maybe_unused]] static int MDGeneratorAnchorDest = MDGeneratorAnchorSource;
245245
[[maybe_unused]] static int HTMLGeneratorAnchorDest = HTMLGeneratorAnchorSource;
246-
[[maybe_unused]] static int MHTMLGeneratorAnchorDest =
247-
MHTMLGeneratorAnchorSource;
248246
[[maybe_unused]] static int JSONGeneratorAnchorDest = JSONGeneratorAnchorSource;
249247
} // namespace doc
250248
} // namespace clang

‎clang-tools-extra/clang-doc/Generators.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ struct MustacheGenerator : public Generator {
137137
extern volatile int YAMLGeneratorAnchorSource;
138138
extern volatile int MDGeneratorAnchorSource;
139139
extern volatile int HTMLGeneratorAnchorSource;
140-
extern volatile int MHTMLGeneratorAnchorSource;
141140
extern volatile int JSONGeneratorAnchorSource;
142141

143142
} // namespace doc

0 commit comments

Comments
 (0)