njames93 created this revision.
njames93 added reviewers: aaron.ballman, alexfh, gribozavr2.
Herald added subscribers: cfe-commits, xazax.hun.
Herald added a project: clang.
Prevent fixes being displayed if usages are found in the scratch buffer.
See Fix-It hints are being generated in the ScratchBuffer
<https://bugs.llvm.org/show_bug.cgi?id=46219>.
It may be wise down the line to put in a general fix in clang-tidy to prevent
ScratchBuffer replacements being applied, but for now this will help.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D82162
Files:
clang-tools-extra/clang-tidy/utils/RenamerClangTidyCheck.cpp
clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming.cpp
Index: clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming.cpp
===================================================================
--- clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming.cpp
+++ clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming.cpp
@@ -562,3 +562,19 @@
}
} // namespace redecls
+
+namespace scratchspace {
+#define DUP(Tok) Tok
+#define M1(Tok) DUP(badName##Tok())
+
+// We don't want a warning here as the call to this in Foo is in a scratch
+// buffer so its fix-it wouldn't be applied, resulting in invalid code.
+void badNameWarn();
+
+void Foo() {
+ M1(Warn);
+}
+
+#undef M1
+#undef DUP
+} // namespace scratchspace
Index: clang-tools-extra/clang-tidy/utils/RenamerClangTidyCheck.cpp
===================================================================
--- clang-tools-extra/clang-tidy/utils/RenamerClangTidyCheck.cpp
+++ clang-tools-extra/clang-tidy/utils/RenamerClangTidyCheck.cpp
@@ -156,14 +156,17 @@
// is already in there
RenamerClangTidyCheck::NamingCheckFailure &Failure =
NamingCheckFailures[Decl];
- if (!Failure.RawUsageLocs.insert(FixLocation.getRawEncoding()).second)
- return;
if (!Failure.ShouldFix())
return;
+ if (SourceMgr && SourceMgr->isWrittenInScratchSpace(FixLocation))
+ Failure.FixStatus = RenamerClangTidyCheck::ShouldFixStatus::InsideMacro;
+
if (!utils::rangeCanBeFixed(Range, SourceMgr))
Failure.FixStatus = RenamerClangTidyCheck::ShouldFixStatus::InsideMacro;
+
+ Failure.RawUsageLocs.insert(FixLocation.getRawEncoding());
}
void RenamerClangTidyCheck::addUsage(const NamedDecl *Decl, SourceRange Range,
@@ -248,13 +251,15 @@
if (const auto *Decl =
Result.Nodes.getNodeAs<CXXConstructorDecl>("classRef")) {
- addUsage(Decl->getParent(), Decl->getNameInfo().getSourceRange());
+ addUsage(Decl->getParent(), Decl->getNameInfo().getSourceRange(),
+ Result.SourceManager);
for (const auto *Init : Decl->inits()) {
if (!Init->isWritten() || Init->isInClassMemberInitializer())
continue;
if (const FieldDecl *FD = Init->getAnyMember())
- addUsage(FD, SourceRange(Init->getMemberLocation()));
+ addUsage(FD, SourceRange(Init->getMemberLocation()),
+ Result.SourceManager);
// Note: delegating constructors and base class initializers are handled
// via the "typeLoc" matcher.
}
@@ -271,7 +276,7 @@
// we want instead to replace the next token, that will be the identifier.
Range.setBegin(CharSourceRange::getTokenRange(Range).getEnd());
- addUsage(Decl->getParent(), Range);
+ addUsage(Decl->getParent(), Range, Result.SourceManager);
return;
}
@@ -289,7 +294,7 @@
// further TypeLocs handled below
if (Decl) {
- addUsage(Decl, Loc->getSourceRange());
+ addUsage(Decl, Loc->getSourceRange(), Result.SourceManager);
return;
}
@@ -300,7 +305,7 @@
SourceRange Range(Ref.getTemplateNameLoc(), Ref.getTemplateNameLoc());
if (const auto *ClassDecl = dyn_cast<TemplateDecl>(Decl)) {
if (const NamedDecl *TemplDecl = ClassDecl->getTemplatedDecl())
- addUsage(TemplDecl, Range);
+ addUsage(TemplDecl, Range, Result.SourceManager);
return;
}
}
@@ -308,7 +313,7 @@
if (const auto &Ref =
Loc->getAs<DependentTemplateSpecializationTypeLoc>()) {
if (const TagDecl *Decl = Ref.getTypePtr()->getAsTagDecl())
- addUsage(Decl, Loc->getSourceRange());
+ addUsage(Decl, Loc->getSourceRange(), Result.SourceManager);
return;
}
}
@@ -317,7 +322,7 @@
Result.Nodes.getNodeAs<NestedNameSpecifierLoc>("nestedNameLoc")) {
if (const NestedNameSpecifier *Spec = Loc->getNestedNameSpecifier()) {
if (const NamespaceDecl *Decl = Spec->getAsNamespace()) {
- addUsage(Decl, Loc->getLocalSourceRange());
+ addUsage(Decl, Loc->getLocalSourceRange(), Result.SourceManager);
return;
}
}
@@ -325,7 +330,8 @@
if (const auto *Decl = Result.Nodes.getNodeAs<UsingDecl>("using")) {
for (const auto *Shadow : Decl->shadows())
- addUsage(Shadow->getTargetDecl(), Decl->getNameInfo().getSourceRange());
+ addUsage(Shadow->getTargetDecl(), Decl->getNameInfo().getSourceRange(),
+ Result.SourceManager);
return;
}
@@ -371,14 +377,14 @@
// Fix using namespace declarations.
if (const auto *UsingNS = dyn_cast<UsingDirectiveDecl>(Decl))
addUsage(UsingNS->getNominatedNamespaceAsWritten(),
- UsingNS->getIdentLocation());
+ UsingNS->getIdentLocation(), Result.SourceManager);
if (!Decl->getIdentifier() || Decl->getName().empty() || Decl->isImplicit())
return;
const auto *Canonical = cast<NamedDecl>(Decl->getCanonicalDecl());
if (Canonical != Decl) {
- addUsage(Canonical, Decl->getLocation());
+ addUsage(Canonical, Decl->getLocation(), Result.SourceManager);
return;
}
@@ -386,7 +392,8 @@
if (const auto *Value = Result.Nodes.getNodeAs<ValueDecl>("decl")) {
if (const Type *TypePtr = Value->getType().getTypePtrOrNull()) {
if (const auto *Typedef = TypePtr->getAs<TypedefType>())
- addUsage(Typedef->getDecl(), Value->getSourceRange());
+ addUsage(Typedef->getDecl(), Value->getSourceRange(),
+ Result.SourceManager);
}
}
@@ -394,11 +401,13 @@
if (const auto *Value = Result.Nodes.getNodeAs<FunctionDecl>("decl")) {
if (const auto *Typedef =
Value->getReturnType().getTypePtr()->getAs<TypedefType>())
- addUsage(Typedef->getDecl(), Value->getSourceRange());
+ addUsage(Typedef->getDecl(), Value->getSourceRange(),
+ Result.SourceManager);
for (const ParmVarDecl *Param : Value->parameters()) {
if (const TypedefType *Typedef =
Param->getType().getTypePtr()->getAs<TypedefType>())
- addUsage(Typedef->getDecl(), Value->getSourceRange());
+ addUsage(Typedef->getDecl(), Value->getSourceRange(),
+ Result.SourceManager);
}
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
