Skip to content

Commit a66b147

Browse files
committed
Merge from 'main' to 'sycl-web' (167 commits)
CONFLICT (content): Merge conflict in llvm/lib/Target/AMDGPU/AMDGPUPromoteAlloca.cpp CONFLICT (content): Merge conflict in llvm/test/CodeGen/AMDGPU/promote-alloca-subvecs.ll
2 parents 05c68e7 + 28b5054 commit a66b147

File tree

523 files changed

+19215
-9178
lines changed

Some content is hidden

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

523 files changed

+19215
-9178
lines changed

.github/workflows/docs.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ on:
2424
- 'openmp/docs/**'
2525
- 'polly/docs/**'
2626
- 'flang/docs/**'
27+
- 'flang/include/flang/Optimizer/Dialect/FIROps.td'
2728
pull_request:
2829
paths:
2930
- 'llvm/docs/**'
@@ -37,6 +38,7 @@ on:
3738
- 'openmp/docs/**'
3839
- 'polly/docs/**'
3940
- 'flang/docs/**'
41+
- 'flang/include/flang/Optimizer/Dialect/FIROps.td'
4042

4143
jobs:
4244
check-docs-build:
@@ -80,6 +82,7 @@ jobs:
8082
- 'polly/docs/**'
8183
flang:
8284
- 'flang/docs/**'
85+
- 'flang/include/flang/Optimizer/Dialect/FIROps.td'
8386
- name: Fetch LLVM sources (PR)
8487
if: ${{ github.event_name == 'pull_request' }}
8588
uses: actions/checkout@v4

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ env:
4343

