Changeset 46180 in webkit for trunk/JavaScriptCore/wtf/FastMalloc.h

Timestamp:

Jul 21, 2009, 11:13:11 AM (16 years ago)

Author:

Adam Roben

Message:

Roll out r46153, r46154, and r46155

These changes were causing build failures and assertion failures on
Windows.

JavaScriptCore:

• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore_debug.def:
• JavaScriptCore.xcodeproj/project.pbxproj:
• runtime/JSArray.cpp:
• runtime/StringPrototype.cpp:
• runtime/UString.cpp:
• runtime/UString.h:
• wtf/FastMalloc.cpp:
• wtf/FastMalloc.h:
• wtf/Platform.h:
• wtf/PossiblyNull.h: Removed.

WebCore:

• ForwardingHeaders/wtf/PossiblyNull.h: Removed.
• platform/graphics/cg/ImageBufferCG.cpp:

File:

• trunk/JavaScriptCore/wtf/FastMalloc.h (modified) (2 diffs)

trunk/JavaScriptCore/wtf/FastMalloc.h

@@ -23 +23 @@
 
 #include "Platform.h"
-#include "PossiblyNull.h"
 #include <stdlib.h>
 #include <new>
@@ -35 +34 @@
     void* fastRealloc(void* p, size_t n);
 
-    struct TryMallocReturnValue {
-        TryMallocReturnValue(void* data)
-            : m_data(data)
-        {
-        }
-        ~TryMallocReturnValue() { ASSERT(!m_data); }
-        template <typename T> bool getValue(T& data) WARN_UNUSED_RETURN;
-        template <typename T> operator PossiblyNull<T>()
-        { 
-            T value; 
-            getValue(value); 
-            return PossiblyNull<T>(value);
-        } 
-    private:
-        void* m_data;
-    };
-    
-    template <typename T> bool TryMallocReturnValue::getValue(T& data) {
-        union u { void* data; T target; } res;
-        res.data = m_data;
-        data = res.target;
-        bool returnValue = !!m_data;
-        m_data = 0;
-        return returnValue;
-    }
-
     // These functions return NULL if an allocation fails.
-    TryMallocReturnValue tryFastMalloc(size_t n);
-    TryMallocReturnValue tryFastZeroedMalloc(size_t n);
-    TryMallocReturnValue tryFastCalloc(size_t n_elements, size_t element_size);
-    TryMallocReturnValue tryFastRealloc(void* p, size_t n);
+    void* tryFastMalloc(size_t n);
+    void* tryFastZeroedMalloc(size_t n);
+    void* tryFastCalloc(size_t n_elements, size_t element_size);
+    void* tryFastRealloc(void* p, size_t n);
 
     void fastFree(void* p);