Skip to content

Commit 238d715

Browse files
committed
Rebase
Created using spr 1.3.5
2 parents d4018db + 466217e commit 238d715

File tree

556 files changed

+25908
-21434
lines changed

Some content is hidden

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

556 files changed

+25908
-21434
lines changed

.github/workflows/clang-tests.yml

Lines changed: 0 additions & 38 deletions
This file was deleted.
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: Commit Access Greeter
2+
3+
on:
4+
issues:
5+
types:
6+
- labeled
7+
8+
permissions:
9+
contents: read
10+
11+
jobs:
12+
commit-access-greeter:
13+
permissions:
14+
issues: write
15+
if: >-
16+
github.repository_owner == 'llvm' &&
17+
github.event.label.name == 'infra:commit-access-request'
18+
runs-on: ubuntu-22.04
19+
steps:
20+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
21+
with:
22+
sparse-checkout: llvm/utils/git/
23+
24+
- name: Setup Automation Script
25+
working-directory: ./llvm/utils/git/
26+
run: |
27+
pip install --require-hashes -r requirements.txt
28+
29+
- name: Add comments to issue
30+
working-directory: ./llvm/utils/git/
31+
env:
32+
LABEL_NAME: ${{ github.event.label.name }}
33+
GITHUB_TOKEN: ${{ github.token }}
34+
ISSUE_NUMBER: ${{ github.event.issue.number }}
35+
run: |
36+
python3 ./github-automation.py \
37+
--token $GITHUB_TOKEN \
38+
commit-request-greeter \
39+
--issue-number $ISSUE_NUMBER

.github/workflows/libclc-tests.yml

Lines changed: 0 additions & 39 deletions
This file was deleted.

.github/workflows/lld-tests.yml

Lines changed: 0 additions & 38 deletions
This file was deleted.

.github/workflows/lldb-tests.yml

Lines changed: 0 additions & 39 deletions
This file was deleted.

.github/workflows/llvm-tests.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,12 @@ on:
1111
paths:
1212
- 'llvm/**'
1313
- '.github/workflows/llvm-tests.yml'
14-
- '.github/workflows/llvm-project-tests.yml'
1514
pull_request:
1615
branches:
1716
- 'release/**'
1817
paths:
1918
- 'llvm/**'
2019
- '.github/workflows/llvm-tests.yml'
21-
- '.github/workflows/llvm-project-tests.yml'
2220

2321
concurrency:
2422
# Skip intermediate builds: always.
@@ -27,14 +25,6 @@ concurrency:
2725
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
2826

2927
jobs:
30-
check-all:
31-
if: github.repository_owner == 'llvm'
32-
name: Build and Test
33-
uses: ./.github/workflows/llvm-project-tests.yml
34-
with:
35-
build_target: check-all
36-
projects: clang;lld;libclc;lldb
37-
3828
abi-dump-setup:
3929
if: github.repository_owner == 'llvm'
4030
runs-on: ubuntu-latest

.github/workflows/premerge.yaml

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
push:
1111
branches:
1212
- 'main'
13+
- 'release/**'
1314

