Skip to content

Commit 6909bec

Browse files
authored
merge main into amd-staging (llvm#4016)
2 parents d39300c + 7e4c15e commit 6909bec

File tree

91 files changed

+895
-441
lines changed

Some content is hidden

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

91 files changed

+895
-441
lines changed

.github/workflows/libcxx-run-benchmarks.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,17 +67,18 @@ jobs:
6767
python -m pip install -r libcxx/utils/requirements.txt
6868
baseline_commit=$(git merge-base ${{ steps.vars.outputs.pr_base }} ${{ steps.vars.outputs.pr_head }})
6969
./libcxx/utils/test-at-commit --commit ${baseline_commit} -B build/baseline -- -sv -j1 --param optimization=speed ${{ steps.vars.outputs.benchmarks }}
70+
./libcxx/utils/consolidate-benchmarks build/baseline | tee baseline.lnt
7071
7172
- name: Run candidate
7273
run: |
7374
source .venv/bin/activate && cd repo
7475
./libcxx/utils/test-at-commit --commit ${{ steps.vars.outputs.pr_head }} -B build/candidate -- -sv -j1 --param optimization=speed ${{ steps.vars.outputs.benchmarks }}
76+
./libcxx/utils/consolidate-benchmarks build/candidate | tee candidate.lnt
7577
7678
- name: Compare baseline and candidate runs
7779
run: |
7880
source .venv/bin/activate && cd repo
79-
./libcxx/utils/compare-benchmarks <(./libcxx/utils/consolidate-benchmarks build/baseline) \
80-
<(./libcxx/utils/consolidate-benchmarks build/candidate) > results.txt
81+
./libcxx/utils/compare-benchmarks baseline.lnt candidate.lnt | tee results.txt
8182
8283
- name: Update comment with results
8384
run: |

clang/docs/ReleaseNotes.rst

Lines changed: 2 additions & 0 deletions

clang/lib/Sema/SemaExpr.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14818,7 +14818,7 @@ static QualType CheckIndirectionOperand(Sema &S, Expr *Op, ExprValueKind &VK,
1481814818
QualType OpTy = Op->getType();
1481914819
QualType Result;
1482014820

14821-
if (isa<CXXReinterpretCastExpr>(Op)) {
14821+
if (isa<CXXReinterpretCastExpr>(Op->IgnoreParens())) {
1482214822
QualType OpOrigType = Op->IgnoreParenCasts()->getType();
1482314823
S.CheckCompatibleReinterpretCast(OpOrigType, OpTy, /*IsDereference*/true,
1482414824
Op->getSourceRange());

clang/test/Analysis/scan-build/cxx-name.test

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
REQUIRES: shell
2-
31
RUN: %scan-build sh -c 'echo "CLANG_CXX=/$(basename "$CLANG_CXX")/"' | FileCheck %s
42

53
Check that scan-build sets the CLANG_CXX environment variable (meant to be

clang/test/Analysis/scan-build/deduplication.test

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
REQUIRES: shell
2-
31
RUN: rm -rf %t.output_dir && mkdir %t.output_dir
42
RUN: %scan-build -o %t.output_dir \
53
RUN: %clang -S %S/Inputs/deduplication/1.c \

clang/test/Analysis/scan-build/html_output.test

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
REQUIRES: shell
2-
31
RUN: rm -rf %t.output_dir && mkdir %t.output_dir
42
RUN: %scan-build -o %t.output_dir %clang -S %S/Inputs/single_null_dereference.c \
53
RUN: | FileCheck %s -check-prefix CHECK-STDOUT

clang/test/Analysis/scan-build/plist_html_output.test

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
REQUIRES: shell
2-
31
RUN: rm -rf %t.output_dir && mkdir %t.output_dir
42
RUN: %scan-build -plist-html -o %t.output_dir %clang -S %S/Inputs/single_null_dereference.c \
53
RUN: | FileCheck %s -check-prefix CHECK-STDOUT

clang/test/Analysis/scan-build/plist_output.test

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
REQUIRES: shell
2-
31
RUN: rm -rf %t.output_dir && mkdir %t.output_dir
42
RUN: %scan-build -plist -o %t.output_dir %clang -S %S/Inputs/single_null_dereference.c \
53
RUN: | FileCheck %s -check-prefix CHECK-STDOUT

clang/test/ClangScanDeps/module-format.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
// section in XCOFF yet.
77
// UNSUPPORTED: target={{.*}}-aix{{.*}}
88

9-
// REQUIRES: shell
10-
119
// RUN: rm -rf %t && mkdir %t
1210
// RUN: cp %S/Inputs/modules-pch/* %t
1311

clang/test/ClangScanDeps/modules-context-hash-cwd.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
// Most likely platform specific sed differences
2+
// UNSUPPORTED: system-windows
13
// Test current directory pruning when computing the context hash.
24

3-
// REQUIRES: shell
4-
55
// RUN: rm -rf %t
66
// RUN: split-file %s %t
77
// RUN: sed -e "s|DIR|%/t|g" %t/cdb0.json.in > %t/cdb0.json

0 commit comments

Comments
 (0)