Changeset 60738 in webkit for trunk/JavaScriptCore/wtf/Vector.h

Timestamp:

Jun 4, 2010, 11:25:50 PM (15 years ago)

Author:

[email protected]

Message:

2010-06-04 Adam Barth <​[email protected]>

Reviewed by Darin Adler.

HTML5 parser should be within 1% of old parser performance
​https://bugs.webkit.org/show_bug.cgi?id=40172

Fix cast in this operator= to allow for assignment between vectors with
different inline capacities (as clearly intended by its author).

• wtf/Vector.h: (WTF::::operator):

2010-06-04 Adam Barth <​[email protected]>

Reviewed by Darin Adler.

HTML5 parser should be within 1% of old parser performance
​https://bugs.webkit.org/show_bug.cgi?id=40172

Stop using adopt(). I think this function is cause us to do extra
mallocs that are hurting performance. Instead of caching AtomicString
on HTML5Token, just use the AtomicString on the old token. Also,
reserve inline capacity for 10 attributes.

• html/HTML5Lexer.cpp: (WebCore::HTML5Lexer::isAppropriateEndTag):
• html/HTML5Lexer.h:
• html/HTML5Token.h: (WebCore::HTML5Token::beginStartTag): (WebCore::HTML5Token::beginEndTag): (WebCore::HTML5Token::beginCharacter): (WebCore::HTML5Token::beginComment): (WebCore::HTML5Token::beginDOCTYPE): (WebCore::HTML5Token::name): (WebCore::HTML5Token::characters): (WebCore::HTML5Token::comment):
• html/HTML5TreeBuilder.cpp: (WebCore::convertToOldStyle): (WebCore::HTML5TreeBuilder::passTokenToLegacyParser):

File:

• trunk/JavaScriptCore/wtf/Vector.h (modified) (1 diff)

trunk/JavaScriptCore/wtf/Vector.h

@@ -700 +700 @@
     }
 
+    inline bool typelessPointersAreEqual(const void* a, const void* b) { return a == b; }
+
     template<typename T, size_t inlineCapacity>
     template<size_t otherCapacity> 
     Vector<T, inlineCapacity>& Vector<T, inlineCapacity>::operator=(const Vector<T, otherCapacity>& other)
     {
-        if (&other == this)
-            return *this;
-        
+        // If the inline capacities match, we should call the more specific
+        // template.  If the inline capacities don't match, the two objects
+        // shouldn't be allocated the same address.
+        ASSERT(!typelessPointersAreEqual(&other, this));
+
         if (size() > other.size())
             shrink(other.size());