diff options
| -rw-r--r-- | clang-tools-extra/clang-tidy/cppcoreguidelines/OwningMemoryCheck.cpp | 18 | ||||
| -rw-r--r-- | clang-tools-extra/test/clang-tidy/cppcoreguidelines-owning-memory.cpp | 2 |
2 files changed, 16 insertions, 4 deletions
diff --git a/clang-tools-extra/clang-tidy/cppcoreguidelines/OwningMemoryCheck.cpp b/clang-tools-extra/clang-tidy/cppcoreguidelines/OwningMemoryCheck.cpp index d7841d9d434..ac3d92c98ac 100644 --- a/clang-tools-extra/clang-tidy/cppcoreguidelines/OwningMemoryCheck.cpp +++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/OwningMemoryCheck.cpp @@ -156,6 +156,13 @@ bool OwningMemoryCheck::handleDeletion(const BoundNodes &Nodes) { "not marked 'gsl::owner<>'; consider using a " "smart pointer instead") << DeletedVariable->getSourceRange(); + + // FIXME: The declaration of the variable that was deleted can be + // rewritten. + const ValueDecl *Decl = DeletedVariable->getDecl(); + diag(Decl->getLocStart(), "variable declared here", DiagnosticIDs::Note) + << Decl->getSourceRange(); + return true; } return false; @@ -244,7 +251,9 @@ bool OwningMemoryCheck::handleAssignmentFromNewOwner(const BoundNodes &Nodes) { "initializing non-owner %0 with a newly created 'gsl::owner<>'") << BadOwnerInitialization->getType() << BadOwnerInitialization->getSourceRange(); - // FIXME: FixitHint to rewrite the type if possible. + + // FIXME: FixitHint to rewrite the type of the initialized variable + // as 'gsl::owner<OriginalType>' // If the type of the variable was deduced, the wrapping owner typedef is // eliminated, therefore the check emits a special note for that case. @@ -277,14 +286,15 @@ bool OwningMemoryCheck::handleReturnValues(const BoundNodes &Nodes) { // Function return values, that should be owners but aren't. if (BadReturnType) { - // The returned value is of type owner, but not the declared return type. + // The returned value is a resource or variable that was not annotated with + // owner<> and the function return type is not owner<>. diag(BadReturnType->getLocStart(), "returning a newly created resource of " "type %0 or 'gsl::owner<>' from a " "function whose return type is not 'gsl::owner<>'") << Function->getReturnType() << BadReturnType->getSourceRange(); - // The returned value is a resource that was not annotated with owner<> and - // the function return type is not owner<>. + + // FIXME: Rewrite the return type as 'gsl::owner<OriginalType>' return true; } return false; diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-owning-memory.cpp b/clang-tools-extra/test/clang-tidy/cppcoreguidelines-owning-memory.cpp index 789181d88b5..967c086257c 100644 --- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-owning-memory.cpp +++ b/clang-tools-extra/test/clang-tidy/cppcoreguidelines-owning-memory.cpp @@ -142,11 +142,13 @@ void test_deletion() { // CHECK-MESSAGES: [[@LINE-1]]:3: warning: initializing non-owner 'int *' with a newly created 'gsl::owner<>' delete unowned_int1; // BAD, since no owner // CHECK-MESSAGES: [[@LINE-1]]:3: warning: deleting a pointer through a type that is not marked 'gsl::owner<>'; consider using a smart pointer instead + // CHECK-MESSAGES: [[@LINE-4]]:3: note: variable declared here int *unowned_int2 = new int[42]; // BAD, since new creates and owner // CHECK-MESSAGES: [[@LINE-1]]:3: warning: initializing non-owner 'int *' with a newly created 'gsl::owner<>' delete[] unowned_int2; // BAD since no owner // CHECK-MESSAGES: [[@LINE-1]]:3: warning: deleting a pointer through a type that is not marked 'gsl::owner<>'; consider using a smart pointer instead + // CHECK-MESSAGES: [[@LINE-4]]:3: note: variable declared here delete new int(42); // Technically ok, but stupid delete[] new int[42]; // Technically ok, but stupid |
