This is an archive of the discontinued LLVM Phabricator instance.

Differential D8071

Fix diag message in clang-tidy misc-uniqueptr-reset-release if right side is rvalue
ClosedPublic

Authored by sokolov on Mar 4 2015, 5:46 PM.

Details

Reviewers
alexfh

Diff Detail

Event Timeline

sokolov updated this revision to Diff 21249.Mar 4 2015, 5:46 PM
sokolov retitled this revision from to Fix diag message in clang-tidy misc-uniqueptr-reset-release if right side is rvalue.
sokolov updated this object.
sokolov edited the test plan for this revision. (Show Details)
sokolov added a reviewer: alexfh.
sokolov added a subscriber: Unknown Object (MLST).
alexfh accepted this revision.Mar 5 2015, 5:53 AM
alexfh edited edge metadata.

Looks good!

Thanks for the patch. I'll commit it for you.

This revision is now accepted and ready to land.Mar 5 2015, 5:53 AM
alexfh closed this revision.Mar 5 2015, 5:55 AM

Committed revision 231365.

Revision Contents

PathSize
clang-tidy/
misc/
11 lines
test/
clang-tidy/
2 lines

Diff 21249

clang-tidy/misc/UniqueptrResetRelease.cpp

Show First 20 Lines • Show All 46 Lines • ▼ Show 20 Linesvoid UniqueptrResetRelease::check(const MatchFinder::MatchResult &Result) {
std::string RightText = clang::Lexer::getSourceText( std::string RightText = clang::Lexer::getSourceText(
CharSourceRange::getTokenRange(Right->getSourceRange()), CharSourceRange::getTokenRange(Right->getSourceRange()),
*Result.SourceManager, Result.Context->getLangOpts()); *Result.SourceManager, Result.Context->getLangOpts());
if (ResetMember->isArrow()) if (ResetMember->isArrow())
LeftText = "*" + LeftText; LeftText = "*" + LeftText;
if (ReleaseMember->isArrow()) if (ReleaseMember->isArrow())
RightText = "*" + RightText; RightText = "*" + RightText;
std::string DiagText;
// Even if x was rvalue, *x is not rvalue anymore. // Even if x was rvalue, *x is not rvalue anymore.
if (!Right->isRValue() || ReleaseMember->isArrow()) if (!Right->isRValue() || ReleaseMember->isArrow()) {
RightText = "std::move(" + RightText + ")"; RightText = "std::move(" + RightText + ")";
DiagText = "prefer ptr1 = std::move(ptr2) over ptr1.reset(ptr2.release())";
} else {
DiagText =
"prefer ptr = ReturnUnique() over ptr.reset(ReturnUnique().release())";
}
std::string NewText = LeftText + " = " + RightText; std::string NewText = LeftText + " = " + RightText;
diag(ResetMember->getExprLoc(), diag(ResetMember->getExprLoc(), DiagText)
"prefer ptr1 = std::move(ptr2) over ptr1.reset(ptr2.release())")
<< FixItHint::CreateReplacement( << FixItHint::CreateReplacement(
CharSourceRange::getTokenRange(ResetCall->getSourceRange()), NewText); CharSourceRange::getTokenRange(ResetCall->getSourceRange()), NewText);
} }
} // namespace misc } // namespace misc
} // namespace tidy } // namespace tidy
} // namespace clang } // namespace clang

test/clang-tidy/misc-uniqueptr-reset-release.cpp

Show All 27 Linesvoid f() {
a.reset(b.release()); a.reset(b.release());
// CHECK-MESSAGES: :[[@LINE-1]]:5: warning: prefer ptr1 = std::move(ptr2) over ptr1.reset(ptr2.release()) [misc-uniqueptr-reset-release] // CHECK-MESSAGES: :[[@LINE-1]]:5: warning: prefer ptr1 = std::move(ptr2) over ptr1.reset(ptr2.release()) [misc-uniqueptr-reset-release]
// CHECK-FIXES: a = std::move(b); // CHECK-FIXES: a = std::move(b);
a.reset(c.release()); a.reset(c.release());
// CHECK-MESSAGES: :[[@LINE-1]]:5: warning: prefer ptr1 = std::move(ptr2) // CHECK-MESSAGES: :[[@LINE-1]]:5: warning: prefer ptr1 = std::move(ptr2)
// CHECK-FIXES: a = std::move(c); // CHECK-FIXES: a = std::move(c);
a.reset(Create().release()); a.reset(Create().release());
// CHECK-MESSAGES: :[[@LINE-1]]:5: warning: prefer ptr1 = std::move(ptr2) // CHECK-MESSAGES: :[[@LINE-1]]:5: warning: prefer ptr = ReturnUnique() over ptr.reset(ReturnUnique().release()) [misc-uniqueptr-reset-release]
// CHECK-FIXES: a = Create(); // CHECK-FIXES: a = Create();
x->reset(y->release()); x->reset(y->release());
// CHECK-MESSAGES: :[[@LINE-1]]:6: warning: prefer ptr1 = std::move(ptr2) // CHECK-MESSAGES: :[[@LINE-1]]:6: warning: prefer ptr1 = std::move(ptr2)
// CHECK-FIXES: *x = std::move(*y); // CHECK-FIXES: *x = std::move(*y);
Look().reset(Look().release()); Look().reset(Look().release());
// CHECK-MESSAGES: :[[@LINE-1]]:10: warning: prefer ptr1 = std::move(ptr2) // CHECK-MESSAGES: :[[@LINE-1]]:10: warning: prefer ptr1 = std::move(ptr2)
// CHECK-FIXES: Look() = std::move(Look()); // CHECK-FIXES: Look() = std::move(Look());
Get()->reset(Get()->release()); Get()->reset(Get()->release());
// CHECK-MESSAGES: :[[@LINE-1]]:10: warning: prefer ptr1 = std::move(ptr2) // CHECK-MESSAGES: :[[@LINE-1]]:10: warning: prefer ptr1 = std::move(ptr2)
// CHECK-FIXES: *Get() = std::move(*Get()); // CHECK-FIXES: *Get() = std::move(*Get());
} }