================
@@ -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;
----------------
PiotrZSL wrote:
Maybe instead of replacing everything we could just replace/remove what's
needed, so variable name would be left in code not changed. In such case there
would be no conflicts with other checks that could want to change name of that
variable.
https://github.com/llvm/llvm-project/pull/77943
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
