Skip to content

Commit 4799052

Browse files
committed
Merge remote-tracking branch 'origin/main' into RedundantParenthesesCheck
2 parents 863331f + cafc064 commit 4799052

File tree

524 files changed

+21417
-9988
lines changed

Some content is hidden

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

524 files changed

+21417
-9988
lines changed

.ci/all_requirements.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,9 +194,9 @@ ml-dtypes==0.5.1 ; python_version < "3.13" \
194194
--hash=sha256:d13755f8e8445b3870114e5b6240facaa7cb0c3361e54beba3e07fa912a6e12b \
195195
--hash=sha256:fd918d4e6a4e0c110e2e05be7a7814d10dc1b95872accbf6512b80a109b71ae1
196196
# via -r mlir/python/requirements.txt
197-
nanobind==2.7.0 \
198-
--hash=sha256:73b12d0e751d140d6c1bf4b215e18818a8debfdb374f08dc3776ad208d808e74 \
199-
--hash=sha256:f9f1b160580c50dcf37b6495a0fd5ec61dc0d95dae5f8004f87dd9ad7eb46b34
197+
nanobind==2.9.2 \
198+
--hash=sha256:c37957ffd5eac7eda349cff3622ecd32e5ee1244ecc912c99b5bc8188bafd16e \
199+
--hash=sha256:e7608472de99d375759814cab3e2c94aba3f9ec80e62cfef8ced495ca5c27d6e
200200
# via -r mlir/python/requirements.txt
201201
numpy==2.0.2 \
202202
--hash=sha256:0123ffdaa88fa4ab64835dcbde75dcdf89c453c922f18dced6e27c90d1d0ec5a \
@@ -383,6 +383,10 @@ swig==4.3.1 \
383383
--hash=sha256:efec16327029f682f649a26da726bb0305be8800bd0f1fa3e81bf0769cf5b476 \
384384
--hash=sha256:fc496c0d600cf1bb2d91e28d3d6eae9c4301e5ea7a0dec5a4281b5efed4245a8
385385
# via -r lldb/test/requirements.txt
386+
typing-extensions==4.15.0 \
387+
--hash=sha256:0cea48d173cc12fa28ecabc3b837ea3cf6f38c6d1136f85cbaaf598984861466 \
388+
--hash=sha256:f0fa19c6845758ab08074a0cfa8b7aecb71c999ca73d62883bc25cc018c4e548
389+
# via -r mlir/python/requirements.txt
386390
urllib3==2.5.0 \
387391
--hash=sha256:3fc47733c7e419d4bc3f6b3dc2b4f890bb743906a30d56ba4a5bfa4bbff92760 \
388392
--hash=sha256:e6b01673c0fa6a13e374b50871808eb3bf7046c4b125b216f6bf1cc604cff0dc

.github/workflows/issue-write.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
- "Check code formatting"
77
- "Check for private emails used in PRs"
88
- "PR Request Release Note"
9+
- "Code lint"
910
types:
1011
- completed
1112

.github/workflows/pr-code-format.yml

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,6 @@ jobs:
3232
base_sha: 'HEAD~1'
3333
sha: 'HEAD'
3434

35-
# We need to pull the script from the main branch, so that we ensure
36-
# we get the latest version of this script.
37-
- name: Fetch code formatting utils
38-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
39-
with:
40-
repository: ${{ github.repository }}
41-
ref: ${{ github.base_ref }}
42-
sparse-checkout: |
43-
llvm/utils/git/requirements_formatting.txt
44-
llvm/utils/git/code-format-helper.py
45-
sparse-checkout-cone-mode: false
46-
path: code-format-tools
47-
4835
- name: "Listed files"
4936
env:
5037
CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
@@ -65,10 +52,10 @@ jobs:
6552
with:
6653
python-version: '3.11'
6754
cache: 'pip'
68-
cache-dependency-path: 'code-format-tools/llvm/utils/git/requirements_formatting.txt'
55+
cache-dependency-path: 'llvm/utils/git/requirements_formatting.txt'
6956

7057
- name: Install python dependencies
71-
run: pip install -r code-format-tools/llvm/utils/git/requirements_formatting.txt
58+
run: pip install -r llvm/utils/git/requirements_formatting.txt
7259

7360
- name: Run code formatter
7461
env:
@@ -77,7 +64,7 @@ jobs:
7764
# Create an empty comments file so the pr-write job doesn't fail.
7865
run: |
7966
echo "[]" > comments &&
80-
python ./code-format-tools/llvm/utils/git/code-format-helper.py \
67+
python ./llvm/utils/git/code-format-helper.py \
8168
--write-comment-to-file \
8269
--token ${{ secrets.GITHUB_TOKEN }} \
8370
--issue-number $GITHUB_PR_NUMBER \

