Changeset 269931 in webkit

Timestamp:

Nov 17, 2020 3:53:49 PM (3 years ago)

Author:

sbarati@apple.com

Message:

Add more info to the RELEASE_ASSERT inside Parser::parseInner
​https://bugs.webkit.org/show_bug.cgi?id=219054
<rdar://problem/71506453>

Reviewed by Mark Lam.

We have some crashes here, and it'll be helpful for the crashlogs to have
more info in the register state.

• parser/Lexer.h:

(JSC::Lexer::codeLength):

• parser/Parser.cpp:

(JSC::Parser<LexerType>::parseInner):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• parser/Lexer.h (modified) (1 diff)
• parser/Parser.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2020-11-17  Saam Barati  <sbarati@apple.com>
+
+        Add more info to the RELEASE_ASSERT inside Parser::parseInner
+        https://bugs.webkit.org/show_bug.cgi?id=219054
+        <rdar://problem/71506453>
+
+        Reviewed by Mark Lam.
+
+        We have some crashes here, and it'll be helpful for the crashlogs to have
+        more info in the register state.
+
+        * parser/Lexer.h:
+        (JSC::Lexer::codeLength):
+        * parser/Parser.cpp:
+        (JSC::Parser<LexerType>::parseInner):
+
 2020-11-17  Sergey Rubanov  <chi187@gmail.com>
 

trunk/Source/JavaScriptCore/parser/Lexer.h

@@ -126 +126 @@
     }
 
+    size_t codeLength() { return m_codeEnd - m_codeStart; }
+
 private:
     void record8(int);

trunk/Source/JavaScriptCore/parser/Parser.cpp

@@ -229 +229 @@
 
         if (SourceParseModeSet(SourceParseMode::ArrowFunctionMode, SourceParseMode::AsyncArrowFunctionMode).contains(parseMode) && !hasError()) {
-            // The only way we could have an error wile reparsing is if we run out of stack space.
-            RELEASE_ASSERT(match(ARROWFUNCTION));
+            // The only way we could have an error while reparsing is if we run out of stack space.
+            RELEASE_ASSERT(match(ARROWFUNCTION), m_token.m_type, static_cast<uint8_t>(parseMode), m_lexer->currentOffset(), m_lexer->codeLength());
             next();
             isArrowFunctionBodyExpression = !match(OPENBRACE);