Skip to content

Commit 06f5ddf

Browse files
committed
address feedback, add new non-address bits section
Created using spr 1.3.8-beta.1
2 parents 4fee21f + 9227e72 commit 06f5ddf

File tree

260 files changed

+8726
-6914
lines changed

Some content is hidden

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

260 files changed

+8726
-6914
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/custom/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ if(CLANG_TIDY_ENABLE_QUERY_BASED_CUSTOM_CHECKS)
99
QueryCheck.cpp
1010

1111
LINK_LIBS
12+
clangQuery
1213
clangTidy
1314
clangTidyBugproneModule
1415
clangTidyMiscModule
@@ -31,7 +32,6 @@ if(CLANG_TIDY_ENABLE_QUERY_BASED_CUSTOM_CHECKS)
3132
clangDynamicASTMatchers
3233
clangFrontend
3334
clangLex
34-
clangQuery
3535
clangSerialization
3636
clangTooling
3737
)

clang-tools-extra/clang-tidy/llvm/UseRangesCheck.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
#include "UseRangesCheck.h"
1010

11+
// FixItHint - Let the docs script know that this class does provide fixits
12+
1113
namespace clang::tidy::llvm_check {
1214

1315
namespace {

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

Lines changed: 51 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -9,47 +9,43 @@
99
#include "ContainerContainsCheck.h"
1010
#include "clang/AST/ASTContext.h"
1111
#include "clang/ASTMatchers/ASTMatchFinder.h"
12+
#include "clang/Lex/Lexer.h"
1213

1314
using namespace clang::ast_matchers;
1415

1516
namespace clang::tidy::readability {
1617
void ContainerContainsCheck::registerMatchers(MatchFinder *Finder) {
17-
const auto HasContainsMatchingParamType = hasMethod(
18-
cxxMethodDecl(isConst(), parameterCountIs(1), returns(booleanType()),
19-
hasName("contains"), unless(isDeleted()), isPublic(),
20-
hasParameter(0, hasType(hasUnqualifiedDesugaredType(
21-
equalsBoundNode("parameterType"))))));
18+
const auto Literal0 = integerLiteral(equals(0));
19+
const auto Literal1 = integerLiteral(equals(1));
20+
21+
const auto ClassWithContains = cxxRecordDecl(
22+
hasMethod(cxxMethodDecl(isConst(), parameterCountIs(1), isPublic(),
23+
unless(isDeleted()), returns(booleanType()),
24+
hasAnyName("contains", "Contains"))
25+
.bind("contains_fun")));
2226

2327
const auto CountCall =
24-
cxxMemberCallExpr(
25-
argumentCountIs(1),
26-
callee(cxxMethodDecl(
27-
hasName("count"),
28-
hasParameter(0, hasType(hasUnqualifiedDesugaredType(
29-
type().bind("parameterType")))),
30-
ofClass(cxxRecordDecl(HasContainsMatchingParamType)))))
28+
cxxMemberCallExpr(argumentCountIs(1),
29+
callee(cxxMethodDecl(hasAnyName("count", "Count"),
30+
ofClass(ClassWithContains))))
3131
.bind("call");
3232

3333
const auto FindCall =
34+
// Either one argument, or assume the second argument is the position to
35+
// start searching from.
3436
cxxMemberCallExpr(
35-
argumentCountIs(1),
36-
callee(cxxMethodDecl(
37-
hasName("find"),
38-
hasParameter(0, hasType(hasUnqualifiedDesugaredType(
39-
type().bind("parameterType")))),
40-
ofClass(cxxRecordDecl(HasContainsMatchingParamType)))))
37+
anyOf(argumentCountIs(1),
38+
allOf(argumentCountIs(2), hasArgument(1, Literal0))),
39+
callee(cxxMethodDecl(hasAnyName("find", "Find"),
40+
ofClass(ClassWithContains))))
4141
.bind("call");
4242

4343
const auto EndCall = cxxMemberCallExpr(
44-
argumentCountIs(0),
45-
callee(
46-
cxxMethodDecl(hasName("end"),
47-
// In the matchers below, FindCall should always appear
48-
// before EndCall so 'parameterType' is properly bound.
49-
ofClass(cxxRecordDecl(HasContainsMatchingParamType)))));
44+
argumentCountIs(0), callee(cxxMethodDecl(hasAnyName("end", "End"),
45+
ofClass(ClassWithContains))));
5046

51-
const auto Literal0 = integerLiteral(equals(0));
52-
const auto Literal1 = integerLiteral(equals(1));
47+
const auto StringNpos = anyOf(declRefExpr(to(varDecl(hasName("npos")))),
48+
memberExpr(member(hasName("npos"))));
5349

5450
auto AddSimpleMatcher = [&](auto Matcher) {
5551
Finder->addMatcher(
@@ -94,12 +90,14 @@ void ContainerContainsCheck::registerMatchers(MatchFinder *Finder) {
9490
binaryOperation(hasLHS(Literal1), hasOperatorName(">"), hasRHS(CountCall))
9591
.bind("negativeComparison"));
9692

97-
// Find membership tests based on `find() == end()`.
93+
// Find membership tests based on `find() == end()` or `find() == npos`.
9894
AddSimpleMatcher(
99-
binaryOperation(hasOperatorName("!="), hasOperands(FindCall, EndCall))
95+
binaryOperation(hasOperatorName("!="),
96+
hasOperands(FindCall, anyOf(EndCall, StringNpos)))
10097
.bind("positiveComparison"));
10198
AddSimpleMatcher(
102-
binaryOperation(hasOperatorName("=="), hasOperands(FindCall, EndCall))
99+
binaryOperation(hasOperatorName("=="),
100+
hasOperands(FindCall, anyOf(EndCall, StringNpos)))
103101
.bind("negativeComparison"));
104102
}
105103

@@ -114,29 +112,39 @@ void ContainerContainsCheck::check(const MatchFinder::MatchResult &Result) {
114112
"only one of PositiveComparison or NegativeComparison should be set");
115113
bool Negated = NegativeComparison != nullptr;
116114
const auto *Comparison = Negated ? NegativeComparison : PositiveComparison;
115+
const StringRef ContainsFunName =
116+
Result.Nodes.getNodeAs<CXXMethodDecl>("contains_fun")->getName();
117+
const Expr *SearchExpr = Call->getArg(0)->IgnoreParenImpCasts();
117118

118119
// Diagnose the issue.
119-
auto Diag =
120-
diag(Call->getExprLoc(), "use 'contains' to check for membership");
120+
auto Diag = diag(Call->getExprLoc(), "use '%0' to check for membership")
121+
<< ContainsFunName;
121122

122123
// Don't fix it if it's in a macro invocation. Leave fixing it to the user.
123124
SourceLocation FuncCallLoc = Comparison->getEndLoc();
124125
if (!FuncCallLoc.isValid() || FuncCallLoc.isMacroID())
125126
return;
126127

127-
// Create the fix it.
128-
const auto *Member = cast<MemberExpr>(Call->getCallee());
129-
Diag << FixItHint::CreateReplacement(
130-
Member->getMemberNameInfo().getSourceRange(), "contains");
131-
SourceLocation ComparisonBegin = Comparison->getSourceRange().getBegin();
132-
SourceLocation ComparisonEnd = Comparison->getSourceRange().getEnd();
133-
SourceLocation CallBegin = Call->getSourceRange().getBegin();
134-
SourceLocation CallEnd = Call->getSourceRange().getEnd();
128+
const StringRef SearchExprText = Lexer::getSourceText(
129+
CharSourceRange::getTokenRange(SearchExpr->getSourceRange()),
130+
*Result.SourceManager, Result.Context->getLangOpts());
131+
132+
// Remove everything before the function call.
133+
Diag << FixItHint::CreateRemoval(CharSourceRange::getCharRange(
134+
Comparison->getBeginLoc(), Call->getBeginLoc()));
135+
136+
// Rename the function to `contains`.
137+
Diag << FixItHint::CreateReplacement(Call->getExprLoc(), ContainsFunName);
138+
139+
// Replace arguments and everything after the function call.
135140
Diag << FixItHint::CreateReplacement(
136-
CharSourceRange::getCharRange(ComparisonBegin, CallBegin),
137-
Negated ? "!" : "");
138-
Diag << FixItHint::CreateRemoval(CharSourceRange::getTokenRange(
139-
CallEnd.getLocWithOffset(1), ComparisonEnd));
141+
CharSourceRange::getTokenRange(Call->getArg(0)->getBeginLoc(),
142+
Comparison->getEndLoc()),
143+
(SearchExprText + ")").str());
144+
145+
// Add negation if necessary.
146+
if (Negated)
147+
Diag << FixItHint::CreateInsertion(Call->getBeginLoc(), "!");
140148
}
141149

142150
} // namespace clang::tidy::readability