.github/workflows/pr-code-lint.yml

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
name: "Code lint"
2+
3+
permissions:
4+
contents: read
5+
6+
on:
7+
pull_request:
8+
branches:
9+
- main
10+
- 'users/**'
11+
paths:
12+
- 'clang-tools-extra/clang-tidy/**'
13+
- '.github/workflows/pr-code-lint.yml'
14+
15+
jobs:
16+
code_linter:
17+
if: github.repository_owner == 'llvm'
18+
runs-on: ubuntu-24.04
19+
defaults:
20+
run:
21+
shell: bash
22+
container:
23+
image: 'ghcr.io/llvm/ci-ubuntu-24.04:latest'
24+
timeout-minutes: 60
25+
concurrency:
26+
group: ${{ github.workflow }}-${{ github.ref }}
27+
cancel-in-progress: true
28+
steps:
29+
- name: Fetch LLVM sources
30+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
31+
with:
32+
fetch-depth: 2
33+
34+
- name: Get changed files
35+
id: changed-files
36+
uses: step-security/changed-files@3dbe17c78367e7d60f00d78ae6781a35be47b4a1 # v45.0.1
37+
with:
38+
separator: ","
39+
skip_initial_fetch: true
40+
base_sha: 'HEAD~1'
41+
sha: 'HEAD'
42+
43+
- name: Listed files
44+
env:
45+
CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
46+
run: |
47+
echo "Changed files:"
48+
echo "$CHANGED_FILES"
49+
50+
- name: Install clang-tidy
51+
uses: aminya/setup-cpp@17c11551771948abc5752bbf3183482567c7caf0 # v1.1.1
52+
with:
53+
clang-tidy: 20.1.8
54+
55+
- name: Setup Python env
56+
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
57+
with:
58+
python-version: '3.12'
59+
60+
- name: Install Python dependencies
61+
run: python3 -m pip install -r llvm/utils/git/requirements_linting.txt
62+
63+
# TODO: create special mapping for 'codegen' targets, for now build predefined set
64+
# TODO: add entrypoint in 'compute_projects.py' that only adds a project and its direct dependencies
65+
- name: Configure and CodeGen
66+
run: |
67+
git config --global --add safe.directory '*'
68+
69+
. <(git diff --name-only HEAD~1...HEAD | python3 .ci/compute_projects.py)
70+
71+
if [[ "${projects_to_build}" == "" ]]; then
72+
echo "No projects to analyze"
73+
exit 0
74+
fi
75+
76+
cmake -G Ninja \
77+
-B build \
78+
-S llvm \
79+
-DLLVM_ENABLE_ASSERTIONS=OFF \
80+
-DLLVM_ENABLE_PROJECTS="${projects_to_build}" \
81+
-DCMAKE_CXX_COMPILER=clang++ \
82+
-DCMAKE_C_COMPILER=clang \
83+
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
84+
-DLLVM_INCLUDE_TESTS=OFF \
85+
-DCLANG_INCLUDE_TESTS=OFF \
86+
-DCMAKE_BUILD_TYPE=Release
87+
88+
ninja -C build \
89+
clang-tablegen-targets \
90+
genconfusable # for "ConfusableIdentifierCheck.h"
91+
92+
- name: Run code linter
93+
env:
94+
GITHUB_PR_NUMBER: ${{ github.event.pull_request.number }}
95+
CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
96+
run: |
97+
echo "[]" > comments &&
98+
python3 llvm/utils/git/code-lint-helper.py \
99+
--token ${{ secrets.GITHUB_TOKEN }} \
100+
--issue-number $GITHUB_PR_NUMBER \
101+
--start-rev HEAD~1 \
102+
--end-rev HEAD \
103+
--verbose \
104+
--changed-files "$CHANGED_FILES"
105+
106+
- name: Upload results
107+
uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 #v4.3.0
108+
if: always()
109+
with:
110+
name: workflow-args
111+
path: |
112+
comments