1415
jobs:
1516
premerge-checks-linux:
@@ -132,3 +133,72 @@ jobs:
132133
call C:\\BuildTools\\Common7\\Tools\\VsDevCmd.bat -arch=amd64 -host_arch=amd64
133134
bash .ci/monolithic-windows.sh "${{ steps.vars.outputs.windows-projects }}" "${{ steps.vars.outputs.windows-check-targets }}"
134135
136+
permerge-check-macos:
137+
runs-on: macos-14
138+
concurrency:
139+
group: ${{ github.workflow }}-macos-${{ github.event.pull_request.number || github.sha }}
140+
cancel-in-progress: true
141+
if: >-
142+
(startswith(github.ref_name, 'release/') ||
143+
startswith(github.base_ref, 'refs/heads/release/'))
144+
steps:
145+
- name: Checkout LLVM
146+
uses: actions/checkout@v4
147+
with:
148+
fetch-depth: 2
149+
- name: Setup ccache
150+
uses: hendrikmuhs/[email protected]
151+
with:
152+
max-size: "2000M"
153+
- name: Install Ninja
154+
uses: llvm/actions/install-ninja@main
155+
- name: Build and Test
156+
run: |
157+
modified_files=$(git diff --name-only HEAD~1...HEAD)
158+
modified_dirs=$(echo "$modified_files" | cut -d'/' -f1 | sort -u)
159+
160+
echo $modified_files
161+
echo $modified_dirs
162+
163+
. ./.ci/compute-projects.sh
164+
165+
all_projects="clang clang-tools-extra lld lldb llvm mlir"
166+
modified_projects="$(keep-modified-projects ${all_projects})"
167+
168+
# We have to disable the runtimes builds due to https://github.com/llvm/llvm-project/issues/90568
169+
# and the lldb tests depend on libcxx, so we need to skip them.
170+
mac_check_targets=$(check-targets ${modified_projects} | sort | uniq | tr '\n' ' ' | sed -e 's/check-lldb //g')
171+
mac_projects=$(add-dependencies ${modified_projects} | sort | uniq | tr '\n' ' ')
172+
173+
mac_runtimes_to_test=$(compute-runtimes-to-test ${modified_projects})
174+
mac_runtime_check_targets=$(check-targets ${mac_runtimes_to_test} | sort | uniq | tr '\n' ' ')
175+
mac_runtimes=$(echo ${mac_runtimes_to_test} | tr ' ' '\n' | sort | uniq | tr '\n' ' ')
176+
177+
if [[ "${mac_projects}" == "" ]]; then
178+
echo "No projects to build"
179+
exit 0
180+
fi
181+
182+
echo "Projects to test: ${modified_projects}"
183+
echo "Runtimes to test: ${mac_runtimes_to_test}"
184+
echo "Building projects: ${mac_projects}"
185+
echo "Running project checks targets: ${mac_check_targets}"
186+
echo "Building runtimes: ${mac_runtimes}"
187+
echo "Running runtimes checks targets: ${mac_runtime_check_targets}"
188+
189+
# -DLLVM_DISABLE_ASSEMBLY_FILES=ON is for
190+
# https://github.com/llvm/llvm-project/issues/81967
191+
# Disable sharding in lit so that the LIT_XFAIL environment var works.
192+
cmake -G Ninja \
193+
-B build \
194+
-S llvm \
195+
-DLLVM_ENABLE_PROJECTS="$(echo ${mac_projects} | tr ' ' ';')" \
196+
-DLLVM_DISABLE_ASSEMBLY_FILES=ON \
197+
-DCMAKE_BUILD_TYPE=Release \
198+
-DLLDB_INCLUDE_TESTS=OFF \
199+
-DLLVM_ENABLE_ASSERTIONS=ON \
200+
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
201+
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache
202+
203+
# The libcxx tests fail, so we are skipping the runtime targets.
204+
ninja -C build $mac_check_targets

clang/docs/ReleaseNotes.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,8 @@ Bug Fixes in This Version
122122
Bug Fixes to Compiler Builtins
123123
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
124124

125+
- The behvaiour of ``__add_pointer`` and ``__remove_pointer`` for Objective-C++'s ``id`` and interfaces has been fixed.
126+
125127
Bug Fixes to Attribute Support
126128
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
127129

clang/include/clang/AST/DynamicRecursiveASTVisitor.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,11 +251,11 @@ template <bool IsConst> class DynamicRecursiveASTVisitorBase {
251251
// Decls.
252252
#define ABSTRACT_DECL(DECL)
253253
#define DECL(CLASS, BASE) \
254+
bool WalkUpFrom##CLASS##Decl(MaybeConst<CLASS##Decl> *D); \
254255
virtual bool Traverse##CLASS##Decl(MaybeConst<CLASS##Decl> *D);
255256
#include "clang/AST/DeclNodes.inc"
256257

257258
#define DECL(CLASS, BASE) \
258-
bool WalkUpFrom##CLASS##Decl(MaybeConst<CLASS##Decl> *D); \
259259
virtual bool Visit##CLASS##Decl(MaybeConst<CLASS##Decl> *D) { return true; }
260260
#include "clang/AST/DeclNodes.inc"
261261

@@ -272,11 +272,11 @@ template <bool IsConst> class DynamicRecursiveASTVisitorBase {
272272
// Types.
273273
#define ABSTRACT_TYPE(CLASS, BASE)
274274
#define TYPE(CLASS, BASE) \
275+
bool WalkUpFrom##CLASS##Type(MaybeConst<CLASS##Type> *T); \
275276
virtual bool Traverse##CLASS##Type(MaybeConst<CLASS##Type> *T);
276277
#include "clang/AST/TypeNodes.inc"
277278

278279
#define TYPE(CLASS, BASE) \
279-
bool WalkUpFrom##CLASS##Type(MaybeConst<CLASS##Type> *T); \
280280
virtual bool Visit##CLASS##Type(MaybeConst<CLASS##Type> *T) { return true; }
281281
#include "clang/AST/TypeNodes.inc"
282282

clang/include/clang/Basic/CodeGenOptions.def

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -465,6 +465,10 @@ ENUM_CODEGENOPT(ZeroCallUsedRegs, llvm::ZeroCallUsedRegs::ZeroCallUsedRegsKind,
465465
/// non-deleting destructors. (No effect on Microsoft ABI.)
466466
CODEGENOPT(CtorDtorReturnThis, 1, 0)
467467

468+
/// Enables emitting Import Call sections on supported targets that can be used
469+
/// by the Windows kernel to enable import call optimization.
470+
CODEGENOPT(ImportCallOptimization, 1, 0)
471+
468472
/// FIXME: Make DebugOptions its own top-level .def file.
469473
#include "DebugOptions.def"
470474

0 commit comments

Comments
 (0)