Changeset 153071 in webkit

Timestamp:

Jul 23, 2013 5:41:46 PM (11 years ago)

Author:

mark.lam@apple.com

Message:

Removed unused sourceOffset from JSTokenLocation.
​https://bugs.webkit.org/show_bug.cgi?id=118996.

Reviewed by Geoffrey Garen.

This also removes the assertion reported in the bug because it is now
moot, thereby resolving the assertion failure issue on Windows.

• bytecompiler/NodesCodegen.cpp:

(JSC::ArrayNode::toArgumentList):
(JSC::ApplyFunctionCallDotNode::emitBytecode):

• parser/Lexer.cpp:

(JSC::::lex):

• parser/Lexer.h:

(JSC::::lexExpectIdentifier):

• parser/Nodes.h:
• parser/Parser.cpp:

(JSC::::Parser):
(JSC::::parseFunctionInfo):
(JSC::::parseExpressionOrLabelStatement):
(JSC::::parseMemberExpression):

• parser/Parser.h:

(JSC::::parse):

• parser/ParserTokens.h:

(JSC::JSTokenLocation::JSTokenLocation):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bytecompiler/NodesCodegen.cpp (modified) (3 diffs)
• parser/Lexer.cpp (modified) (1 diff)
• parser/Lexer.h (modified) (1 diff)
• parser/Nodes.h (modified) (1 diff)
• parser/Parser.cpp (modified) (4 diffs)
• parser/Parser.h (modified) (1 diff)
• parser/ParserTokens.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-07-23  Mark Lam  <mark.lam@apple.com>
+
+        Removed unused sourceOffset from JSTokenLocation.
+        https://bugs.webkit.org/show_bug.cgi?id=118996.
+
+        Reviewed by Geoffrey Garen.
+
+        This also removes the assertion reported in the bug because it is now
+        moot, thereby resolving the assertion failure issue on Windows.
+
+        * bytecompiler/NodesCodegen.cpp:
+        (JSC::ArrayNode::toArgumentList):
+        (JSC::ApplyFunctionCallDotNode::emitBytecode):
+        * parser/Lexer.cpp:
+        (JSC::::lex):
+        * parser/Lexer.h:
+        (JSC::::lexExpectIdentifier):
+        * parser/Nodes.h:
+        * parser/Parser.cpp:
+        (JSC::::Parser):
+        (JSC::::parseFunctionInfo):
+        (JSC::::parseExpressionOrLabelStatement):
+        (JSC::::parseMemberExpression):
+        * parser/Parser.h:
+        (JSC::::parse):
+        * parser/ParserTokens.h:
+        (JSC::JSTokenLocation::JSTokenLocation):
+
 2013-07-22  Alex Christensen  <achristensen@apple.com>
 

trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp

@@ -203 +203 @@
 }
 