clang-tools-extra/clang-tidy/bugprone/BugproneTidyModule.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
#include "TaggedUnionMemberCountCheck.h"
8989
#include "TerminatingContinueCheck.h"
9090
#include "ThrowKeywordMissingCheck.h"
91+
#include "ThrowingStaticInitializationCheck.h"
9192
#include "TooSmallLoopVariableCheck.h"
9293
#include "UncheckedOptionalAccessCheck.h"
9394
#include "UncheckedStringToNumberConversionCheck.h"
@@ -261,6 +262,8 @@ class BugproneModule : public ClangTidyModule {
261262
"bugprone-terminating-continue");
262263
CheckFactories.registerCheck<ThrowKeywordMissingCheck>(
263264
"bugprone-throw-keyword-missing");
265+
CheckFactories.registerCheck<ThrowingStaticInitializationCheck>(
266+
"bugprone-throwing-static-initialization");
264267
CheckFactories.registerCheck<TooSmallLoopVariableCheck>(
265268
"bugprone-too-small-loop-variable");
266269
CheckFactories.registerCheck<UncheckedOptionalAccessCheck>(

clang-tools-extra/clang-tidy/bugprone/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ add_clang_library(clangTidyBugproneModule STATIC
9090
TaggedUnionMemberCountCheck.cpp
9191
TerminatingContinueCheck.cpp
9292
ThrowKeywordMissingCheck.cpp
93+
ThrowingStaticInitializationCheck.cpp
9394
TooSmallLoopVariableCheck.cpp
9495
UncheckedOptionalAccessCheck.cpp
9596
UncheckedStringToNumberConversionCheck.cpp

clang-tools-extra/clang-tidy/bugprone/SizeofExpressionCheck.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -378,8 +378,7 @@ void SizeofExpressionCheck::check(const MatchFinder::MatchResult &Result) {
378378
if (const auto *Type = dyn_cast<ArrayType>(SizeofArgTy)) {
379379
// check if the array element size is larger than one. If true,
380380
// the size of the array is higher than the number of elements
381-
CharUnits SSize = Ctx.getTypeSizeInChars(Type->getElementType());
382-
if (!SSize.isOne()) {
381+
if (!getSizeOfType(Ctx, Type->getElementType().getTypePtr()).isOne()) {
383382
diag(SzOfExpr->getBeginLoc(),
384383
"suspicious usage of 'sizeof' in the loop")
385384
<< SzOfExpr->getSourceRange();

clang-tools-extra/clang-tidy/cert/StaticObjectExceptionCheck.cpp renamed to clang-tools-extra/clang-tidy/bugprone/ThrowingStaticInitializationCheck.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
#include "StaticObjectExceptionCheck.h"
9+
#include "ThrowingStaticInitializationCheck.h"
1010
#include "clang/AST/ASTContext.h"
1111
#include "clang/ASTMatchers/ASTMatchFinder.h"
1212

1313
using namespace clang::ast_matchers;
1414

15-
namespace clang::tidy::cert {
15+
namespace clang::tidy::bugprone {
1616

17-
void StaticObjectExceptionCheck::registerMatchers(MatchFinder *Finder) {
17+
void ThrowingStaticInitializationCheck::registerMatchers(MatchFinder *Finder) {
1818
// Match any static or thread_local variable declaration that has an
1919
// initializer that can throw.
2020
Finder->addMatcher(
@@ -34,7 +34,8 @@ void StaticObjectExceptionCheck::registerMatchers(MatchFinder *Finder) {
3434
this);
3535
}
3636

37-
void StaticObjectExceptionCheck::check(const MatchFinder::MatchResult &Result) {
37+
void ThrowingStaticInitializationCheck::check(
38+
const MatchFinder::MatchResult &Result) {
3839
const auto *VD = Result.Nodes.getNodeAs<VarDecl>("var");
3940
const auto *Func = Result.Nodes.getNodeAs<FunctionDecl>("func");
4041

@@ -52,4 +53,4 @@ void StaticObjectExceptionCheck::check(const MatchFinder::MatchResult &Result) {
5253
}
5354
}
5455

55-
} // namespace clang::tidy::cert
56+
} // namespace clang::tidy::bugprone

clang-tools-extra/clang-tidy/cert/StaticObjectExceptionCheck.h renamed to clang-tools-extra/clang-tidy/bugprone/ThrowingStaticInitializationCheck.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_CERT_ERR58_CPP_H
10-
#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_CERT_ERR58_CPP_H
9+
#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_BUGPRONE_THROWINGSTATICINITIALIZATIONCHECK_H
10+
#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_BUGPRONE_THROWINGSTATICINITIALIZATIONCHECK_H
1111

1212
#include "../ClangTidyCheck.h"
1313

14-
namespace clang::tidy::cert {
14+
namespace clang::tidy::bugprone {
1515

1616
/// Checks whether the constructor for a static or thread_local object will
1717
/// throw.
1818
///
1919
/// For the user-facing documentation see:
20-
/// http://clang.llvm.org/extra/clang-tidy/checks/cert/err58-cpp.html
21-
class StaticObjectExceptionCheck : public ClangTidyCheck {
20+
/// http://clang.llvm.org/extra/clang-tidy/checks/bugprone/throwing-static-initialization.html
21+
class ThrowingStaticInitializationCheck : public ClangTidyCheck {
2222
public:
23-
StaticObjectExceptionCheck(StringRef Name, ClangTidyContext *Context)
23+
ThrowingStaticInitializationCheck(StringRef Name, ClangTidyContext *Context)
2424
: ClangTidyCheck(Name, Context) {}
2525
bool isLanguageVersionSupported(const LangOptions &LangOpts) const override {
2626
return getLangOpts().CPlusPlus && getLangOpts().CXXExceptions;
@@ -29,6 +29,6 @@ class StaticObjectExceptionCheck : public ClangTidyCheck {
2929
void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
3030
};
3131

32-
} // namespace clang::tidy::cert
32+
} // namespace clang::tidy::bugprone
3333

34-
#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_CERT_ERR58_CPP_H
34+
#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_BUGPRONE_THROWINGSTATICINITIALIZATIONCHECK_H

clang-tools-extra/clang-tidy/cert/CERTTidyModule.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "../bugprone/SizeofExpressionCheck.h"
1818
#include "../bugprone/SpuriouslyWakeUpFunctionsCheck.h"
1919
#include "../bugprone/SuspiciousMemoryComparisonCheck.h"
20+
#include "../bugprone/ThrowingStaticInitializationCheck.h"
2021
#include "../bugprone/UncheckedStringToNumberConversionCheck.h"
2122
#include "../bugprone/UnhandledSelfAssignmentCheck.h"
2223
#include "../bugprone/UnsafeFunctionsCheck.h"
@@ -27,6 +28,7 @@
2728
#include "../misc/NonCopyableObjects.h"
2829
#include "../misc/StaticAssertCheck.h"
2930
#include "../misc/ThrowByValueCatchByReferenceCheck.h"
31+
#include "../modernize/AvoidVariadicFunctionsCheck.h"
3032
#include "../performance/MoveConstructorInitCheck.h"
3133
#include "../readability/EnumInitialValueCheck.h"
3234
#include "../readability/UppercaseLiteralSuffixCheck.h"
@@ -39,9 +41,7 @@
3941
#include "NonTrivialTypesLibcMemoryCallsCheck.h"
4042
#include "ProperlySeededRandomGeneratorCheck.h"
4143
#include "SetLongJmpCheck.h"
42-
#include "StaticObjectExceptionCheck.h"
4344
#include "ThrownExceptionTypeCheck.h"
44-
#include "VariadicFunctionDefCheck.h"
4545

4646
namespace {
4747

@@ -245,7 +245,8 @@ class CERTModule : public ClangTidyModule {
245245
.registerCheck<bugprone::PointerArithmeticOnPolymorphicObjectCheck>(
246246
"cert-ctr56-cpp");
247247
// DCL
248-
CheckFactories.registerCheck<VariadicFunctionDefCheck>("cert-dcl50-cpp");
248+
CheckFactories.registerCheck<modernize::AvoidVariadicFunctionsCheck>(
249+
"cert-dcl50-cpp");
249250
CheckFactories.registerCheck<bugprone::ReservedIdentifierCheck>(
250251
"cert-dcl51-cpp");
251252
CheckFactories.registerCheck<misc::NewDeleteOverloadsCheck>(
@@ -257,7 +258,8 @@ class CERTModule : public ClangTidyModule {
257258
CheckFactories.registerCheck<misc::ThrowByValueCatchByReferenceCheck>(
258259
"cert-err09-cpp");
259260
CheckFactories.registerCheck<SetLongJmpCheck>("cert-err52-cpp");
260-
CheckFactories.registerCheck<StaticObjectExceptionCheck>("cert-err58-cpp");
261+
CheckFactories.registerCheck<bugprone::ThrowingStaticInitializationCheck>(
262+
"cert-err58-cpp");
261263
CheckFactories.registerCheck<ThrownExceptionTypeCheck>("cert-err60-cpp");
262264
CheckFactories.registerCheck<misc::ThrowByValueCatchByReferenceCheck>(
263265
"cert-err61-cpp");

0 commit comments

Comments
 (0)