Skip to content

Commit 094c07c

Browse files
committed
merge main into amd-staging
2 parents 659e9cd + 99df642 commit 094c07c

File tree

279 files changed

+15712
-4250
lines changed

Some content is hidden

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

279 files changed

+15712
-4250
lines changed

.github/workflows/containers/github-action-ci-windows/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ RUN powershell -Command \
8585
RUN git config --system core.longpaths true & \
8686
git config --global core.autocrlf false
8787
88-
ARG RUNNER_VERSION=2.325.0
88+
ARG RUNNER_VERSION=2.326.0
8989
ENV RUNNER_VERSION=$RUNNER_VERSION
9090
9191
RUN powershell -Command \

.github/workflows/containers/github-action-ci/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ WORKDIR /home/gha
8686

8787
FROM ci-container as ci-container-agent
8888

89-
ENV GITHUB_RUNNER_VERSION=2.325.0
89+
ENV GITHUB_RUNNER_VERSION=2.326.0
9090

9191
RUN mkdir actions-runner && \
9292
cd actions-runner && \

.github/workflows/libc-fullbuild-tests.yml

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,40 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
build_type: [Debug, Release, MinSizeRel]
18+
# Build basic linux configuration with Debug/Release/MinSizeRel and all
19+
# other configurations in Debug only.
1920
include:
2021
- os: ubuntu-24.04
22+
build_type: Debug
23+
ccache-variant: sccache
24+
c_compiler: clang-21
25+
cpp_compiler: clang++-21
26+
target: x86_64-unknown-linux-llvm
27+
include_scudo: ON
28+
- os: ubuntu-24.04
29+
build_type: Release
30+
ccache-variant: sccache
31+
c_compiler: clang-21
32+
cpp_compiler: clang++-21
33+
target: x86_64-unknown-linux-llvm
34+
include_scudo: ON
35+
- os: ubuntu-24.04
36+
build_type: MinSizeRel
2137
ccache-variant: sccache
2238
c_compiler: clang-21
2339
cpp_compiler: clang++-21
2440
target: x86_64-unknown-linux-llvm
2541
include_scudo: ON
2642
# TODO: remove ccache logic when https://github.com/hendrikmuhs/ccache-action/issues/279 is resolved.
2743
- os: ubuntu-24.04-arm
44+
build_type: Debug
2845
ccache-variant: ccache
2946
c_compiler: clang-21
3047
cpp_compiler: clang++-21
3148
target: aarch64-unknown-linux-llvm
3249
include_scudo: ON
3350
- os: ubuntu-24.04
51+
build_type: Debug
3452
ccache-variant: ccache
3553
c_compiler: clang-21
3654
cpp_compiler: clang++-21
@@ -97,7 +115,7 @@ jobs:
97115
-DCMAKE_C_COMPILER_LAUNCHER=${{ matrix.ccache-variant }} \
98116
-DCMAKE_CXX_COMPILER_LAUNCHER=${{ matrix.ccache-variant }} \
99117
-DCMAKE_INSTALL_PREFIX=${{ steps.strings.outputs.build-install-dir }} \
100-
-DLLVM_RUNTIMES_TARGET=${{ matrix.target }} \
118+
-DLLVM_RUNTIME_TARGETS=${{ matrix.target }} \
101119
-DLLVM_ENABLE_RUNTIMES="$RUNTIMES" \
102120
-DLLVM_LIBC_FULL_BUILD=ON \
103121
-G Ninja \

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

Lines changed: 2 additions & 3 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-
build_type: [Debug, Release, MinSizeRel]
19+
os: [ubuntu-24.04, ubuntu-24.04-arm, windows-2022, windows-2025, macos-14]
2020
include:
2121
# TODO: add linux gcc when it is fixed
2222
- os: ubuntu-24.04
@@ -96,7 +96,7 @@ jobs:
9696
cmake -B ${{ steps.strings.outputs.build-output-dir }}
9797
-DCMAKE_CXX_COMPILER=${{ matrix.compiler.cpp_compiler }}
9898
-DCMAKE_C_COMPILER=${{ matrix.compiler.c_compiler }}
99-
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
99+
-DCMAKE_BUILD_TYPE=Debug
100100
-DCMAKE_C_COMPILER_LAUNCHER=${{ matrix.ccache-variant }}
101101
-DCMAKE_CXX_COMPILER_LAUNCHER=${{ matrix.ccache-variant }}
102102
-DCMAKE_POLICY_DEFAULT_CMP0141=NEW
@@ -110,7 +110,6 @@ jobs:
110110
cmake
111111
--build ${{ steps.strings.outputs.build-output-dir }}
112112
--parallel
113-
--config MinSizeRel
114113
--target libc
115114
116115
- name: Test

