Title: [193506] trunk/Source/_javascript_Core
- Revision
- 193506
- Author
- [email protected]
- Date
- 2015-12-04 18:57:03 -0800 (Fri, 04 Dec 2015)
Log Message
[JSC] Some more cleanup of FTLB3Output
https://bugs.webkit.org/show_bug.cgi?id=151834
Patch by Benjamin Poulain <[email protected]> on 2015-12-04
Reviewed by Filip Pizlo.
* ftl/FTLB3Output.h:
(JSC::FTL::Output::trap):
(JSC::FTL::Output::stackmapIntrinsic): Deleted.
(JSC::FTL::Output::frameAddressIntrinsic): Deleted.
(JSC::FTL::Output::patchpointInt64Intrinsic): Deleted.
(JSC::FTL::Output::patchpointVoidIntrinsic): Deleted.
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::DFG::LowerDFGToLLVM::probe):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (193505 => 193506)
--- trunk/Source/_javascript_Core/ChangeLog 2015-12-05 02:26:38 UTC (rev 193505)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-12-05 02:57:03 UTC (rev 193506)
@@ -1,5 +1,21 @@
2015-12-04 Benjamin Poulain <[email protected]>
+ [JSC] Some more cleanup of FTLB3Output
+ https://bugs.webkit.org/show_bug.cgi?id=151834
+
+ Reviewed by Filip Pizlo.
+
+ * ftl/FTLB3Output.h:
+ (JSC::FTL::Output::trap):
+ (JSC::FTL::Output::stackmapIntrinsic): Deleted.
+ (JSC::FTL::Output::frameAddressIntrinsic): Deleted.
+ (JSC::FTL::Output::patchpointInt64Intrinsic): Deleted.
+ (JSC::FTL::Output::patchpointVoidIntrinsic): Deleted.
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::DFG::LowerDFGToLLVM::probe):
+
+2015-12-04 Benjamin Poulain <[email protected]>
+
[JSC] Fix Value::returnsBool() after r193436
https://bugs.webkit.org/show_bug.cgi?id=151902
Modified: trunk/Source/_javascript_Core/ftl/FTLB3Output.h (193505 => 193506)
--- trunk/Source/_javascript_Core/ftl/FTLB3Output.h 2015-12-05 02:26:38 UTC (rev 193505)
+++ trunk/Source/_javascript_Core/ftl/FTLB3Output.h 2015-12-05 02:57:03 UTC (rev 193506)
@@ -410,7 +410,10 @@
return m_block->appendNew<B3::PatchpointValue>(m_proc, type, origin());
}
- void trap() { CRASH(); }
+ void trap()
+ {
+ m_block->appendNew<B3::ControlValue>(m_proc, B3::Oops, origin());
+ }
ValueFromBlock anchor(LValue value)
{
@@ -418,13 +421,6 @@
return ValueFromBlock(upsilon, m_block);
}
-#pragma mark - Intrinsics
-
- LValue stackmapIntrinsic() { CRASH(); }
- LValue frameAddressIntrinsic() { CRASH(); }
- LValue patchpointInt64Intrinsic() { CRASH(); }
- LValue patchpointVoidIntrinsic() { CRASH(); }
-
#pragma mark - States
B3::Procedure& m_proc;
Modified: trunk/Source/_javascript_Core/ftl/FTLLowerDFGToLLVM.cpp (193505 => 193506)
--- trunk/Source/_javascript_Core/ftl/FTLLowerDFGToLLVM.cpp 2015-12-05 02:26:38 UTC (rev 193505)
+++ trunk/Source/_javascript_Core/ftl/FTLLowerDFGToLLVM.cpp 2015-12-05 02:57:03 UTC (rev 193506)
@@ -9795,9 +9795,13 @@
#if ENABLE(MASM_PROBE)
void probe(std::function<void (CCallHelpers::ProbeContext*)> probeFunc)
{
+#if FTL_USES_B3
+ UNUSED_PARAM(probeFunc);
+#else // !FTL_USES_B3
uint32_t stackmapID = m_stackmapIDs++;
m_ftlState.probes.append(ProbeDescriptor(stackmapID, probeFunc));
m_out.call(m_out.voidType, m_out.stackmapIntrinsic(), m_out.constInt64(stackmapID), m_out.constInt32(sizeOfProbe()));
+#endif // !FTL_USES_B3
}
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
