Changeset 208815 in webkit

Timestamp:

Nov 16, 2016 2:53:48 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

REGRESSION (r207162): [debug] loader/stateobjects LayoutTests timing out
​https://bugs.webkit.org/show_bug.cgi?id=163307

Patch by Alex Christensen <​achristensen@webkit.org> on 2016-11-16
Reviewed by Alexey Proskuryakov.

Source/WebCore:

• platform/URLParser.cpp:

Removed some unnecessary and redundant assertions in iterators, which are inside inner loops.
(WebCore::URLParser::parsedDataView):
(WebCore::URLParser::parse):
Add a parsedDataView that just returns a UChar instead of a StringView for 1-length views.
This speeds up debug builds considerably, which spent most of the time parsing the path
making and destroying these 1-length StringViews. It can't hurt release builds.

• platform/URLParser.h:

LayoutTests:

• platform/ios-simulator/TestExpectations:
• platform/mac/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/ios-simulator/TestExpectations (modified) (1 diff)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/URLParser.cpp (modified) (7 diffs)
• Source/WebCore/platform/URLParser.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-11-16  Alex Christensen  <achristensen@webkit.org>
+
+        REGRESSION (r207162): [debug] loader/stateobjects LayoutTests timing out
+        https://bugs.webkit.org/show_bug.cgi?id=163307
+
+        Reviewed by Alexey Proskuryakov.
+
+        * platform/ios-simulator/TestExpectations:
+        * platform/mac/TestExpectations:
+
 2016-11-16  Alex Christensen  <achristensen@webkit.org>
 

trunk/LayoutTests/platform/ios-simulator/TestExpectations

@@ -2727 +2727 @@
 webkit.org/b/163291 media/video-play-require-user-gesture.html
 
-webkit.org/b/163307 [ Debug ] loader/stateobjects/pushstate-size-iframe.html [ Skip ]
-webkit.org/b/163307 [ Debug ] loader/stateobjects/pushstate-size.html [ Skip ]
-webkit.org/b/163307 [ Debug ] loader/stateobjects/replacestate-size-iframe.html [ Skip ]
-webkit.org/b/163307 [ Debug ] loader/stateobjects/replacestate-size.html [ Skip ]
-
 webkit.org/b/163755 imported/w3c/csswg-test/css-shapes-1 [ Skip ]
 

trunk/LayoutTests/platform/mac/TestExpectations

@@ -1443 +1443 @@
 webkit.org/b/116621 fast/replaced/preferred-widths.html [ Pass Failure ]
 
-webkit.org/b/163307 [ Debug ] loader/stateobjects/pushstate-size-iframe.html [ Skip ]
-webkit.org/b/163307 [ Debug ] loader/stateobjects/pushstate-size.html [ Skip ]
-webkit.org/b/163307 [ Debug ] loader/stateobjects/replacestate-size-iframe.html [ Skip ]
-webkit.org/b/163307 [ Debug ] loader/stateobjects/replacestate-size.html [ Skip ]
-
 webkit.org/b/164088 [ Yosemite ] media/modern-media-controls/scrubber-support/scrubber-support-click.html [ Skip ]
 webkit.org/b/164088 [ Yosemite ] media/modern-media-controls/scrubber-support/scrubber-support-drag.html [ Skip ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-11-16  Alex Christensen  <achristensen@webkit.org>
+
+        REGRESSION (r207162): [debug] loader/stateobjects LayoutTests timing out
+        https://bugs.webkit.org/show_bug.cgi?id=163307
+
+        Reviewed by Alexey Proskuryakov.
+
+        * platform/URLParser.cpp:
+        Removed some unnecessary and redundant assertions in iterators, which are inside inner loops.
+        (WebCore::URLParser::parsedDataView):
+        (WebCore::URLParser::parse):
+        Add a parsedDataView that just returns a UChar instead of a StringView for 1-length views.
+        This speeds up debug builds considerably, which spent most of the time parsing the path
+        making and destroying these 1-length StringViews.  It can't hurt release builds.
+        * platform/URLParser.h:
+
 2016-11-16  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/platform/URLParser.cpp

@@ -108 +108 @@
 ALWAYS_INLINE auto CodePointIterator<LChar>::operator++() -> CodePointIterator&
 {
-    ASSERT(!atEnd());
     m_begin++;
     return *this;
@@ -125 +124 @@
 ALWAYS_INLINE auto CodePointIterator<UChar>::operator++() -> CodePointIterator&
 {
-    ASSERT(!atEnd());
     unsigned i = 0;
     size_t length = m_end - m_begin;
@@ -1069 +1067 @@
 }
 
+ALWAYS_INLINE UChar URLParser::parsedDataView(size_t position)
+{
+    if (UNLIKELY(m_didSeeSyntaxViolation))
+        return m_asciiBuffer[position];
+    return m_inputString[position];
+}
+
 template<typename CharacterType>
 ALWAYS_INLINE size_t URLParser::currentPosition(const CodePointIterator<CharacterType>& iterator)
@@ -1313 +1318 @@
                 authorityOrHostBegin = c;
             } else {
-                ASSERT(parsedDataView(currentPosition(c) - 1, 1) == "/");
+                ASSERT(parsedDataView(currentPosition(c) - 1) == '/');
                 m_url.m_userStart = currentPosition(c) - 1;
                 m_url.m_userEnd = m_url.m_userStart;
@@ -1601 +1606 @@
                     }
                     if (windowsQuirk || authorityOrHostBegin == c) {
-                        ASSERT(windowsQuirk || parsedDataView(currentPosition(c) - 1, 1) == "/");
+                        ASSERT(windowsQuirk || parsedDataView(currentPosition(c) - 1) == '/');
                         if (UNLIKELY(*c == '?')) {
                             syntaxViolation(c);
@@ -1664 +1669 @@
                 break;
             }
-            if (UNLIKELY(currentPosition(c) && parsedDataView(currentPosition(c) - 1, 1) == "/")) {
+            if (UNLIKELY(currentPosition(c) && parsedDataView(currentPosition(c) - 1) == '/')) {
                 if (UNLIKELY(isDoubleDotPathSegment(c))) {
                     syntaxViolation(c);
@@ -1785 +1790 @@
         ASSERT(m_url.m_userStart);
         ASSERT(m_url.m_userStart == currentPosition(c));
-        ASSERT(parsedDataView(currentPosition(c) - 1, 1) == "/");
+        ASSERT(parsedDataView(currentPosition(c) - 1) == '/');
         m_url.m_userStart--;
         m_url.m_userEnd = m_url.m_userStart;

trunk/Source/WebCore/platform/URLParser.h

@@ -103 +103 @@
     void copyASCIIStringUntil(const String&, size_t length);
     StringView parsedDataView(size_t start, size_t length);
+    UChar parsedDataView(size_t position);
 
     using IPv4Address = uint32_t;