Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions clang/lib/StaticAnalyzer/Checkers/WebKit/ASTUtils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,14 @@ bool tryToFindPtrOrigin(
if (isSingleton(E->getFoundDecl()))
return callback(E, true);
}

if (auto *MemberExpr = dyn_cast<CXXDependentScopeMemberExpr>(CalleeE)) {
auto *Base = MemberExpr->getBase();
auto MemberName = MemberExpr->getMember().getAsString();
bool IsGetter = MemberName == "get" || MemberName == "ptr";
if (Base && isSafePtrType(Base->getType()) && IsGetter)
return callback(E, true);
}
}

// Sometimes, canonical type erroneously turns Ref<T> into T.
Expand Down
29 changes: 29 additions & 0 deletions clang/test/Analysis/Checkers/WebKit/unretained-call-args.mm
Original file line number Diff line number Diff line change
Expand Up @@ -596,6 +596,35 @@ void foo() {

} // namespace sel_string

namespace template_function {

class Base {
public:
virtual ~Base() = default;
void send(dispatch_queue_t) const;
void ref() const;
void deref() const;
};

template<typename Traits>
class Derived : public Base {
public:
virtual ~Derived() = default;

void send(typename Traits::MessageType) const;

virtual OSObjectPtr<dispatch_queue_t> msg(typename Traits::MessageType) const = 0;
};

template<typename Traits>
void Derived<Traits>::send(typename Traits::MessageType messageType) const
{
OSObjectPtr dictionary = msg(messageType);
Base::send(dictionary.get());
}

} // namespace template_function

@interface TestObject : NSObject
- (void)doWork:(NSString *)msg, ...;
- (void)doWorkOnSelf;
Expand Down
Loading