[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

xan at webkit.org xan at webkit.org
Fri Jan 21 15:17:38 UTC 2011


The following commit has been merged in the debian/experimental branch:
commit 4a2d85ba10ea7fc6106b370e940b1ffdbb6da3d5
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 10 21:21:19 2011 +0000

    2011-01-10  Xan Lopez  <xlopez at igalia.com>
    
            Reviewed by Gavin Barraclough.
    
            Remove unused isString() case in JSString::toPrimitiveString()
            https://bugs.webkit.org/show_bug.cgi?id=52167
    
            We never call toPrimitiveString() with strings, so remove the
            check and add an ASSERT ensuring this never happens. 0.7% overall
            progression in sunspider, since one of the call sites is very hot.
    
            * runtime/JSString.h:
            (JSC::JSValue::toPrimitiveString):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75427 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 6986b71..6804f7a 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,17 @@
+2011-01-10  Xan Lopez  <xlopez at igalia.com>
+
+        Reviewed by Gavin Barraclough.
+
+        Remove unused isString() case in JSString::toPrimitiveString()
+        https://bugs.webkit.org/show_bug.cgi?id=52167
+
+        We never call toPrimitiveString() with strings, so remove the
+        check and add an ASSERT ensuring this never happens. 0.7% overall
+        progression in sunspider, since one of the call sites is very hot.
+
+        * runtime/JSString.h:
+        (JSC::JSValue::toPrimitiveString):
+
 2011-01-10  Peter Varga  <pvarga at inf.u-szeged.hu>
 
         Reviewed by Gavin Barraclough.
diff --git a/Source/JavaScriptCore/runtime/JSString.h b/Source/JavaScriptCore/runtime/JSString.h
index fefffde..be9f882 100644
--- a/Source/JavaScriptCore/runtime/JSString.h
+++ b/Source/JavaScriptCore/runtime/JSString.h
@@ -624,8 +624,7 @@ namespace JSC {
 
     inline UString JSValue::toPrimitiveString(ExecState* exec) const
     {
-        if (isString())
-            return static_cast<JSString*>(asCell())->value(exec);
+        ASSERT(!isString());
         if (isInt32())
             return exec->globalData().numericStrings.add(asInt32());
         if (isDouble())

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list