[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

ggaren at apple.com ggaren at apple.com
Wed Dec 22 13:37:13 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 737b74252b2696bd6c9f9a0b3295154c47331b49
Author: ggaren at apple.com <ggaren at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 21 18:43:09 2010 +0000

    2010-09-21  Geoffrey Garen  <ggaren at apple.com>
    
            Reviewed by Oliver Hunt.
    
            <rdar://problem/8363003> REGRESSION: ~1.4% sunspider regression in
            interpreter due to 54724 and 54596
    
            Fixed a typo (using "UNLIKELY" instead of "LIKELY").
    
            * wtf/PassRefPtr.h:
            (WTF::refIfNotNull):
            (WTF::derefIfNotNull): It is likely that m_ptr != 0 because most RefPtrs
            hold real data. Also, in cases where they do not hold real data, the
            compiler usually sees a call to release() right before the call to the
            destructor, so it can probably optimize out the test completely.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67972 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 649233c..69e27ac 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-09-21  Geoffrey Garen  <ggaren at apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        <rdar://problem/8363003> REGRESSION: ~1.4% sunspider regression in
+        interpreter due to 54724 and 54596
+        
+        Fixed a typo (using "UNLIKELY" instead of "LIKELY").
+        
+        * wtf/PassRefPtr.h:
+        (WTF::refIfNotNull):
+        (WTF::derefIfNotNull): It is likely that m_ptr != 0 because most RefPtrs
+        hold real data. Also, in cases where they do not hold real data, the
+        compiler usually sees a call to release() right before the call to the
+        destructor, so it can probably optimize out the test completely.
+
 2010-09-21  Fridrich Strba  <fridrich.strba at bluewin.ch>
 
         Reviewed by Martin Robinson.
diff --git a/JavaScriptCore/wtf/PassRefPtr.h b/JavaScriptCore/wtf/PassRefPtr.h
index b43c5ba..052d6e2 100644
--- a/JavaScriptCore/wtf/PassRefPtr.h
+++ b/JavaScriptCore/wtf/PassRefPtr.h
@@ -48,13 +48,13 @@ namespace WTF {
 
     template<typename T> REF_DEREF_INLINE void refIfNotNull(T* ptr)
     {
-        if (UNLIKELY(ptr != 0))
+        if (LIKELY(ptr != 0))
             ptr->ref();
     }
 
     template<typename T> REF_DEREF_INLINE void derefIfNotNull(T* ptr)
     {
-        if (UNLIKELY(ptr != 0))
+        if (LIKELY(ptr != 0))
             ptr->deref();
     }
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list