Changeset 141916 in webkit

Timestamp:

Feb 5, 2013 12:43:27 PM (11 years ago)

Author:

mhahnenberg@apple.com

Message:

Structure::m_outOfLineCapacity is unnecessary
​https://bugs.webkit.org/show_bug.cgi?id=108206

Reviewed by Darin Adler.

Simplifying the utility functions that we use since we don't need a
bunch of fancy templates for this one specific call site.

Source/JavaScriptCore:

• runtime/Structure.h:

(JSC::Structure::outOfLineCapacity):

Source/WTF:

• wtf/MathExtras.h:

(WTF::roundUpToPowerOfTwo):

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/runtime/Structure.h (modified) (1 diff)
• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/MathExtras.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-02-04  Mark Hahnenberg  <mhahnenberg@apple.com>
+
+        Structure::m_outOfLineCapacity is unnecessary
+        https://bugs.webkit.org/show_bug.cgi?id=108206
+
+        Reviewed by Darin Adler.
+
+        Simplifying the utility functions that we use since we don't need a 
+        bunch of fancy templates for this one specific call site.
+
+        * runtime/Structure.h:
+        (JSC::Structure::outOfLineCapacity):
+
 2013-02-05  Mark Hahnenberg  <mhahnenberg@apple.com>
 

trunk/Source/JavaScriptCore/runtime/Structure.h

@@ -197 +197 @@
 
             ASSERT(outOfLineSize > initialOutOfLineCapacity);
-            return WTF::roundUpToPowerOf<outOfLineGrowthFactor>(outOfLineSize);
+            COMPILE_ASSERT(outOfLineGrowthFactor == 2, outOfLineGrowthFactor_is_two);
+            return WTF::roundUpToPowerOfTwo(outOfLineSize);
         }
         unsigned outOfLineSize() const

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2013-02-04  Mark Hahnenberg  <mhahnenberg@apple.com>
+
+        Structure::m_outOfLineCapacity is unnecessary
+        https://bugs.webkit.org/show_bug.cgi?id=108206
+
+        Reviewed by Darin Adler.
+
+        Simplifying the utility functions that we use since we don't need a 
+        bunch of fancy templates for this one specific call site.
+
+        * wtf/MathExtras.h:
+        (WTF::roundUpToPowerOfTwo):
+
 2013-02-05  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WTF/wtf/MathExtras.h

@@ -432 +432 @@
 namespace WTF {
 
-// Be careful, this might be super slow in a hot loop.
-template<size_t exponent> inline size_t roundUpToPowerOf(size_t v)
-{
-    return round(pow(static_cast<double>(exponent), ceil(log(static_cast<double>(v)) / log(static_cast<double>(exponent)))));
-}
-
 // From http://graphics.stanford.edu/~seander/bithacks.html#RoundUpPowerOf2
-template<> inline size_t roundUpToPowerOf<2>(size_t v)
+inline uint32_t roundUpToPowerOfTwo(uint32_t v)
 {
     v--;
@@ -447 +441 @@
     v |= v >> 8;
     v |= v >> 16;
-#if defined(__LP64__) && __LP64__
-    v |= v >> 32;
-#endif
     v++;
     return v;