rymiel updated this revision to Diff 464142.
rymiel edited the summary of this revision.
rymiel added a comment.
Add release note
Thank you, Aaron! Is the note I've added okay? I didn't expect to need to add a
note to a bugfix, but I haven't written a release note before at all
regardless. And yes, I'm able to commit it myself.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D133413/new/
https://reviews.llvm.org/D133413
Files:
clang-tools-extra/clang-tidy/readability/BracesAroundStatementsCheck.cpp
clang-tools-extra/clang-tidy/readability/SimplifyBooleanExprCheck.cpp
clang-tools-extra/docs/ReleaseNotes.rst
clang-tools-extra/test/clang-tidy/checkers/readability/braces-around-statements-consteval-if.cpp
clang-tools-extra/test/clang-tidy/checkers/readability/simplify-bool-expr-cxx23.cpp
Index: clang-tools-extra/test/clang-tidy/checkers/readability/simplify-bool-expr-cxx23.cpp
===================================================================
--- /dev/null
+++ clang-tools-extra/test/clang-tidy/checkers/readability/simplify-bool-expr-cxx23.cpp
@@ -0,0 +1,13 @@
+// RUN: clang-tidy %s -checks='-*,readability-simplify-boolean-expr' -- -std=c++2b | count 0
+template <bool Cond>
+constexpr int foo() {
+ if consteval {
+ if constexpr (Cond) {
+ return 0;
+ } else {
+ return 1;
+ }
+ } else {
+ return 2;
+ }
+}
Index: clang-tools-extra/test/clang-tidy/checkers/readability/braces-around-statements-consteval-if.cpp
===================================================================
--- /dev/null
+++ clang-tools-extra/test/clang-tidy/checkers/readability/braces-around-statements-consteval-if.cpp
@@ -0,0 +1,31 @@
+// RUN: clang-tidy %s -checks='-*,readability-braces-around-statements' -- -std=c++2b | count 0
+
+constexpr void handle(bool) {}
+
+constexpr void shouldPass() {
+ if consteval {
+ handle(true);
+ } else {
+ handle(false);
+ }
+}
+
+constexpr void shouldPassNegated() {
+ if !consteval {
+ handle(false);
+ } else {
+ handle(true);
+ }
+}
+
+constexpr void shouldPassSimple() {
+ if consteval {
+ handle(true);
+ }
+}
+
+void run() {
+ shouldPass();
+ shouldPassNegated();
+ shouldPassSimple();
+}
Index: clang-tools-extra/docs/ReleaseNotes.rst
===================================================================
--- clang-tools-extra/docs/ReleaseNotes.rst
+++ clang-tools-extra/docs/ReleaseNotes.rst
@@ -149,6 +149,11 @@
copy assignment operators with nonstandard return types. The check is restricted to
c++11-or-later.
+- Fixed crashes in :doc:`readability-braces-around-statements
+ <clang-tidy/checks/readability/braces-around-statements>` and
+ :doc:`readability-simplify-boolean-expr <clang-tidy/checks/readability/simplify-boolean-expr>`
+ when using a C++23 ``if consteval`` statement.
+
Removed checks
^^^^^^^^^^^^^^
Index: clang-tools-extra/clang-tidy/readability/SimplifyBooleanExprCheck.cpp
===================================================================
--- clang-tools-extra/clang-tidy/readability/SimplifyBooleanExprCheck.cpp
+++ clang-tools-extra/clang-tidy/readability/SimplifyBooleanExprCheck.cpp
@@ -354,8 +354,9 @@
}
bool VisitIfStmt(IfStmt *If) {
- // Skip any if's that have a condition var or an init statement.
- if (If->hasInitStorage() || If->hasVarStorage())
+ // Skip any if's that have a condition var or an init statement, or are
+ // "if consteval" statements.
+ if (If->hasInitStorage() || If->hasVarStorage() || If->isConsteval())
return true;
/*
* if (true) ThenStmt(); -> ThenStmt();
Index: clang-tools-extra/clang-tidy/readability/BracesAroundStatementsCheck.cpp
===================================================================
--- clang-tools-extra/clang-tidy/readability/BracesAroundStatementsCheck.cpp
+++ clang-tools-extra/clang-tidy/readability/BracesAroundStatementsCheck.cpp
@@ -131,6 +131,10 @@
return;
checkStmt(Result, S->getBody(), StartLoc);
} else if (const auto *S = Result.Nodes.getNodeAs<IfStmt>("if")) {
+ // "if consteval" always has braces.
+ if (S->isConsteval())
+ return;
+
SourceLocation StartLoc = findRParenLoc(S, SM, Context);
if (StartLoc.isInvalid())
return;
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
