Title: [120751] trunk/Source/_javascript_Core
- Revision
- 120751
- Author
- [email protected]
- Date
- 2012-06-19 14:06:08 -0700 (Tue, 19 Jun 2012)
Log Message
CodeBlock::needsCallReturnIndices() is no longer needed.
https://bugs.webkit.org/show_bug.cgi?id=89490
Patch by Mark Lam <[email protected]> on 2012-06-19
Reviewed by Geoffrey Garen.
* bytecode/CodeBlock.h:
(JSC::CodeBlock::needsCallReturnIndices): removed.
* dfg/DFGJITCompiler.cpp:
(JSC::DFG::JITCompiler::link):
* jit/JIT.cpp:
(JSC::JIT::privateCompile):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (120750 => 120751)
--- trunk/Source/_javascript_Core/ChangeLog 2012-06-19 21:00:09 UTC (rev 120750)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-06-19 21:06:08 UTC (rev 120751)
@@ -1,3 +1,17 @@
+2012-06-19 Mark Lam <[email protected]>
+
+ CodeBlock::needsCallReturnIndices() is no longer needed.
+ https://bugs.webkit.org/show_bug.cgi?id=89490
+
+ Reviewed by Geoffrey Garen.
+
+ * bytecode/CodeBlock.h:
+ (JSC::CodeBlock::needsCallReturnIndices): removed.
+ * dfg/DFGJITCompiler.cpp:
+ (JSC::DFG::JITCompiler::link):
+ * jit/JIT.cpp:
+ (JSC::JIT::privateCompile):
+
2012-06-19 Filip Pizlo <[email protected]>
Unreviewed, try to fix Windows build.
Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.h (120750 => 120751)
--- trunk/Source/_javascript_Core/bytecode/CodeBlock.h 2012-06-19 21:00:09 UTC (rev 120750)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.h 2012-06-19 21:06:08 UTC (rev 120751)
@@ -719,13 +719,6 @@
}
bool hasExpressionInfo() { return m_rareData && m_rareData->m_expressionInfo.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 true || (m_rareData
- && (m_rareData->m_expressionInfo.size() || m_rareData->m_exceptionHandlers.size()));
- }
#if ENABLE(JIT)
Vector<CallReturnOffsetToBytecodeOffset>& callReturnIndexVector()
Modified: trunk/Source/_javascript_Core/dfg/DFGJITCompiler.cpp (120750 => 120751)
--- trunk/Source/_javascript_Core/dfg/DFGJITCompiler.cpp 2012-06-19 21:00:09 UTC (rev 120750)
+++ trunk/Source/_javascript_Core/dfg/DFGJITCompiler.cpp 2012-06-19 21:06:08 UTC (rev 120751)
@@ -128,16 +128,14 @@
for (unsigned i = 0; i < m_calls.size(); ++i)
linkBuffer.link(m_calls[i].m_call, m_calls[i].m_function);
- if (m_codeBlock->needsCallReturnIndices()) {
- m_codeBlock->callReturnIndexVector().reserveCapacity(m_exceptionChecks.size());
- for (unsigned i = 0; i < m_exceptionChecks.size(); ++i) {
- unsigned returnAddressOffset = linkBuffer.returnAddressOffset(m_exceptionChecks[i].m_call);
- CodeOrigin codeOrigin = m_exceptionChecks[i].m_codeOrigin;
- while (codeOrigin.inlineCallFrame)
- codeOrigin = codeOrigin.inlineCallFrame->caller;
- unsigned exceptionInfo = codeOrigin.bytecodeIndex;
- m_codeBlock->callReturnIndexVector().append(CallReturnOffsetToBytecodeOffset(returnAddressOffset, exceptionInfo));
- }
+ m_codeBlock->callReturnIndexVector().reserveCapacity(m_exceptionChecks.size());
+ for (unsigned i = 0; i < m_exceptionChecks.size(); ++i) {
+ unsigned returnAddressOffset = linkBuffer.returnAddressOffset(m_exceptionChecks[i].m_call);
+ CodeOrigin codeOrigin = m_exceptionChecks[i].m_codeOrigin;
+ while (codeOrigin.inlineCallFrame)
+ codeOrigin = codeOrigin.inlineCallFrame->caller;
+ unsigned exceptionInfo = codeOrigin.bytecodeIndex;
+ m_codeBlock->callReturnIndexVector().append(CallReturnOffsetToBytecodeOffset(returnAddressOffset, exceptionInfo));
}
Vector<CodeOriginAtCallReturnOffset>& codeOrigins = m_codeBlock->codeOrigins();
Modified: trunk/Source/_javascript_Core/jit/JIT.cpp (120750 => 120751)
--- trunk/Source/_javascript_Core/jit/JIT.cpp 2012-06-19 21:00:09 UTC (rev 120750)
+++ trunk/Source/_javascript_Core/jit/JIT.cpp 2012-06-19 21:06:08 UTC (rev 120751)
@@ -718,11 +718,9 @@
patchBuffer.link(iter->from, FunctionPtr(iter->to));
}
- if (m_codeBlock->needsCallReturnIndices()) {
- m_codeBlock->callReturnIndexVector().reserveCapacity(m_calls.size());
- for (Vector<CallRecord>::iterator iter = m_calls.begin(); iter != m_calls.end(); ++iter)
- m_codeBlock->callReturnIndexVector().append(CallReturnOffsetToBytecodeOffset(patchBuffer.returnAddressOffset(iter->from), iter->bytecodeOffset));
- }
+ m_codeBlock->callReturnIndexVector().reserveCapacity(m_calls.size());
+ for (Vector<CallRecord>::iterator iter = m_calls.begin(); iter != m_calls.end(); ++iter)
+ m_codeBlock->callReturnIndexVector().append(CallReturnOffsetToBytecodeOffset(patchBuffer.returnAddressOffset(iter->from), iter->bytecodeOffset));
m_codeBlock->setNumberOfStructureStubInfos(m_propertyAccessCompilationInfo.size());
for (unsigned i = 0; i < m_propertyAccessCompilationInfo.size(); ++i)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
