| Index: Source/wtf/FastMalloc.h
|
| diff --git a/Source/wtf/FastMalloc.h b/Source/wtf/FastMalloc.h
|
| index 7bdeebe8cf68c0e1c767892fe4652759b4cfa01b..c03e05e5e91753595160d81ff8adceeeed27ae2d 100644
|
| --- a/Source/wtf/FastMalloc.h
|
| +++ b/Source/wtf/FastMalloc.h
|
| @@ -51,15 +51,15 @@ namespace WTF {
|
| ~TryMallocReturnValue() { ASSERT(!m_data); }
|
| template <typename T> bool getValue(T& data) WARN_UNUSED_RETURN;
|
| template <typename T> operator PossiblyNull<T>()
|
| - {
|
| - T value;
|
| - getValue(value);
|
| + {
|
| + T value;
|
| + getValue(value);
|
| return PossiblyNull<T>(value);
|
| - }
|
| + }
|
| private:
|
| mutable void* m_data;
|
| };
|
| -
|
| +
|
| template <typename T> bool TryMallocReturnValue::getValue(T& data)
|
| {
|
| union u { void* data; T target; } res;
|
| @@ -77,13 +77,13 @@ namespace WTF {
|
|
|
| WTF_EXPORT void fastFree(void*);
|
|
|
| -#ifndef NDEBUG
|
| +#ifndef NDEBUG
|
| WTF_EXPORT void fastMallocForbid();
|
| WTF_EXPORT void fastMallocAllow();
|
| #endif
|
|
|
| WTF_EXPORT void releaseFastMallocFreeMemory();
|
| -
|
| +
|
| struct FastMallocStatistics {
|
| size_t reservedVMBytes;
|
| size_t committedVMBytes;
|
| @@ -138,7 +138,7 @@ namespace WTF {
|
| // is implemented.
|
|
|
| namespace Internal {
|
| -
|
| +
|
| // Handle a detected alloc/free mismatch. By default this calls CRASH().
|
| void fastMallocMatchFailed(void* p);
|
|
|
| @@ -152,7 +152,7 @@ namespace WTF {
|
| ValidationHeader* header = fastMallocValidationHeader(p);
|
| if (header->m_prefix != static_cast<unsigned>(ValidationPrefix))
|
| fastMallocMatchFailed(p);
|
| -
|
| +
|
| return reinterpret_cast<ValidationTag*>(static_cast<char*>(p) + header->m_size);
|
| }
|
|
|
| @@ -184,7 +184,7 @@ namespace WTF {
|
| {
|
| if (!p)
|
| return;
|
| -
|
| +
|
| Internal::ValidationHeader* header = Internal::fastMallocValidationHeader(p);
|
| if (header->m_prefix != static_cast<unsigned>(Internal::ValidationPrefix))
|
| Internal::fastMallocMatchFailed(p);
|
| @@ -199,11 +199,11 @@ namespace WTF {
|
| {
|
| if (!p)
|
| return;
|
| -
|
| +
|
| Internal::ValidationHeader* header = Internal::fastMallocValidationHeader(p);
|
| if (header->m_prefix != static_cast<unsigned>(Internal::ValidationPrefix))
|
| Internal::fastMallocMatchFailed(p);
|
| -
|
| +
|
| if (*Internal::fastMallocValidationSuffix(p) != Internal::ValidationSuffix)
|
| Internal::fastMallocMatchFailed(p);
|
| }
|
| @@ -234,7 +234,7 @@ using WTF::tryFastMalloc;
|
| using WTF::tryFastRealloc;
|
| using WTF::tryFastZeroedMalloc;
|
|
|
| -#ifndef NDEBUG
|
| +#ifndef NDEBUG
|
| using WTF::fastMallocForbid;
|
| using WTF::fastMallocAllow;
|
| #endif
|
|
|