Skip to content

Commit 8ca5a8d

Browse files
tstellartstellar
committed
Merge remote-tracking branch 'origin/main' into HEAD
2 parents 1023d58 + 6dd639e commit 8ca5a8d

File tree

434 files changed

+12515
-3855
lines changed

Some content is hidden

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

434 files changed

+12515
-3855
lines changed

‎.github/workflows/libcxx-build-and-test.yaml‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,9 @@ jobs:
223223
source .venv/bin/activate
224224
python -m pip install psutil
225225
xcrun bash libcxx/utils/ci/run-buildbot ${{ matrix.config }}
226+
env:
227+
CC: clang
228+
CXX: clang++
226229
- uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
227230
if: always() # Upload artifacts even if the build or test suite fails
228231
with:
@@ -241,16 +244,16 @@ jobs:
241244
fail-fast: false
242245
matrix:
243246
include:
244-
- { config: clang-cl-dll, mingw: false }
245-
- { config: clang-cl-static, mingw: false }
246-
- { config: clang-cl-no-vcruntime, mingw: false }
247-
- { config: clang-cl-debug, mingw: false }
248-
- { config: clang-cl-static-crt, mingw: false }
249-
- { config: mingw-dll, mingw: true }
250-
- { config: mingw-static, mingw: true }
251-
- { config: mingw-dll-i686, mingw: true }
252-
- { config: mingw-incomplete-sysroot, mingw: true }
253-
- { config: mingw-static, mingw: true, runner: windows-11-arm }
247+
- { config: clang-cl-dll, mingw: false, cc: clang-cl, cxx: clang-cl }
248+
- { config: clang-cl-static, mingw: false, cc: clang-cl, cxx: clang-cl }
249+
- { config: clang-cl-no-vcruntime, mingw: false, cc: clang-cl, cxx: clang-cl }
250+
- { config: clang-cl-debug, mingw: false, cc: clang-cl, cxx: clang-cl }
251+
- { config: clang-cl-static-crt, mingw: false, cc: clang-cl, cxx: clang-cl }
252+
- { config: mingw-dll, mingw: true, cc: cc, cxx: c++ }
253+
- { config: mingw-dll, mingw: true, cc: i686-w64-mingw32-clang, cxx: i686-w64-mingw32-clang++ }
254+
- { config: mingw-static, mingw: true, cc: cc, cxx: c++ }
255+
- { config: mingw-incomplete-sysroot, mingw: true, cc: cc, cxx: c++ }
256+
- { config: mingw-static, mingw: true, cc: cc, cxx: c++, runner: windows-11-arm }
254257
runs-on: ${{ matrix.runner != '' && matrix.runner || 'windows-2022' }}
255258
steps:
256259
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
@@ -286,5 +289,7 @@ jobs:
286289
run: |
287290
echo "c:\Program Files\LLVM\bin" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf8 -Append
288291
- name: Build and test
289-
run: |
290-
bash libcxx/utils/ci/run-buildbot ${{ matrix.config }}
292+
run: bash libcxx/utils/ci/run-buildbot ${{ matrix.config }}
293+
env:
294+
CC: ${{ matrix.cc }}
295+
CXX: ${{ matrix.cxx }}

‎.github/workflows/libcxx-check-generated-files.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,6 @@ jobs:
2222

2323
- name: Check generated files
2424
run: libcxx/utils/ci/run-buildbot check-generated-output
25+
env:
26+
CC: cc
27+
CXX: c++

‎bolt/docs/BAT.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ Functions table:
6161

6262
### Functions table
6363
Hot and cold functions tables share the encoding except differences marked below.
64+
6465
Header:
6566
| Entry | Encoding | Description |
6667
| ------ | ----- | ----------- |

