Skip to content

Revert "[alpha.webkit.UncountedCallArgsChecker] Ignore methods of WTF String classes." #90701

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 1, 2024
Merged

Revert "[alpha.webkit.UncountedCallArgsChecker] Ignore methods of WTF String classes." #90701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 3 additions & 10 deletions clang/lib/StaticAnalyzer/Checkers/WebKit/UncountedCallArgsChecker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,17 +227,10 @@ class UncountedCallArgsChecker
return NamespaceName == "WTF" &&
(MethodName == "find" || MethodName == "findIf" ||
MethodName == "reverseFind" || MethodName == "reverseFindIf" ||
MethodName == "findIgnoringASCIICase" || MethodName == "get" ||
MethodName == "inlineGet" || MethodName == "contains" ||
MethodName == "containsIf" ||
MethodName == "containsIgnoringASCIICase" ||
MethodName == "startsWith" || MethodName == "endsWith" ||
MethodName == "startsWithIgnoringASCIICase" ||
MethodName == "endsWithIgnoringASCIICase" ||
MethodName == "substring") &&
MethodName == "get" || MethodName == "inlineGet" ||
MethodName == "contains" || MethodName == "containsIf") &&
(ClsName.ends_with("Vector") || ClsName.ends_with("Set") ||
ClsName.ends_with("Map") || ClsName == "StringImpl" ||
ClsName.ends_with("String"));
ClsName.ends_with("Map"));
}

void reportBug(const Expr *CallArg, const ParmVarDecl *Param) const {
Expand Down
118 changes: 0 additions & 118 deletions clang/test/Analysis/Checkers/WebKit/call-args-wtf-containers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,92 +4,6 @@

namespace WTF {

constexpr unsigned long notFound = static_cast<unsigned long>(-1);

class String;
class StringImpl;

class StringView {
public:
StringView(const String&);
private:
RefPtr<StringImpl> m_impl;
};

class StringImpl {
public:
void ref() const { ++m_refCount; }
void deref() const {
if (!--m_refCount)
delete this;
}

static constexpr unsigned s_flagIs8Bit = 1u << 0;
bool is8Bit() const { return m_hashAndFlags & s_flagIs8Bit; }
const char* characters8() const { return m_char8; }
const short* characters16() const { return m_char16; }
unsigned length() const { return m_length; }
Ref<StringImpl> substring(unsigned position, unsigned length) const;

unsigned long find(char) const;
unsigned long find(StringView) const;
unsigned long contains(StringView) const;
unsigned long findIgnoringASCIICase(StringView) const;

bool startsWith(StringView) const;
bool startsWithIgnoringASCIICase(StringView) const;
bool endsWith(StringView) const;
bool endsWithIgnoringASCIICase(StringView) const;

private:
mutable unsigned m_refCount { 0 };
unsigned m_length { 0 };
union {
const char* m_char8;
const short* m_char16;
};
unsigned m_hashAndFlags { 0 };
};

class String {
public:
String() = default;
String(StringImpl& impl) : m_impl(&impl) { }
String(StringImpl* impl) : m_impl(impl) { }
String(Ref<StringImpl>&& impl) : m_impl(impl.get()) { }
StringImpl* impl() { return m_impl.get(); }
unsigned length() const { return m_impl ? m_impl->length() : 0; }
const char* characters8() const { return m_impl ? m_impl->characters8() : nullptr; }
const short* characters16() const { return m_impl ? m_impl->characters16() : nullptr; }

bool is8Bit() const { return !m_impl || m_impl->is8Bit(); }

unsigned long find(char character) const { return m_impl ? m_impl->find(character) : notFound; }
unsigned long find(StringView str) const { return m_impl ? m_impl->find(str) : notFound; }
unsigned long findIgnoringASCIICase(StringView) const;

bool contains(char character) const { return find(character) != notFound; }
bool contains(StringView) const;
bool containsIgnoringASCIICase(StringView) const;

bool startsWith(StringView) const;
bool startsWithIgnoringASCIICase(StringView) const;
bool endsWith(StringView) const;
bool endsWithIgnoringASCIICase(StringView) const;

String substring(unsigned position, unsigned length) const
{
if (!m_impl)
return { };
if (!position && length >= m_impl->length())
return *this;
return m_impl->substring(position, length);
}

private:
RefPtr<StringImpl> m_impl;
};

template <typename T>
class HashSet {
public:
Expand Down Expand Up @@ -175,9 +89,6 @@ namespace WTF {

}

using WTF::StringView;
using WTF::StringImpl;
using WTF::String;
using WTF::HashSet;
using WTF::HashMap;
using WTF::WeakHashSet;
Expand All @@ -190,37 +101,8 @@ class RefCounted {
};

RefCounted* object();
StringImpl* strImpl();
String* str();
StringView strView();

void test() {
strImpl()->is8Bit();
strImpl()->characters8();
strImpl()->characters16();
strImpl()->length();
strImpl()->substring(2, 4);
strImpl()->find(strView());
strImpl()->contains(strView());
strImpl()->findIgnoringASCIICase(strView());
strImpl()->startsWith(strView());
strImpl()->startsWithIgnoringASCIICase(strView());
strImpl()->endsWith(strView());
strImpl()->endsWithIgnoringASCIICase(strView());

str()->is8Bit();
str()->characters8();
str()->characters16();
str()->length();
str()->substring(2, 4);
str()->find(strView());
str()->contains(strView());
str()->findIgnoringASCIICase(strView());
str()->startsWith(strView());
str()->startsWithIgnoringASCIICase(strView());
str()->endsWith(strView());
str()->endsWithIgnoringASCIICase(strView());

HashSet<RefPtr<RefCounted>> set;
set.find(*object());
set.contains(*object());
Expand Down
2 changes: 1 addition & 1 deletion clang/test/Analysis/Checkers/WebKit/mock-types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ template <typename T> struct RefPtr {
const T *operator->() const { return t; }
T &operator*() { return *t; }
RefPtr &operator=(T *) { return *this; }
operator bool() const { return t; }
operator bool() { return t; }
};

template <typename T> bool operator==(const RefPtr<T> &, const RefPtr<T> &) {
Expand Down