https://github.com/HerrCai0907 created
https://github.com/llvm/llvm-project/pull/77943
avoid create incorrect fix hints for pointer to array type and pointer to
function type Fixes: #77891
>From 537d283288f555c2bb7cff90aee89fe9b18f08b8 Mon Sep 17 00:00:00 2001
From: Congcong Cai <congcongcai0...@163.com>
Date: Sat, 13 Jan 2024 00:31:33 +0800
Subject: [PATCH] [clang-tid]fix modernize-use-auto incorrect fix hints for
pointer
avoid create incorrect fix hints for pointer to array type and pointer to
function type
Fixes: #77891
---
.../clang-tidy/modernize/UseAutoCheck.cpp | 52 ++++++++++++++-----
clang-tools-extra/docs/ReleaseNotes.rst | 4 ++
2 files changed, 42 insertions(+), 14 deletions(-)
diff --git a/clang-tools-extra/clang-tidy/modernize/UseAutoCheck.cpp
b/clang-tools-extra/clang-tidy/modernize/UseAutoCheck.cpp
index 7af30e688b6a71..af41c4b5071796 100644
--- a/clang-tools-extra/clang-tidy/modernize/UseAutoCheck.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/UseAutoCheck.cpp
@@ -8,10 +8,12 @@
#include "UseAutoCheck.h"
#include "clang/AST/ASTContext.h"
+#include "clang/AST/TypeLoc.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/ASTMatchers/ASTMatchers.h"
#include "clang/Basic/CharInfo.h"
#include "clang/Tooling/FixIt.h"
+#include "llvm/ADT/STLExtras.h"
using namespace clang;
using namespace clang::ast_matchers;
@@ -333,6 +335,26 @@ void UseAutoCheck::replaceIterators(const DeclStmt *D,
ASTContext *Context) {
<< FixItHint::CreateReplacement(Range, "auto");
}
+namespace {
+
+void ignoreTypeLocClasses(
+ TypeLoc &Loc, llvm::SmallVector<TypeLoc::TypeLocClass> const &LocClasses) {
+ while (llvm::is_contained(LocClasses, Loc.getTypeLocClass()))
+ Loc = Loc.getNextTypeLoc();
+}
+
+bool isMutliLevelPointerToTypeLocClasses(
+ TypeLoc Loc, llvm::SmallVector<TypeLoc::TypeLocClass> const &LocClasses) {
+ ignoreTypeLocClasses(Loc, {TypeLoc::Paren, TypeLoc::Qualified});
+ if (Loc.getTypeLocClass() != TypeLoc::Pointer)
+ return false;
+ ignoreTypeLocClasses(Loc,
+ {TypeLoc::Paren, TypeLoc::Qualified, TypeLoc::Pointer});
+ return llvm::is_contained(LocClasses, Loc.getTypeLocClass());
+}
+
+} // namespace
+
void UseAutoCheck::replaceExpr(
const DeclStmt *D, ASTContext *Context,
llvm::function_ref<QualType(const Expr *)> GetType, StringRef Message) {
@@ -384,16 +406,10 @@ void UseAutoCheck::replaceExpr(
// information is not reliable where CV qualifiers are concerned so we can't
// do anything about this case for now.
TypeLoc Loc = FirstDecl->getTypeSourceInfo()->getTypeLoc();
- if (!RemoveStars) {
- while (Loc.getTypeLocClass() == TypeLoc::Pointer ||
- Loc.getTypeLocClass() == TypeLoc::Qualified)
- Loc = Loc.getNextTypeLoc();
- }
- while (Loc.getTypeLocClass() == TypeLoc::LValueReference ||
- Loc.getTypeLocClass() == TypeLoc::RValueReference ||
- Loc.getTypeLocClass() == TypeLoc::Qualified) {
- Loc = Loc.getNextTypeLoc();
- }
+ if (!RemoveStars)
+ ignoreTypeLocClasses(Loc, {TypeLoc::Pointer, TypeLoc::Qualified});
+ ignoreTypeLocClasses(Loc, {TypeLoc::LValueReference,
TypeLoc::RValueReference,
+ TypeLoc::Qualified});
SourceRange Range(Loc.getSourceRange());
if (MinTypeNameLength != 0 &&
@@ -405,12 +421,20 @@ void UseAutoCheck::replaceExpr(
auto Diag = diag(Range.getBegin(), Message);
+ bool ShouldReplenishVariableName = isMutliLevelPointerToTypeLocClasses(
+ FirstDecl->getTypeSourceInfo()->getTypeLoc(),
+ {TypeLoc::FunctionProto, TypeLoc::ConstantArray});
+
// Space after 'auto' to handle cases where the '*' in the pointer type is
// next to the identifier. This avoids changing 'int *p' into 'autop'.
- // FIXME: This doesn't work for function pointers because the variable name
- // is inside the type.
- Diag << FixItHint::CreateReplacement(Range, RemoveStars ? "auto " : "auto")
- << StarRemovals;
+ llvm::StringRef Auto = ShouldReplenishVariableName
+ ? (RemoveStars ? "auto " : "auto *")
+ : (RemoveStars ? "auto " : "auto");
+ std::string ReplenishedVariableName =
+ ShouldReplenishVariableName ? FirstDecl->getQualifiedNameAsString() : "";
+ std::string Replacement =
+ (Auto + llvm::StringRef{ReplenishedVariableName}).str();
+ Diag << FixItHint::CreateReplacement(Range, Replacement) << StarRemovals;
}
void UseAutoCheck::check(const MatchFinder::MatchResult &Result) {
diff --git a/clang-tools-extra/docs/ReleaseNotes.rst
b/clang-tools-extra/docs/ReleaseNotes.rst
index b4d87e0ed2a67a..9bf34177ebff2c 100644
--- a/clang-tools-extra/docs/ReleaseNotes.rst
+++ b/clang-tools-extra/docs/ReleaseNotes.rst
@@ -405,6 +405,10 @@ Changes in existing checks
false-positives when constructing the container with ``count`` copies of
elements with value ``value``.
+- Improved :doc:`modernize-use-auto
+ <clang-tidy/checks/modernize/use-auto>` to avoid create incorrect fix hints
+ for pointer to array type and pointer to function type.
+
- Improved :doc:`modernize-use-emplace
<clang-tidy/checks/modernize/use-emplace>` to not replace aggregates that
``emplace`` cannot construct with aggregate initialization.
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