clang-tools-extra/clangd/FeatureModule.cpp

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ FeatureModule::Facilities &FeatureModule::facilities() {
2222
return *Fac;
2323
}
2424

25+
void FeatureModuleSet::add(std::unique_ptr<FeatureModule> M) {
26+
Modules.push_back(std::move(M));
27+
}
28+
2529
bool FeatureModuleSet::addImpl(void *Key, std::unique_ptr<FeatureModule> M,
2630
const char *Source) {
2731
if (!Map.try_emplace(Key, M.get()).second) {
@@ -33,5 +37,16 @@ bool FeatureModuleSet::addImpl(void *Key, std::unique_ptr<FeatureModule> M,
3337
return true;
3438
}
3539

40+
FeatureModuleSet FeatureModuleSet::fromRegistry() {
41+
FeatureModuleSet ModuleSet;
42+
for (FeatureModuleRegistry::entry E : FeatureModuleRegistry::entries()) {
43+
vlog("Adding feature module '{0}' ({1})", E.getName(), E.getDesc());
44+
ModuleSet.add(E.instantiate());
45+
}
46+
return ModuleSet;
47+
}
48+
3649
} // namespace clangd
3750
} // namespace clang
51+
52+
LLVM_INSTANTIATE_REGISTRY(clang::clangd::FeatureModuleRegistry)

0 commit comments

Comments
 (0)