Changeset 120676 in webkit for trunk/Source/JavaScriptCore/bytecode/CodeBlock.h

Timestamp:

Jun 18, 2012, 11:07:28 PM (13 years ago)

Author:

[email protected]

Message:

Source/JavaScriptCore: Changed JSC to always record line number information so that error.stack
and window.onerror() can report proper line numbers.
​https://bugs.webkit.org/show_bug.cgi?id=89410

Patch by Mark Lam <​[email protected]> on 2012-06-18
Reviewed by Geoffrey Garen.

• bytecode/CodeBlock.cpp:

(JSC::CodeBlock::CodeBlock):
(JSC::CodeBlock::lineNumberForBytecodeOffset):
(JSC::CodeBlock::shrinkToFit): m_lineInfo is now available unconditionally.

• bytecode/CodeBlock.h:

(JSC::CodeBlock::addLineInfo):
(JSC::CodeBlock::hasLineInfo): Unused. Now removed.
(JSC::CodeBlock::needsCallReturnIndices):
(CodeBlock):
(RareData): Hoisted m_lineInfo out of m_rareData. m_lineInfo is now
filled in unconditionally.

• bytecompiler/BytecodeGenerator.h:

(JSC::BytecodeGenerator::addLineInfo):

LayoutTests: Ensure that error.stack and window.onerror always have the appropriate
line numbers of the exception being thrown.
​https://bugs.webkit.org/show_bug.cgi?id=89410

Patch by Mark Lam <​[email protected]> on 2012-06-18
Reviewed by Geoffrey Garen.

• fast/js/exception-line-number-expected.txt: Added.
• fast/js/exception-line-number.html: Added.
• fast/js/script-tests/exception-line-number.js: Added.

(foo):
(window.onerror):

File:

• trunk/Source/JavaScriptCore/bytecode/CodeBlock.h (modified) (4 diffs)

trunk/Source/JavaScriptCore/bytecode/CodeBlock.h

@@ -712 +712 @@
         void addLineInfo(unsigned bytecodeOffset, int lineNo)
         {
-            createRareDataIfNecessary();
-            Vector<LineInfo>& lineInfo = m_rareData->m_lineInfo;
+            Vector<LineInfo>& lineInfo = m_lineInfo;
             if (!lineInfo.size() || lineInfo.last().lineNumber != lineNo) {
                 LineInfo info = { bytecodeOffset, lineNo };
@@ -721 +720 @@
 
         bool hasExpressionInfo() { return m_rareData && m_rareData->m_expressionInfo.size(); }
-        bool hasLineInfo() { return m_rareData && m_rareData->m_lineInfo.size(); }
         //  We only generate exception handling info if the user is debugging
         // (and may want line number info), or if the function contains exception handler.
         bool needsCallReturnIndices()
         {
-            return m_rareData &&
-                (m_rareData->m_expressionInfo.size() || m_rareData->m_lineInfo.size() || m_rareData->m_exceptionHandlers.size());
+            return true || (m_rareData
+                && (m_rareData->m_expressionInfo.size() || m_rareData->m_exceptionHandlers.size()));
         }
 
@@ -1312 +1310 @@
         uint16_t m_optimizationDelayCounter;
         uint16_t m_reoptimizationRetryCounter;
-        
+
+        Vector<LineInfo> m_lineInfo;
+
         struct RareData {
            WTF_MAKE_FAST_ALLOCATED;
@@ -1334 +1334 @@
             Vector<ExpressionRangeInfo> m_expressionInfo;
             // Line info - present if profiling or debugging.
-            Vector<LineInfo> m_lineInfo;
 #if ENABLE(JIT)
             Vector<CallReturnOffsetToBytecodeOffset> m_callReturnIndexVector;