Changeset 191145 in webkit for trunk/Source/JavaScriptCore/parser/Lexer.cpp

Timestamp:

Oct 15, 2015, 4:02:43 PM (10 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r191135.
​https://bugs.webkit.org/show_bug.cgi?id=150197

This patch causes 50+ LayoutTest crashes related to the
inspector (Requested by ryanhaddad on #webkit).

Reverted changeset:

"Web Inspector: JavaScriptCore should parse sourceURL and
sourceMappingURL directives"
​https://bugs.webkit.org/show_bug.cgi?id=150096
​http://trac.webkit.org/changeset/191135

File:

• trunk/Source/JavaScriptCore/parser/Lexer.cpp (modified) (7 diffs)

trunk/Source/JavaScriptCore/parser/Lexer.cpp

@@ -26 +26 @@
 #include "Lexer.h"
 
+#include "JSFunctionInlines.h"
+
 #include "BuiltinNames.h"
+#include "JSGlobalObjectFunctions.h"
 #include "Identifier.h"
+#include "Nodes.h"
 #include "JSCInlines.h"
-#include "JSFunctionInlines.h"
-#include "JSGlobalObjectFunctions.h"
-#include "KeywordLookup.h"
-#include "Lexer.lut.h"
-#include "Nodes.h"
-#include "Parser.h"
+#include <wtf/dtoa.h>
 #include <ctype.h>
 #include <limits.h>
 #include <string.h>
 #include <wtf/Assertions.h>
-#include <wtf/dtoa.h>
+
+#include "KeywordLookup.h"
+#include "Lexer.lut.h"
+#include "Parser.h"
 
 namespace JSC {
@@ -564 +566 @@
     m_lineStart = m_code;
     m_lexErrorMessage = String();
-    m_sourceURL = String();
-    m_sourceMappingURL = String();
     
     m_buffer8.reserveInitialCapacity(initialReadBufferCapacity);
@@ -687 +687 @@
 {
     return m_lastToken == CONTINUE || m_lastToken == BREAK || m_lastToken == RETURN || m_lastToken == THROW;
-}
-
-template <typename T>
-ALWAYS_INLINE void Lexer<T>::skipWhitespace()
-{
-    while (isWhiteSpace(m_current))
-        shift();
 }
 
@@ -1713 +1706 @@
 
 template <typename T>
-ALWAYS_INLINE void Lexer<T>::parseCommentDirective()
-{
-    // sourceURL and sourceMappingURL directives.
-    if (!consume("source"))
-        return;
-
-    if (consume("URL=")) {
-        if (!m_sourceURL.isEmpty())
-            return;
-        m_sourceURL = parseCommentDirectiveValue();
-        return;
-    }
-
-    if (consume("MappingURL=")) {
-        if (!m_sourceMappingURL.isEmpty())
-            return;
-        m_sourceMappingURL = parseCommentDirectiveValue();
-        return;
-    }
-}
-
-template <typename T>
-ALWAYS_INLINE String Lexer<T>::parseCommentDirectiveValue()
-{
-    skipWhitespace();
-    const T* stringStart = currentSourcePtr();
-    while (!isWhiteSpace(m_current) && !isLineTerminator(m_current) && m_current != '"' && m_current != '\'' && !atEnd())
-        shift();
-    const T* stringEnd = currentSourcePtr();
-    skipWhitespace();
-
-    if (!isLineTerminator(m_current) && !atEnd())
-        return String();
-
-    append8(stringStart, stringEnd - stringStart);
-    return String(m_buffer8.data(), m_buffer8.size());
-}
-
-template <typename T>
-template <unsigned length>
-ALWAYS_INLINE bool Lexer<T>::consume(const char (&input)[length])
-{
-    unsigned lengthToCheck = length - 1; // Ignore the ending NUL byte in the string literal.
-
-    unsigned i = 0;
-    for (; i < lengthToCheck && m_current == input[i]; i++)
-        shift();
-
-    return i == lengthToCheck;
-}
-
-template <typename T>
 bool Lexer<T>::nextTokenIsColon()
 {
@@ -1799 +1740 @@
 
 start:
-    skipWhitespace();
+    while (isWhiteSpace(m_current))
+        shift();
 
     if (atEnd())
@@ -1957 +1899 @@
         if (m_current == '/') {
             shift();
-            goto inSingleLineCommentCheckForDirectives;
+            goto inSingleLineComment;
         }
         if (m_current == '*') {
@@ -2262 +2204 @@
     goto returnToken;
 
-inSingleLineCommentCheckForDirectives:
-    // Script comment directives like "//# sourceURL=test.js".
-    if (UNLIKELY((m_current == '#' || m_current == '@') && isWhiteSpace(peek(1)))) {
-        shift();
-        shift();
-        parseCommentDirective();
-    }
-    // Fall through to complete single line comment parsing.
-
 inSingleLineComment:
     while (!isLineTerminator(m_current)) {