-ArgumentListNode* ArrayNode::toArgumentList(VM* vm, int lineNumber, int startPosition, unsigned sourceOffset) const
+ArgumentListNode* ArrayNode::toArgumentList(VM* vm, int lineNumber, int startPosition) const
 {
     ASSERT(!m_elision && !m_optional);
@@ -209 +209 @@
     if (!ptr)
         return 0;
-    JSTokenLocation location(sourceOffset);
+    JSTokenLocation location;
     location.line = lineNumber;
     location.startOffset = startPosition;
-    location.sourceOffset = sourceOffset;
     ArgumentListNode* head = new (vm) ArgumentListNode(location, ptr->value());
     ArgumentListNode* tail = head;
@@ -550 +549 @@
                     ASSERT(m_args->m_listNode->m_next->m_expr->isSimpleArray());
                     ASSERT(!m_args->m_listNode->m_next->m_next);
-                    m_args->m_listNode = static_cast<ArrayNode*>(m_args->m_listNode->m_next->m_expr)->toArgumentList(generator.vm(), 0, 0, 0);
+                    m_args->m_listNode = static_cast<ArrayNode*>(m_args->m_listNode->m_next->m_expr)->toArgumentList(generator.vm(), 0, 0);
                     RefPtr<RegisterID> realFunction = generator.emitMove(generator.tempDestination(dst), base.get());
                     CallArguments callArguments(generator, m_args);

trunk/Source/JavaScriptCore/parser/Lexer.cpp

@@ -1324 +1324 @@
     
     tokenLocation->startOffset = currentOffset();
-    tokenLocation->sourceOffset = m_sourceOffset;
     ASSERT(currentOffset() >= currentLineStartOffset());
 

trunk/Source/JavaScriptCore/parser/Lexer.h

@@ -371 +371 @@
     tokenLocation->startOffset = offsetFromSourcePtr(start);
     tokenLocation->endOffset = currentOffset();
-    tokenLocation->sourceOffset = m_sourceOffset;
     ASSERT(tokenLocation->startOffset >= tokenLocation->lineStartOffset);
     m_lastToken = IDENT;

trunk/Source/JavaScriptCore/parser/Nodes.h

@@ -457 +457 @@
         ArrayNode(const JSTokenLocation&, int elision, ElementNode*);
 
-        ArgumentListNode* toArgumentList(VM*, int, int, unsigned) const;
+        ArgumentListNode* toArgumentList(VM*, int, int) const;
 
     private:

trunk/Source/JavaScriptCore/parser/Parser.cpp

@@ -83 +83 @@
     m_arena = m_vm->parserArena.get();
     m_lexer->setCode(source, m_arena);
-    m_token.m_location.sourceOffset = source.startOffset();
     m_token.m_location.endOffset = source.startOffset();
     m_token.m_location.lineStartOffset = source.startOffset();
@@ -862 +861 @@
         // If we're in a strict context, the cached function info must say it was strict too.
         ASSERT(!strictMode() || cachedInfo->strictMode);
-        JSTokenLocation endLocation(m_source->startOffset());
+        JSTokenLocation endLocation;
 
         endLocation.line = cachedInfo->closeBraceLine;
@@ -967 +966 @@
      */
     Vector<LabelInfo> labels;
-    JSTokenLocation location(m_source->startOffset());
+    JSTokenLocation location;
     do {
         int start = tokenStart();
@@ -1635 +1634 @@
     int expressionLineStart = tokenLineStart();
     int newCount = 0;
-    JSTokenLocation location(m_source->startOffset());
+    JSTokenLocation location;
     while (match(NEW)) {
         next();

trunk/Source/JavaScriptCore/parser/Parser.h

@@ -1037 +1037 @@
     RefPtr<ParsedNode> result;
     if (m_sourceElements) {
-        JSTokenLocation endLocation(m_source->startOffset());
+        JSTokenLocation endLocation;
         endLocation.line = m_lexer->lastLineNumber();
         endLocation.lineStartOffset = m_lexer->currentLineStartOffset();

trunk/Source/JavaScriptCore/parser/ParserTokens.h

@@ -162 +162 @@
 
 struct JSTokenLocation {
-    JSTokenLocation(unsigned _sourceOffset = UINT_MAX) : line(0), lineStartOffset(0), startOffset(0), sourceOffset(_sourceOffset) { }
+    JSTokenLocation() : line(0), lineStartOffset(0), startOffset(0) { }
     JSTokenLocation(const JSTokenLocation& location)
     {
@@ -169 +169 @@
         startOffset = location.startOffset;
         endOffset = location.endOffset;
-        sourceOffset = location.sourceOffset;
-        ASSERT(sourceOffset != UINT_MAX);
     }
-
-    ALWAYS_INLINE unsigned lineStartPosition() const { ASSERT(sourceOffset != UINT_MAX); return lineStartOffset - sourceOffset; }
-    ALWAYS_INLINE unsigned startPosition() const { ASSERT(sourceOffset != UINT_MAX); return startOffset - sourceOffset; }
-    ALWAYS_INLINE unsigned endPosition() const { ASSERT(sourceOffset != UINT_MAX); return endOffset - sourceOffset; }
 
     int line;
@@ -181 +175 @@
     unsigned startOffset;
     unsigned endOffset;
-    unsigned sourceOffset;
 };