4444
jobs:
4545
stage1:
46-
runs-on: libcxx-runners-16
46+
runs-on:
47+
group: libcxx-runners-16
4748
continue-on-error: false
4849
strategy:
4950
fail-fast: true
@@ -80,7 +81,8 @@ jobs:
8081
**/CMakeOutput.log
8182
**/crash_diagnostics/*
8283
stage2:
83-
runs-on: libcxx-runners-8
84+
runs-on:
85+
group: libcxx-runners-8
8486
needs: [ stage1 ]
8587
continue-on-error: false
8688
strategy:
@@ -171,9 +173,10 @@ jobs:
171173
std_modules: 'OFF'
172174
# Use a larger machine for MSAN to avoid timeout and memory allocation issues.
173175
- config: 'generic-msan'
174-
machine: libcxx-runners-30
176+
machine: libcxx-runners-32
175177
std_modules: 'OFF'
176-
runs-on: ${{ matrix.machine }}
178+
runs-on:
179+
group: ${{ matrix.machine }}
177180
steps:
178181
- uses: actions/checkout@v4
179182
- name: ${{ matrix.config }}

.github/workflows/scorecard.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ jobs:
2222
analysis:
2323
name: Scorecard analysis
2424
runs-on: ubuntu-latest
25+
if: github.repository == 'llvm/llvm-project'
2526
permissions:
2627
# Needed to upload the results to code-scanning dashboard.
2728
security-events: write

.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
<thakis@chromium.org> <nicolasweber@gmx.de>
3535
Jon Roelofs <jonathan_roelofs@apple.com> <jonathan@codesourcery.com>
3636
Jon Roelofs <jonathan_roelofs@apple.com> <jroelofs@jroelofs.com>
37+
Jonathan Thackray <jonathan.thackray@arm.com> <jthackray@users.noreply.github.com>
3738
LLVM GN Syncbot <llvmgnsyncbot@gmail.com>
3839
Martin Storsjö <martin@martin.st>
3940
Med Ismail Bennani <ismail@bennani.ma> <m.i.b@apple.com>

clang-tools-extra/clang-tidy/readability/IdentifierNamingCheck.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -872,8 +872,8 @@ bool IdentifierNamingCheck::matchesStyle(
872872
llvm::Regex("^[a-z][a-zA-Z0-9]*$"),
873873
llvm::Regex("^[A-Z][A-Z0-9_]*$"),
874874
llvm::Regex("^[A-Z][a-zA-Z0-9]*$"),
875-
llvm::Regex("^[A-Z]([a-z0-9]*(_[A-Z])?)*"),
876-
llvm::Regex("^[a-z]([a-z0-9]*(_[A-Z])?)*"),
875+
llvm::Regex("^[A-Z]+([a-z0-9]*_[A-Z0-9]+)*[a-z0-9]*$"),
876+
llvm::Regex("^[a-z]+([a-z0-9]*_[A-Z0-9]+)*[a-z0-9]*$"),
877877
llvm::Regex("^[A-Z]([a-z0-9_]*[a-z])*$"),
878878
};
879879

clang-tools-extra/docs/ReleaseNotes.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,8 @@ Changes in existing checks
416416
``Leading_upper_snake_case`` naming convention. The handling of ``typedef``
417417
has been enhanced, particularly within complex types like function pointers
418418
and cases where style checks were omitted when functions started with macros.
419-
Added support for C++20 ``concept`` declarations.
419+
Added support for C++20 ``concept`` declarations. ``Camel_Snake_Case`` and
420+
``camel_Snake_Case`` now detect more invalid identifier names.
420421

421422
- Improved :doc:`readability-implicit-bool-conversion
422423
<clang-tidy/checks/readability/implicit-bool-conversion>` check to take

clang-tools-extra/docs/clang-tidy/checks/hicpp/avoid-c-arrays.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ hicpp-avoid-c-arrays
88
The hicpp-avoid-c-arrays check is an alias, please see
99
:doc:`modernize-avoid-c-arrays <../modernize/avoid-c-arrays>`
1010
for more information.
11+
It partly enforces the `rule 4.1.1 <https://www.perforce.com/resources/qac/high-integrity-cpp-coding-standard/standard-conversions>`_.

clang-tools-extra/docs/clang-tidy/checks/hicpp/avoid-goto.rst

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@
55
hicpp-avoid-goto
66
================
77

8-
The `hicpp-avoid-goto` check is an alias to
9-
:doc:`cppcoreguidelines-avoid-goto <../cppcoreguidelines/avoid-goto>`.
10-
Rule `6.3.1 High Integrity C++ <https://www.perforce.com/resources/qac/high-integrity-cpp-coding-standard/statements>`_
11-
requires that ``goto`` only skips parts of a block and is not used for other
12-
reasons.
13-
14-
Both coding guidelines implement the same exception to the usage of ``goto``.
8+
The `hicpp-avoid-goto` check is an alias, please see
9+
:doc:`cppcoreguidelines-avoid-goto <../cppcoreguidelines/avoid-goto>`
10+
for more information.
11+
It enforces the `rule 6.3.1 <https://www.perforce.com/resources/qac/high-integrity-cpp-coding-standard/statements>`_.
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
.. title:: clang-tidy - hicpp-no-assembler
22

33
hicpp-no-assembler
4-
===================
4+
==================
55

6-
Check for assembler statements. No fix is offered.
6+
Checks for assembler statements. Use of inline assembly should be avoided since
7+
it restricts the portability of the code.
78

8-
Inline assembler is forbidden by the `High Integrity C++ Coding Standard
9-
<https://www.perforce.com/resources/qac/high-integrity-cpp-coding-standard/declarations>`_
10-
as it restricts the portability of code.
9+
This enforces `rule 7.5.1 <https://www.perforce.com/resources/qac/high-integrity-cpp-coding-standard/declarations>`_
10+
of the High Integrity C++ Coding Standard.
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
// RUN: %check_clang_tidy -std=c++20 %s readability-identifier-naming %t -- \
2+
// RUN: -config='{CheckOptions: { \
3+
// RUN: readability-identifier-naming.ClassCase: Camel_Snake_Case, \
4+
// RUN: readability-identifier-naming.StructCase: camel_Snake_Back, \
5+
// RUN: }}'
6+
7+
// clang-format off
8+
9+
//===----------------------------------------------------------------------===//
10+
// Camel_Snake_Case tests
11+
//===----------------------------------------------------------------------===//
12+
class XML_Parser {};
13+
class Xml_Parser {};
14+
class XML_Parser_2 {};
15+
// NO warnings or fixes expected as these identifiers are Camel_Snake_Case
16+
17+
class XmlParser {};
18+
// CHECK-MESSAGES: :[[@LINE-1]]:7: warning: invalid case style for class 'XmlParser'
19+
// CHECK-FIXES: {{^}}class Xml_Parser {};{{$}}
20+
21+
class Xml_parser {};
22+
// CHECK-MESSAGES: :[[@LINE-1]]:7: warning: invalid case style for class 'Xml_parser'
23+
// CHECK-FIXES: {{^}}class Xml_Parser {};{{$}}
24+
25+
class xml_parser {};
26+
// CHECK-MESSAGES: :[[@LINE-1]]:7: warning: invalid case style for class 'xml_parser'
27+
// CHECK-FIXES: {{^}}class Xml_Parser {};{{$}}
28+
29+
class xml_Parser {};
30+
// CHECK-MESSAGES: :[[@LINE-1]]:7: warning: invalid case style for class 'xml_Parser'
31+
// CHECK-FIXES: {{^}}class Xml_Parser {};{{$}}
32+
33+
class xml_Parser_2 {};
34+
// CHECK-MESSAGES: :[[@LINE-1]]:7: warning: invalid case style for class 'xml_Parser_2'
35+
// CHECK-FIXES: {{^}}class Xml_Parser_2 {};{{$}}
36+
37+
class t {};
38+
// CHECK-MESSAGES: :[[@LINE-1]]:7: warning: invalid case style for class 't'
39+
// CHECK-FIXES: {{^}}class T {};{{$}}
40+
41+
//===----------------------------------------------------------------------===//
42+
// camel_Snake_Back tests
43+
//===----------------------------------------------------------------------===//
44+
struct json_Parser {};
45+
struct json_Parser_2 {};
46+
struct u {};
47+
// NO warnings or fixes expected as these identifiers are camel_Snake_Back
48+
49+
struct JsonParser {};
50+
// CHECK-MESSAGES: :[[@LINE-1]]:8: warning: invalid case style for struct 'JsonParser'
51+
// CHECK-FIXES: {{^}}struct json_Parser {};{{$}}
52+
53+
struct Json_parser {};
54+
// CHECK-MESSAGES: :[[@LINE-1]]:8: warning: invalid case style for struct 'Json_parser'
55+
// CHECK-FIXES: {{^}}struct json_Parser {};{{$}}
56+
57+
struct json_parser {};
58+
// CHECK-MESSAGES: :[[@LINE-1]]:8: warning: invalid case style for struct 'json_parser'
59+
// CHECK-FIXES: {{^}}struct json_Parser {};{{$}}
60+

0 commit comments

Comments
 (0)