Modified: trunk/Source/_javascript_Core/ChangeLog (157660 => 157661)
--- trunk/Source/_javascript_Core/ChangeLog 2013-10-19 02:20:14 UTC (rev 157660)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-10-19 02:37:19 UTC (rev 157661)
@@ -1,5 +1,13 @@
2013-10-18 Filip Pizlo <[email protected]>
+ Unreviewed, fix FTL build.
+
+ * ftl/FTLIntrinsicRepository.h:
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::LowerDFGToLLVM::compileGetById):
+
+2013-10-18 Filip Pizlo <[email protected]>
+
A CodeBlock's StructureStubInfos shouldn't be in a Vector that we search using code origins and machine code PCs
https://bugs.webkit.org/show_bug.cgi?id=122940
Modified: trunk/Source/_javascript_Core/ftl/FTLIntrinsicRepository.h (157660 => 157661)
--- trunk/Source/_javascript_Core/ftl/FTLIntrinsicRepository.h 2013-10-19 02:20:14 UTC (rev 157660)
+++ trunk/Source/_javascript_Core/ftl/FTLIntrinsicRepository.h 2013-10-19 02:37:19 UTC (rev 157661)
@@ -51,7 +51,7 @@
#define FOR_EACH_FUNCTION_TYPE(macro) \
macro(I_JITOperation_EJss, functionType(intPtr, intPtr, intPtr)) \
macro(J_JITOperation_E, functionType(int64, intPtr)) \
- macro(J_JITOperation_EJI, functionType(int64, intPtr, int64, intPtr)) \
+ macro(J_JITOperation_ESsiJI, functionType(int64, intPtr, intPtr, int64, intPtr)) \
macro(P_JITOperation_EC, functionType(intPtr, intPtr, intPtr)) \
macro(V_JITOperation_EOZD, functionType(voidType, intPtr, intPtr, int32, doubleType)) \
macro(V_JITOperation_EOZJ, functionType(voidType, intPtr, intPtr, int32, int64)) \
Modified: trunk/Source/_javascript_Core/ftl/FTLLowerDFGToLLVM.cpp (157660 => 157661)
--- trunk/Source/_javascript_Core/ftl/FTLLowerDFGToLLVM.cpp 2013-10-19 02:20:14 UTC (rev 157660)
+++ trunk/Source/_javascript_Core/ftl/FTLLowerDFGToLLVM.cpp 2013-10-19 02:37:19 UTC (rev 157661)
@@ -1237,7 +1237,7 @@
}
StringImpl* uid = m_graph.identifiers()[m_node->identifierNumber()];
- setJSValue(vmCall(m_out.operation(operationGetById), m_callFrame, base, m_out.constIntPtr(uid)));
+ setJSValue(vmCall(m_out.operation(operationGetById), m_callFrame, m_out.intPtrZero, base, m_out.constIntPtr(uid)));
}
void compileGetButterfly()
