Skip to content

Commit 15ba9bd

Browse files
authored
Merge branch 'main' into inbelic/rs-sema-source-loc
2 parents 0edfe43 + a0895d0 commit 15ba9bd

File tree

1,216 files changed

+139692
-18594
lines changed

Some content is hidden

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

1,216 files changed

+139692
-18594
lines changed

.clang-tidy

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
1-
Checks: '-*,clang-diagnostic-*,llvm-*,misc-*,-misc-const-correctness,-misc-unused-parameters,-misc-non-private-member-variables-in-classes,-misc-no-recursion,-misc-use-anonymous-namespace,readability-identifier-naming,-misc-include-cleaner'
1+
Checks: >
2+
-*,
3+
clang-diagnostic-*,
4+
llvm-*,
5+
misc-*,
6+
-misc-const-correctness,
7+
-misc-include-cleaner,
8+
-misc-no-recursion,
9+
-misc-non-private-member-variables-in-classes,
10+
-misc-unused-parameters,
11+
-misc-use-anonymous-namespace,
12+
readability-identifier-naming
13+
214
CheckOptions:
315
- key: readability-identifier-naming.ClassCase
416
value: CamelCase

.github/workflows/containers/github-action-ci/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM docker.io/library/ubuntu:24.04 as base
22
ENV LLVM_SYSROOT=/opt/llvm
33

44
FROM base as stage1-toolchain
5-
ENV LLVM_VERSION=20.1.4
5+
ENV LLVM_VERSION=20.1.8
66

77
RUN apt-get update && \
88
apt-get install -y \

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
- name: Install clang-format
5656
uses: aminya/setup-cpp@17c11551771948abc5752bbf3183482567c7caf0 # v1.1.1
5757
with:
58-
clangformat: 20.1.5
58+
clangformat: 20.1.8
5959

6060
- name: Setup Python env
6161
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0

.github/workflows/premerge.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ jobs:
6363
6464
./.ci/monolithic-linux.sh "${projects_to_build}" "${project_check_targets}" "${runtimes_to_build}" "${runtimes_check_targets}" "${runtimes_check_targets_needs_reconfig}"
6565
- name: Upload Artifacts
66+
if: '!cancelled()'
6667
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
6768
with:
6869
name: Premerge Artifacts (Linux)
@@ -113,6 +114,7 @@ jobs:
113114
call C:\\BuildTools\\Common7\\Tools\\VsDevCmd.bat -arch=amd64 -host_arch=amd64
114115
bash .ci/monolithic-windows.sh "${{ steps.vars.outputs.windows-projects }}" "${{ steps.vars.outputs.windows-check-targets }}"
115116
- name: Upload Artifacts
117+
if: '!cancelled()'
116118
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
117119
with:
118120
name: Premerge Artifacts (Windows)
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
InheritParentConfig: true
2+
Checks: >
3+
bugprone-*,
4+
-bugprone-assignment-in-if-condition,
5+
-bugprone-branch-clone,
6+
-bugprone-easily-swappable-parameters,
7+
-bugprone-narrowing-conversions,
8+
-bugprone-suspicious-stringview-data-usage,
9+
-bugprone-unchecked-optional-access,
10+
-bugprone-unused-return-value,
11+
modernize-*,
12+
-modernize-avoid-c-arrays,
13+
-modernize-pass-by-value,
14+
-modernize-use-auto,
15+
-modernize-use-nodiscard,
16+
-modernize-use-trailing-return-type,
17+
performance-*,
18+
-performance-enum-size,
19+
-performance-move-const-arg,
20+
-performance-no-int-to-ptr,
21+
-performance-type-promotion-in-math-fn,
22+
-performance-unnecessary-value-param,
23+
readability-*,
24+
-readability-avoid-nested-conditional-operator,
25+
-readability-avoid-return-with-void-value,
26+
-readability-braces-around-statements,
27+
-readability-container-contains,
28+
-readability-convert-member-functions-to-static,
29+
-readability-else-after-return,
30+
-readability-function-cognitive-complexity,
31+
-readability-identifier-length,
32+
-readability-implicit-bool-conversion,
33+
-readability-isolate-declaration,
34+
-readability-magic-numbers,
35+
-readability-named-parameter,
36+
-readability-qualified-auto,
37+
-readability-redundant-declaration,
38+
-readability-simplify-boolean-expr,
39+
-readability-static-definition-in-anonymous-namespace,
40+
-readability-suspicious-call-argument,
41+
-readability-use-anyofallof

clang-tools-extra/clang-tidy/boost/UseRangesCheck.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class UseRangesCheck : public utils::UseRangesCheck {
2222
public:
2323
UseRangesCheck(StringRef Name, ClangTidyContext *Context);
2424

25-
void storeOptions(ClangTidyOptions::OptionMap &Options) override;
25+
void storeOptions(ClangTidyOptions::OptionMap &Opts) override;
2626

2727
ReplacerMap getReplacerMap() const override;
2828

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ static bool isLikelyTypo(llvm::ArrayRef<ParmVarDecl *> Params,
145145
std::string ArgNameLowerStr = ArgName.lower();
146146
StringRef ArgNameLower = ArgNameLowerStr;
147147
// The threshold is arbitrary.
148-
unsigned UpperBound = (ArgName.size() + 2) / 3 + 1;
148+
unsigned UpperBound = ((ArgName.size() + 2) / 3) + 1;
149149
unsigned ThisED = ArgNameLower.edit_distance(
150150
Params[ArgIndex]->getIdentifier()->getName().lower(),
151151
/*AllowReplacements=*/true, UpperBound);

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,13 +129,10 @@ void CrtpConstructorAccessibilityCheck::check(
129129
<< HintFriend;
130130
}
131131

132-
auto WithFriendHintIfNeeded =
133-
[&](const DiagnosticBuilder &Diag,
134-
bool NeedsFriend) -> const DiagnosticBuilder & {
132+
auto WithFriendHintIfNeeded = [&](const DiagnosticBuilder &Diag,
133+
bool NeedsFriend) {
135134
if (NeedsFriend)
136135
Diag << HintFriend;
137-
138-
return Diag;
139136
};
140137

141138
if (!CRTPDeclaration->hasUserDeclaredConstructor()) {

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ using namespace clang::ast_matchers;
1818
using clang::ast_matchers::internal::Matcher;
1919
using clang::tidy::utils::hasPtrOrReferenceInFunc;
2020

21-
namespace clang {
22-
namespace tidy::bugprone {
21+
namespace clang::tidy::bugprone {
2322

2423
namespace {
2524
/// matches a Decl if it has a "no return" attribute of any kind
@@ -327,5 +326,4 @@ void InfiniteLoopCheck::check(const MatchFinder::MatchResult &Result) {
327326
}
328327
}
329328

330-
} // namespace tidy::bugprone
331-
} // namespace clang
329+
} // namespace clang::tidy::bugprone

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,7 @@ unsigned MacroRepeatedPPCallbacks::countArgumentExpansions(
153153
// Count argument.
154154
if (TII == Arg) {
155155
Current++;
156-
if (Current > Max)
157-
Max = Current;
156+
Max = std::max(Max, Current);
158157
}
159158
}
160159
return Max;

0 commit comments

Comments
 (0)