https://github.com/HerrCai0907 created
https://github.com/llvm/llvm-project/pull/65558:
Fixed #65055
>From f25a855ac2d3ec4b89f55a08e415596b3b65f142 Mon Sep 17 00:00:00 2001
From: Congcong Cai <congcongcai0...@163.com>
Date: Thu, 7 Sep 2023 10:14:28 +0800
Subject: [PATCH] [clang-tidy][modernize-use-using]fix function pointer typedef
correctly
---
clang-tools-extra/clang-tidy/modernize/UseUsingCheck.cpp | 6 ++++--
clang-tools-extra/docs/ReleaseNotes.rst | 3 +++
.../test/clang-tidy/checkers/modernize/use-using.cpp | 7 +++++++
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/clang-tools-extra/clang-tidy/modernize/UseUsingCheck.cpp
b/clang-tools-extra/clang-tidy/modernize/UseUsingCheck.cpp
index c1af8b5bfa11cac..22dc9e21cab9d5a 100644
--- a/clang-tools-extra/clang-tidy/modernize/UseUsingCheck.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/UseUsingCheck.cpp
@@ -120,8 +120,10 @@ void UseUsingCheck::check(const MatchFinder::MatchResult
&Result) {
Type.substr(0, FirstTypedefType.size()) == FirstTypedefType)
Type = FirstTypedefName + Type.substr(FirstTypedefType.size() + 1);
}
- if (!ReplaceRange.getEnd().isMacroID())
- LastReplacementEnd = ReplaceRange.getEnd().getLocWithOffset(Name.size());
+ if (!ReplaceRange.getEnd().isMacroID()) {
+ const SourceLocation::IntTy Offset = MatchedDecl->getFunctionType() ? 0 :
Name.size();
+ LastReplacementEnd = ReplaceRange.getEnd().getLocWithOffset(Offset);
+ }
auto Diag = diag(ReplaceRange.getBegin(), UseUsingWarning);
diff --git a/clang-tools-extra/docs/ReleaseNotes.rst
b/clang-tools-extra/docs/ReleaseNotes.rst
index a2cde526a8c04d9..90a782fa53b257d 100644
--- a/clang-tools-extra/docs/ReleaseNotes.rst
+++ b/clang-tools-extra/docs/ReleaseNotes.rst
@@ -246,6 +246,9 @@ Changes in existing checks
<clang-tidy/checks/modernize/use-std-print>` check to accurately generate
fixes for reordering arguments.
+- Improved :doc:`modernize-use-using<clang-tidy/checks/modernize/use-using>`
+ check to fix function pointer ``typedef`` correctly.
+
- Improved :doc:`performance-faster-string-find
<clang-tidy/checks/performance/faster-string-find>` check to properly escape
single quotes.
diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-using.cpp
b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-using.cpp
index 14469e31c826249..01f22f26c034ebe 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-using.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-using.cpp
@@ -314,3 +314,10 @@ typedef struct { struct { int a; struct { struct { int b;
} c; int d; } e; } f;
typedef struct { struct { int a; } b; union { int c; float d; struct { int e;
}; }; struct { double f; } g; } PR50990_siblings;
// CHECK-MESSAGES: :[[@LINE-1]]:1: warning: use 'using' instead of 'typedef'
// CHECK-FIXES: using PR50990_siblings = struct { struct { int a; } b; union {
int c; float d; struct { int e; }; }; struct { double f; } g; };
+
+typedef void (*ISSUE_65055_1)(int);
+typedef bool (*ISSUE_65055_2)(int);
+// CHECK-MESSAGES: :[[@LINE-2]]:1: warning: use 'using' instead of 'typedef'
+// CHECK-MESSAGES: :[[@LINE-2]]:1: warning: use 'using' instead of 'typedef'
+// CHECK-FIXES: using ISSUE_65055_1 = void (*)(int)
+// CHECK-FIXES: using ISSUE_65055_2 = bool (*)(int)
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
