Hi klimek,
Do not warn on .reset(.release()) expressions if the deleters are not
compatible.
Using plain assignment will probably not work.
http://reviews.llvm.org/D8422
Files:
clang-tidy/misc/UniqueptrResetReleaseCheck.cpp
test/clang-tidy/misc-uniqueptr-reset-release.cpp
EMAIL PREFERENCES
http://reviews.llvm.org/settings/panel/emailpreferences/
Index: clang-tidy/misc/UniqueptrResetReleaseCheck.cpp
===================================================================
--- clang-tidy/misc/UniqueptrResetReleaseCheck.cpp
+++ clang-tidy/misc/UniqueptrResetReleaseCheck.cpp
@@ -22,25 +22,72 @@
memberCallExpr(
on(expr().bind("left")), callee(memberExpr().bind("reset_member")),
callee(methodDecl(hasName("reset"),
- ofClass(hasName("::std::unique_ptr")))),
+ ofClass(recordDecl(hasName("::std::unique_ptr"),
+ decl().bind("left_class"))))),
has(memberCallExpr(
on(expr().bind("right")),
callee(memberExpr().bind("release_member")),
- callee(methodDecl(hasName("release"),
- ofClass(hasName("::std::unique_ptr")))))))
+ callee(methodDecl(
+ hasName("release"),
+ ofClass(recordDecl(hasName("::std::unique_ptr"),
+ decl().bind("right_class"))))))))
.bind("reset_call"),
this);
}
+namespace {
+const CXXRecordDecl *
+getDeleterForUniquePtr(const MatchFinder::MatchResult &Result, StringRef ID) {
+ const auto *Class =
+ Result.Nodes.getNodeAs<ClassTemplateSpecializationDecl>(ID);
+ if (!Class) return nullptr;
+ auto DeleterArgument = Class->getTemplateArgs()[1];
+ if (DeleterArgument.getKind() != TemplateArgument::Type) return nullptr;
+ return DeleterArgument.getAsType()->getAsCXXRecordDecl();
+}
+
+bool areDeletersCompatible(const MatchFinder::MatchResult &Result) {
+ const auto *LeftDeleter = getDeleterForUniquePtr(Result, "left_class");
+ const auto *RightDeleter = getDeleterForUniquePtr(Result, "right_class");
+ if (!LeftDeleter || !RightDeleter)
+ return false;
+
+ if (LeftDeleter->getCanonicalDecl() == RightDeleter->getCanonicalDecl()) {
+ // Same class. We assume they are compatible.
+ return true;
+ }
+
+ const auto *LeftAsTemplate =
+ dyn_cast<ClassTemplateSpecializationDecl>(LeftDeleter);
+ const auto *RightAsTemplate =
+ dyn_cast<ClassTemplateSpecializationDecl>(RightDeleter);
+ if (LeftAsTemplate && RightAsTemplate &&
+ LeftAsTemplate->getSpecializedTemplate() ==
+ RightAsTemplate->getSpecializedTemplate()) {
+ // They are different instantiations of the same template. We assume they
+ // are compatible.
+ // This handles things like std::default_delete<Base> vs.
+ // std::default_delete<Derived>.
+ return true;
+ }
+ return false;
+}
+
+} // namespace
+
void UniqueptrResetReleaseCheck::check(const MatchFinder::MatchResult &Result) {
+ if (!areDeletersCompatible(Result))
+ return;
+
const auto *ResetMember = Result.Nodes.getNodeAs<MemberExpr>("reset_member");
const auto *ReleaseMember =
Result.Nodes.getNodeAs<MemberExpr>("release_member");
const auto *Right = Result.Nodes.getNodeAs<Expr>("right");
const auto *Left = Result.Nodes.getNodeAs<Expr>("left");
const auto *ResetCall =
Result.Nodes.getNodeAs<CXXMemberCallExpr>("reset_call");
+
std::string LeftText = clang::Lexer::getSourceText(
CharSourceRange::getTokenRange(Left->getSourceRange()),
*Result.SourceManager, Result.Context->getLangOpts());
Index: test/clang-tidy/misc-uniqueptr-reset-release.cpp
===================================================================
--- test/clang-tidy/misc-uniqueptr-reset-release.cpp
+++ test/clang-tidy/misc-uniqueptr-reset-release.cpp
@@ -2,12 +2,16 @@
// REQUIRES: shell
namespace std {
+
template <typename T>
+struct default_delete {};
+
+template <typename T, class Deleter = std::default_delete<T>>
struct unique_ptr {
- unique_ptr<T>();
- explicit unique_ptr<T>(T *);
- template <typename U>
- unique_ptr<T>(unique_ptr<U> &&);
+ unique_ptr();
+ explicit unique_ptr(T *);
+ template <typename U, typename E>
+ unique_ptr(unique_ptr<U, E> &&);
void reset(T *);
T *release();
};
@@ -46,3 +50,9 @@
// CHECK-FIXES: *Get() = std::move(*Get());
}
+void negatives() {
+ std::unique_ptr<Foo> src;
+ struct OtherDeleter {};
+ std::unique_ptr<Foo, OtherDeleter> dest;
+ dest.reset(src.release());
+}
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
