Title: [158473] trunk/Source
Revision
158473
Author
akl...@apple.com
Date
2013-11-01 18:38:01 -0700 (Fri, 01 Nov 2013)

Log Message

Neuter WTF_MAKE_FAST_ALLOCATED in GLOBAL_FASTMALLOC_NEW builds.
<https://webkit.org/b/123639>

Source/_javascript_Core:

JSC::ParserArenaRefCounted really needed to have the new/delete
operators overridden, in order for JSC::ScopeNode to be able to
choose that "operator new" out of the two it inherits.

Reviewed by Anders Carlsson.

Source/WebCore:

WebCore::TimerBase really needed to have the new/delete operators
overridden, in order for WebCore::SuspendableTimer to be able to
choose that "operator new" out of the two it inherits.

Reviewed by Anders Carlsson.

Source/WTF:

When building with GLOBAL_FASTMALLOC_NEW, we don't need to expand
operator new/delete overrides in every class.

This change makes allocations group up nicely in Instruments,
instead of being split between "WTF::fastMalloc" and "operator new"
depending on whether the class had WTF_MAKE_FAST_ALLOCATED.

Reviewed by Anders Carlsson.

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (158472 => 158473)


--- trunk/Source/_javascript_Core/ChangeLog	2013-11-02 01:23:53 UTC (rev 158472)
+++ trunk/Source/_javascript_Core/ChangeLog	2013-11-02 01:38:01 UTC (rev 158473)
@@ -1,3 +1,14 @@
+2013-11-01  Andreas Kling  <akl...@apple.com>
+
+        Neuter WTF_MAKE_FAST_ALLOCATED in GLOBAL_FASTMALLOC_NEW builds.
+        <https://webkit.org/b/123639>
+
+        JSC::ParserArenaRefCounted really needed to have the new/delete
+        operators overridden, in order for JSC::ScopeNode to be able to
+        choose that "operator new" out of the two it inherits.
+
+        Reviewed by Anders Carlsson.
+
 2013-11-01  Filip Pizlo  <fpi...@apple.com>
 
         OSR exit profiling should be robust against all code being cleared

Modified: trunk/Source/_javascript_Core/parser/Nodes.h (158472 => 158473)


--- trunk/Source/_javascript_Core/parser/Nodes.h	2013-11-02 01:23:53 UTC (rev 158472)
+++ trunk/Source/_javascript_Core/parser/Nodes.h	2013-11-02 01:38:01 UTC (rev 158473)
@@ -112,6 +112,7 @@
     };
 
     class ParserArenaRefCounted : public RefCounted<ParserArenaRefCounted> {
+        WTF_FASTMALLOC_OPERATORS;
     protected:
         ParserArenaRefCounted(VM*);
 

Modified: trunk/Source/WTF/ChangeLog (158472 => 158473)


--- trunk/Source/WTF/ChangeLog	2013-11-02 01:23:53 UTC (rev 158472)
+++ trunk/Source/WTF/ChangeLog	2013-11-02 01:38:01 UTC (rev 158473)
@@ -1,3 +1,17 @@
+2013-11-01  Andreas Kling  <akl...@apple.com>
+
+        Neuter WTF_MAKE_FAST_ALLOCATED in GLOBAL_FASTMALLOC_NEW builds.
+        <https://webkit.org/b/123639>
+
+        When building with GLOBAL_FASTMALLOC_NEW, we don't need to expand
+        operator new/delete overrides in every class.
+
+        This change makes allocations group up nicely in Instruments,
+        instead of being split between "WTF::fastMalloc" and "operator new"
+        depending on whether the class had WTF_MAKE_FAST_ALLOCATED.
+
+        Reviewed by Anders Carlsson.
+
 2013-11-01  Joseph Pecoraro  <pecor...@apple.com>
 
         Move CF/Mac WTF String implementations down into WTF

Modified: trunk/Source/WTF/wtf/FastMalloc.h (158472 => 158473)


--- trunk/Source/WTF/wtf/FastMalloc.h	2013-11-02 01:23:53 UTC (rev 158472)
+++ trunk/Source/WTF/wtf/FastMalloc.h	2013-11-02 01:38:01 UTC (rev 158473)
@@ -278,7 +278,7 @@
 #endif // ENABLE(GLOBAL_FASTMALLOC_NEW)
 #endif // !defined(_CRTDBG_MAP_ALLOC) && !(defined(USE_SYSTEM_MALLOC) && USE_SYSTEM_MALLOC)
 
-#define WTF_MAKE_FAST_ALLOCATED \
+#define WTF_FASTMALLOC_OPERATORS \
 public: \
     void* operator new(size_t, void* p) { return p; } \
     void* operator new[](size_t, void* p) { return p; } \
@@ -316,4 +316,11 @@
 private: \
 typedef int __thisIsHereToForceASemicolonAfterThisMacro
 
+#if ENABLE(GLOBAL_FASTMALLOC_NEW)
+#define WTF_MAKE_FAST_ALLOCATED
+#else
+#define WTF_MAKE_FAST_ALLOCATED WTF_FASTMALLOC_OPERATORS
+#endif
+
+
 #endif /* WTF_FastMalloc_h */

Modified: trunk/Source/WebCore/ChangeLog (158472 => 158473)


--- trunk/Source/WebCore/ChangeLog	2013-11-02 01:23:53 UTC (rev 158472)
+++ trunk/Source/WebCore/ChangeLog	2013-11-02 01:38:01 UTC (rev 158473)
@@ -1,5 +1,16 @@
 2013-11-01  Andreas Kling  <akl...@apple.com>
 
+        Neuter WTF_MAKE_FAST_ALLOCATED in GLOBAL_FASTMALLOC_NEW builds.
+        <https://webkit.org/b/123639>
+
+        WebCore::TimerBase really needed to have the new/delete operators
+        overridden, in order for WebCore::SuspendableTimer to be able to
+        choose that "operator new" out of the two it inherits.
+
+        Reviewed by Anders Carlsson.
+
+2013-11-01  Andreas Kling  <akl...@apple.com>
+
         CSSCanvasValue construction helper should return PassRef.
         <https://webkit.org/b/123650>
 

Modified: trunk/Source/WebCore/platform/Timer.h (158472 => 158473)


--- trunk/Source/WebCore/platform/Timer.h	2013-11-02 01:23:53 UTC (rev 158472)
+++ trunk/Source/WebCore/platform/Timer.h	2013-11-02 01:38:01 UTC (rev 158473)
@@ -37,7 +37,8 @@
 class TimerHeapElement;
 
 class TimerBase {
-    WTF_MAKE_NONCOPYABLE(TimerBase); WTF_MAKE_FAST_ALLOCATED;
+    WTF_MAKE_NONCOPYABLE(TimerBase);
+    WTF_FASTMALLOC_OPERATORS;
 public:
     TimerBase();
     virtual ~TimerBase();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to