Title: [209361] trunk/Source/_javascript_Core
Revision
209361
Author
[email protected]
Date
2016-12-05 15:27:59 -0800 (Mon, 05 Dec 2016)

Log Message

Moved start and end column linking into helper functions
https://bugs.webkit.org/show_bug.cgi?id=165422

Reviewed by Sam Weinig.

* bytecode/UnlinkedFunctionExecutable.cpp:
(JSC::UnlinkedFunctionExecutable::link):
* bytecode/UnlinkedFunctionExecutable.h:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (209360 => 209361)


--- trunk/Source/_javascript_Core/ChangeLog	2016-12-05 23:27:50 UTC (rev 209360)
+++ trunk/Source/_javascript_Core/ChangeLog	2016-12-05 23:27:59 UTC (rev 209361)
@@ -1,3 +1,14 @@
+2016-12-05  Geoffrey Garen  <[email protected]>
+
+        Moved start and end column linking into helper functions
+        https://bugs.webkit.org/show_bug.cgi?id=165422
+
+        Reviewed by Sam Weinig.
+
+        * bytecode/UnlinkedFunctionExecutable.cpp:
+        (JSC::UnlinkedFunctionExecutable::link):
+        * bytecode/UnlinkedFunctionExecutable.h:
+
 2016-12-05  Mark Lam  <[email protected]>
 
         Fix JSC files so that we can build a release build with NDEBUG #undef'ed.

Modified: trunk/Source/_javascript_Core/bytecode/UnlinkedFunctionExecutable.cpp (209360 => 209361)


--- trunk/Source/_javascript_Core/bytecode/UnlinkedFunctionExecutable.cpp	2016-12-05 23:27:50 UTC (rev 209360)
+++ trunk/Source/_javascript_Core/bytecode/UnlinkedFunctionExecutable.cpp	2016-12-05 23:27:59 UTC (rev 209361)
@@ -138,11 +138,8 @@
     unsigned startOffset = parentSource.startOffset() + m_startOffset;
     unsigned lineCount = m_lineCount;
 
-    // Adjust to one-based indexing.
-    bool startColumnIsOnFirstSourceLine = !m_firstLineOffset;
-    unsigned startColumn = m_unlinkedBodyStartColumn + (startColumnIsOnFirstSourceLine ? parentSource.startColumn() : 1);
-    bool endColumnIsOnStartLine = !lineCount;
-    unsigned endColumn = m_unlinkedBodyEndColumn + (endColumnIsOnStartLine ? startColumn : 1);
+    unsigned startColumn = linkedStartColumn(parentSource.startColumn());
+    unsigned endColumn = linkedEndColumn(startColumn);
 
     SourceCode source(parentSource.provider(), startOffset, startOffset + m_sourceLength, firstLine, startColumn);
     FunctionOverrides::OverrideInfo overrideInfo;

Modified: trunk/Source/_javascript_Core/bytecode/UnlinkedFunctionExecutable.h (209360 => 209361)


--- trunk/Source/_javascript_Core/bytecode/UnlinkedFunctionExecutable.h	2016-12-05 23:27:50 UTC (rev 209360)
+++ trunk/Source/_javascript_Core/bytecode/UnlinkedFunctionExecutable.h	2016-12-05 23:27:59 UTC (rev 209361)
@@ -88,6 +88,9 @@
     ConstructorKind constructorKind() const { return static_cast<ConstructorKind>(m_constructorKind); }
     SuperBinding superBinding() const { return static_cast<SuperBinding>(m_superBinding); }
 
+    unsigned lineCount() const { return m_lineCount; }
+    unsigned linkedStartColumn(unsigned parentStartColumn) const { return m_unlinkedBodyStartColumn + (!m_firstLineOffset ? parentStartColumn : 1); }
+    unsigned linkedEndColumn(unsigned startColumn) const { return m_lineCount ? m_unlinkedBodyEndColumn : startColumn + m_unlinkedBodyEndColumn; }
     unsigned unlinkedFunctionNameStart() const { return m_unlinkedFunctionNameStart; }
     unsigned unlinkedBodyStartColumn() const { return m_unlinkedBodyStartColumn; }
     unsigned unlinkedBodyEndColumn() const { return m_unlinkedBodyEndColumn; }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to