[PATCH] D128157: [clang-tidy] cppcoreguidelines-virtual-class-destructor: Fix crash when "virtual" keyword is expanded from a macro
Joachim Priesner via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Thu Jun 23 02:53:07 PDT 2022
jspam updated this revision to Diff 439300.
jspam added a comment.
Rebased
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D128157/new/
https://reviews.llvm.org/D128157
Files:
clang-tools-extra/clang-tidy/cppcoreguidelines/VirtualClassDestructorCheck.cpp
clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/virtual-class-destructor.cpp
Index: clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/virtual-class-destructor.cpp
===================================================================
--- clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/virtual-class-destructor.cpp
+++ clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/virtual-class-destructor.cpp
@@ -272,6 +272,7 @@
} // namespace Bugzilla_51912
namespace macro_tests {
+#define MY_VIRTUAL virtual
#define CONCAT(x, y) x##y
// CHECK-MESSAGES: :[[@LINE+2]]:7: warning: destructor of 'FooBar1' is protected and virtual [cppcoreguidelines-virtual-class-destructor]
@@ -317,8 +318,17 @@
protected:
XMACRO(CONCAT(vir, tual), ~CONCAT(Foo, Bar5());) // no-crash, no-fixit
};
+
+// CHECK-MESSAGES: :[[@LINE+2]]:7: warning: destructor of 'FooBar6' is protected and virtual [cppcoreguidelines-virtual-class-destructor]
+// CHECK-MESSAGES: :[[@LINE+1]]:7: note: make it protected and non-virtual
+class FooBar6 {
+protected:
+ MY_VIRTUAL ~FooBar6(); // FIXME: We should have a fixit for this.
+};
+
#undef XMACRO
#undef CONCAT
+#undef MY_VIRTUAL
} // namespace macro_tests
namespace FinalClassCannotBeBaseClass {
Index: clang-tools-extra/clang-tidy/cppcoreguidelines/VirtualClassDestructorCheck.cpp
===================================================================
--- clang-tools-extra/clang-tidy/cppcoreguidelines/VirtualClassDestructorCheck.cpp
+++ clang-tools-extra/clang-tidy/cppcoreguidelines/VirtualClassDestructorCheck.cpp
@@ -54,13 +54,17 @@
return None;
SourceLocation VirtualBeginLoc = Destructor.getBeginLoc();
- SourceLocation VirtualEndLoc = VirtualBeginLoc.getLocWithOffset(
- Lexer::MeasureTokenLength(VirtualBeginLoc, SM, LangOpts));
+ SourceLocation VirtualBeginSpellingLoc =
+ SM.getSpellingLoc(Destructor.getBeginLoc());
+ SourceLocation VirtualEndLoc = VirtualBeginSpellingLoc.getLocWithOffset(
+ Lexer::MeasureTokenLength(VirtualBeginSpellingLoc, SM, LangOpts));
/// Range ends with \c StartOfNextToken so that any whitespace after \c
/// virtual is included.
- SourceLocation StartOfNextToken =
- Lexer::findNextToken(VirtualEndLoc, SM, LangOpts)->getLocation();
+ Optional<Token> NextToken = Lexer::findNextToken(VirtualEndLoc, SM, LangOpts);
+ if (!NextToken)
+ return None;
+ SourceLocation StartOfNextToken = NextToken->getLocation();
return CharSourceRange::getCharRange(VirtualBeginLoc, StartOfNextToken);
}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D128157.439300.patch
Type: text/x-patch
Size: 2459 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20220623/1347170a/attachment.bin>
More information about the cfe-commits
mailing list