https://github.com/PiotrZSL created
https://github.com/llvm/llvm-project/pull/94527
Fixed crash caused by call to getCookedLiteral on
template user defined literal. Fix base on assert in getCookedLiteral method.
Closes #94454
>From a19a71fdf5e421c6b79fc3d6ecf7212b090b13a1 Mon Sep 17 00:00:00 2001
From: Piotr Zegar <m...@piotrzegar.pl>
Date: Wed, 5 Jun 2024 19:38:18 +0000
Subject: [PATCH] [clang-tidy] Fix crash in readability-container-size-empty
Fixed crash caused by call to getCookedLiteral on
template user defined literal. Fix base on assert in
getCookedLiteral method.
Closes #94454
---
.../clang-tidy/readability/ContainerSizeEmptyCheck.cpp | 9 +++++++--
clang-tools-extra/docs/ReleaseNotes.rst | 1 +
.../checkers/readability/container-size-empty.cpp | 6 ++++++
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git
a/clang-tools-extra/clang-tidy/readability/ContainerSizeEmptyCheck.cpp
b/clang-tools-extra/clang-tidy/readability/ContainerSizeEmptyCheck.cpp
index bbc1b47b97ae6..bf7a847dff103 100644
--- a/clang-tools-extra/clang-tidy/readability/ContainerSizeEmptyCheck.cpp
+++ b/clang-tools-extra/clang-tidy/readability/ContainerSizeEmptyCheck.cpp
@@ -96,9 +96,14 @@ AST_MATCHER(QualType, isIntegralType) {
AST_MATCHER_P(UserDefinedLiteral, hasLiteral,
clang::ast_matchers::internal::Matcher<Expr>, InnerMatcher) {
- if (const Expr *CookedLiteral = Node.getCookedLiteral()) {
+ const UserDefinedLiteral::LiteralOperatorKind LOK =
+ Node.getLiteralOperatorKind();
+ if (LOK == UserDefinedLiteral::LOK_Template ||
+ LOK == UserDefinedLiteral::LOK_Raw)
+ return false;
+
+ if (const Expr *CookedLiteral = Node.getCookedLiteral())
return InnerMatcher.matches(*CookedLiteral, Finder, Builder);
- }
return false;
}
diff --git a/clang-tools-extra/docs/ReleaseNotes.rst
b/clang-tools-extra/docs/ReleaseNotes.rst
index 6947cf06f6e56..661b2b1620d0b 100644
--- a/clang-tools-extra/docs/ReleaseNotes.rst
+++ b/clang-tools-extra/docs/ReleaseNotes.rst
@@ -376,6 +376,7 @@ Changes in existing checks
- Improved :doc:`readability-container-size-empty
<clang-tidy/checks/readability/container-size-empty>` check to prevent false
positives when utilizing ``size`` or ``length`` methods that accept
parameter.
+ Fixed crash when facing template user defined literals.
- Improved :doc:`readability-duplicate-include
<clang-tidy/checks/readability/duplicate-include>` check by excluding include
diff --git
a/clang-tools-extra/test/clang-tidy/checkers/readability/container-size-empty.cpp
b/clang-tools-extra/test/clang-tidy/checkers/readability/container-size-empty.cpp
index ecaf97fa348cc..46755270b48ea 100644
---
a/clang-tools-extra/test/clang-tidy/checkers/readability/container-size-empty.cpp
+++
b/clang-tools-extra/test/clang-tidy/checkers/readability/container-size-empty.cpp
@@ -889,3 +889,9 @@ namespace PR88203 {
// CHECK-FIXES: {{^ }}if (s.empty()) {}{{$}}
}
}
+
+namespace PR94454 {
+ template <char...>
+ int operator""_ci() { return 0; }
+ auto eq = 0_ci == 0;
+}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