‎bolt/lib/Rewrite/RewriteInstance.cpp‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ namespace opts {
8080
extern cl::list<std::string> HotTextMoveSections;
8181
extern cl::opt<bool> Hugify;
8282
extern cl::opt<bool> Instrument;
83+
extern cl::opt<uint32_t> InstrumentationSleepTime;
8384
extern cl::opt<bool> KeepNops;
8485
extern cl::opt<bool> Lite;
8586
extern cl::list<std::string> PrintOnly;
@@ -1507,6 +1508,9 @@ Error RewriteInstance::discoverRtFiniAddress() {
15071508
}
15081509

15091510
if (!BC->FiniArrayAddress || !BC->FiniArraySize) {
1511+
// Missing fini hooks are allowed when instrumentation-sleep-time is in use.
1512+
if (opts::InstrumentationSleepTime > 0)
1513+
return Error::success();
15101514
return createStringError(
15111515
std::errc::not_supported,
15121516
"Instrumentation needs either DT_FINI or DT_FINI_ARRAY");
@@ -1616,9 +1620,13 @@ Error RewriteInstance::updateRtFiniReloc() {
16161620
if (!RT || !RT->getRuntimeFiniAddress())
16171621
return Error::success();
16181622

1619-
if (!BC->FiniArrayAddress || !BC->FiniArraySize)
1623+
if (!BC->FiniArrayAddress || !BC->FiniArraySize) {
1624+
// Missing fini hooks are allowed when instrumentation-sleep-time is in use.
1625+
if (opts::InstrumentationSleepTime > 0)
1626+
return Error::success();
16201627
return createStringError(std::errc::not_supported,
16211628
"inconsistent .fini_array state");
1629+
}
16221630

16231631
ErrorOr<BinarySection &> FiniArraySection =
16241632
BC->getSectionForAddress(*BC->FiniArrayAddress);

‎bolt/test/AArch64/instrument-no-fini.s‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# Test that BOLT will produce error by default and pass with instrumentation-sleep-time option
2+
3+
# REQUIRES: system-linux,bolt-runtime,target=aarch64{{.*}}
4+
5+
# RUN: llvm-mc -triple aarch64 -filetype=obj %s -o %t.o
6+
# RUN: ld.lld -q -pie -o %t.exe %t.o
7+
# RUN: llvm-readelf -d %t.exe | FileCheck --check-prefix=CHECK-NO-FINI %s
8+
# RUN: not llvm-bolt --instrument -o %t.out %t.exe 2>&1 | FileCheck %s --check-prefix=CHECK-BOLT-FAIL
9+
# RUN: llvm-bolt --instrument --instrumentation-sleep-time=1 -o %t.out %t.exe 2>&1 | FileCheck %s --check-prefix=CHECK-BOLT-PASS
10+
11+
# CHECK-NO-FINI: INIT
12+
# CHECK-NO-FINI-NOT: FINI
13+
# CHECK-NO-FINI-NOT: FINI_ARRAY
14+
15+
# CHECK-BOLT-FAIL: Instrumentation needs either DT_FINI or DT_FINI_ARRAY
16+
17+
# CHECK-BOLT-PASS-NOT: Instrumentation needs either DT_FINI or DT_FINI_ARRAY
18+
# CHECK-BOLT-PASS: runtime library initialization was hooked via DT_INIT
19+
20+
.text
21+
.globl _start
22+
.type _start, %function
23+
_start:
24+
# BOLT errs when instrumenting without relocations; create a dummy one.
25+
.reloc 0, R_AARCH64_NONE
26+
ret
27+
.size _start, .-_start
28+
29+
.globl _init
30+
.type _init, %function
31+
# Force DT_INIT to be created (needed for instrumentation).
32+
_init:
33+
ret
34+
.size _init, .-_init

‎bolt/test/X86/instrument-no-fini.s‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# Test that BOLT will produce error by default and pass with instrumentation-sleep-time option
2+
3+
# REQUIRES: system-linux,bolt-runtime,target=x86_64-{{.*}}
4+
5+
# RUN: llvm-mc -triple x86_64 -filetype=obj %s -o %t.o
6+
# RUN: ld.lld -q -pie -o %t.exe %t.o
7+
# RUN: llvm-readelf -d %t.exe | FileCheck --check-prefix=CHECK-NO-FINI %s
8+
# RUN: not llvm-bolt --instrument -o %t.out %t.exe 2>&1 | FileCheck %s --check-prefix=CHECK-BOLT-FAIL
9+
# RUN: llvm-bolt --instrument --instrumentation-sleep-time=1 -o %t.out %t.exe 2>&1 | FileCheck %s --check-prefix=CHECK-BOLT-PASS
10+
11+
# CHECK-NO-FINI: INIT
12+
# CHECK-NO-FINI-NOT: FINI
13+
# CHECK-NO-FINI-NOT: FINI_ARRAY
14+
15+
# CHECK-BOLT-FAIL: Instrumentation needs either DT_FINI or DT_FINI_ARRAY
16+
17+
# CHECK-BOLT-PASS-NOT: Instrumentation needs either DT_FINI or DT_FINI_ARRAY
18+
# CHECK-BOLT-PASS: runtime library initialization was hooked via DT_INIT
19+
20+
.text
21+
.globl _start
22+
.type _start, %function
23+
_start:
24+
# BOLT errs when instrumenting without relocations; create a dummy one.
25+
.reloc 0, R_X86_64_NONE
26+
retq
27+
.size _start, .-_start
28+
29+
.globl _init
30+
.type _init, %function
31+
# Force DT_INIT to be created (needed for instrumentation).
32+
_init:
33+
retq
34+
.size _init, .-_init

‎clang-tools-extra/clang-tidy/ExpandModularHeadersPPCallbacks.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ class ExpandModularHeadersPPCallbacks : public PPCallbacks {
137137
std::unique_ptr<Preprocessor> PP;
138138
bool EnteredMainFile = false;
139139
bool StartedLexing = false;
140-
Token CurrentToken;
140+
Token CurrentToken = Token();
141141
};
142142

143143
} // namespace tooling

‎clang-tools-extra/clang-tidy/bugprone/FloatLoopCounterCheck.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ void FloatLoopCounterCheck::registerMatchers(MatchFinder *Finder) {
3131

3232
void FloatLoopCounterCheck::check(const MatchFinder::MatchResult &Result) {
3333
const auto *FS = Result.Nodes.getNodeAs<ForStmt>("for");
34+
assert(FS && "FS should not be null");
3435

3536
diag(FS->getInc()->getBeginLoc(), "loop induction expression should not have "
3637
"floating-point type")

‎clang-tools-extra/clang-tidy/cppcoreguidelines/ProBoundsAvoidUncheckedContainerAccessCheck.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ void ProBoundsAvoidUncheckedContainerAccessCheck::check(
176176
}
177177
} else if (const auto *MCE = dyn_cast<CXXMemberCallExpr>(MatchedExpr)) {
178178
// Case: a.operator[](i) or a->operator[](i)
179-
const auto *Callee = dyn_cast<MemberExpr>(MCE->getCallee());
179+
const auto *Callee = cast<MemberExpr>(MCE->getCallee());
180180

181181
if (FixMode == At) {
182182
// Cases: a.operator[](i) => a.at(i) and a->operator[](i) => a->at(i)

‎clang/docs/HIPSupport.rst‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,54 @@ Example Usage
412412
__host__ __device__ int Four(void) __attribute__((weak, alias("_Z6__Fourv")));
413413
__host__ __device__ float Four(float f) __attribute__((weak, alias("_Z6__Fourf")));
414414

415+
C++17 Class Template Argument Deduction (CTAD) Support
416+
======================================================
417+
418+
Clang supports C++17 Class Template Argument Deduction (CTAD) in both host and
419+
device code for HIP. This allows you to omit template arguments when creating
420+
class template instances, letting the compiler deduce them from constructor
421+
arguments.
422+
423+
.. code-block:: c++
424+
425+
#include <tuple>
426+
427+
__host__ __device__ void func() {
428+
std::tuple<int, int> t = std::tuple(1, 1);
429+
}
430+
431+
In the above example, ``std::tuple(1, 1)`` automatically deduces the type to be
432+
``std::tuple<int, int>``.
433+
434+
Deduction Guides
435+
----------------
436+
437+
User-defined deduction guides are also supported. Since deduction guides are not
438+
executable code and only participate in type deduction, they semantically behave
439+
as ``__host__ __device__``. This ensures they are available for deduction in both
440+
host and device contexts, and CTAD continues to respect any constraints on the
441+
corresponding constructors in the usual C++ way.
442+
443+
.. code-block:: c++
444+
445+
template <typename T>
446+
struct MyType {
447+
T value;
448+
__device__ MyType(T v) : value(v) {}
449+
};
450+
451+
MyType(float) -> MyType<double>;
452+
453+
__device__ void deviceFunc() {
454+
MyType m(1.0f); // Deduces MyType<double>
455+
}
456+
457+
.. note::
458+
459+
Explicit HIP target attributes such as ``__host__`` or ``__device__``
460+
are not allowed on deduction guides. Clang treats all deduction guides
461+
as if they were ``__host__ __device__`` and diagnoses any explicit
462+
target attributes on them as errors.
415463

416464
Host and Device Attributes of Default Destructors
417465
===================================================

0 commit comments

Comments
 (0)