clang-tools-extra/test/clang-tidy/infrastructure/file-filter-symlinks.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212
// RUN: clang-tidy -checks='-*,google-explicit-constructor' -header-filter='header\.h' %s -- -I %t 2>&1 | FileCheck --check-prefix=CHECK_HEADER %s
1313
// RUN: clang-tidy -checks='-*,google-explicit-constructor' -header-filter='header\.h' -quiet %s -- -I %t 2>&1 | FileCheck --check-prefix=CHECK_HEADER %s
1414

15-
// Check that `-header-filter` operates on the same file paths as paths in
16-
// diagnostics printed by ClangTidy.
15+
// `-header-filter` operates on the actual file path that the user provided in
16+
// the #include directive; however, Clang's path name simplification causes the
17+
// path to be printed in canonicalised form here.
1718
#include "dir1/dir2/../header_alias.h"
18-
// CHECK_HEADER_ALIAS: dir1/dir2/../header_alias.h:1:11: warning: single-argument constructors
19+
// CHECK_HEADER_ALIAS: dir1/header.h:1:11: warning: single-argument constructors
1920
// CHECK_HEADER-NOT: warning:

clang/include/clang-c/FatalErrorHandler.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,22 @@
1111
#define LLVM_CLANG_C_FATAL_ERROR_HANDLER_H
1212

1313
#include "clang-c/ExternC.h"
14+
#include "clang-c/Platform.h"
1415

1516
LLVM_CLANG_C_EXTERN_C_BEGIN
1617

1718
/**
1819
* Installs error handler that prints error message to stderr and calls abort().
1920
* Replaces currently installed error handler (if any).
2021
*/
21-
void clang_install_aborting_llvm_fatal_error_handler(void);
22+
CINDEX_LINKAGE void clang_install_aborting_llvm_fatal_error_handler(void);
2223

2324
/**
2425
* Removes currently installed error handler (if any).
2526
* If no error handler is intalled, the default strategy is to print error
2627
* message to stderr and call exit(1).
2728
*/
28-
void clang_uninstall_llvm_fatal_error_handler(void);
29+
CINDEX_LINKAGE void clang_uninstall_llvm_fatal_error_handler(void);
2930

3031
LLVM_CLANG_C_EXTERN_C_END
3132

clang/include/clang-c/Platform.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ LLVM_CLANG_C_EXTERN_C_BEGIN
2222
#ifndef CINDEX_NO_EXPORTS
2323
#define CINDEX_EXPORTS
2424
#endif
25-
#ifdef _WIN32
25+
#if defined(_WIN32) || defined(__CYGWIN__)
2626
#ifdef CINDEX_EXPORTS
2727
#ifdef _CINDEX_LIB_
2828
#define CINDEX_LINKAGE __declspec(dllexport)

clang/include/clang/AST/Type.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6404,7 +6404,7 @@ class SpirvOperand {
64046404
SpirvOperand() : Kind(Invalid), ResultType(), Value() {}
64056405

64066406
SpirvOperand(SpirvOperandKind Kind, QualType ResultType, llvm::APInt Value)
6407-
: Kind(Kind), ResultType(ResultType), Value(Value) {}
6407+
: Kind(Kind), ResultType(ResultType), Value(std::move(Value)) {}
64086408

64096409
SpirvOperand(const SpirvOperand &Other) { *this = Other; }
64106410
~SpirvOperand() {}
@@ -6438,11 +6438,11 @@ class SpirvOperand {
64386438
}
64396439

64406440
static SpirvOperand createConstant(QualType ResultType, llvm::APInt Val) {
6441-
return SpirvOperand(ConstantId, ResultType, Val);
6441+
return SpirvOperand(ConstantId, ResultType, std::move(Val));
64426442
}
64436443

64446444
static SpirvOperand createLiteral(llvm::APInt Val) {
6445-
return SpirvOperand(Literal, QualType(), Val);
6445+
return SpirvOperand(Literal, QualType(), std::move(Val));
64466446
}
64476447

64486448
static SpirvOperand createType(QualType T) {

0 commit comments

Comments
 (0)