<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[180664] branches/safari-600.1.4.15-branch/Source/JavaScriptCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/180664">180664</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-02-25 23:25:05 -0800 (Wed, 25 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge patch for <a href="http://trac.webkit.org/projects/webkit/changeset/180247">r180247</a> and <a href="http://trac.webkit.org/projects/webkit/changeset/180249">r180249</a>. rdar://problem/19711578</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchSourceJavaScriptCoreChangeLog">branches/safari-600.1.4.15-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceJavaScriptCoredfgDFGPlancpp">branches/safari-600.1.4.15-branch/Source/JavaScriptCore/dfg/DFGPlan.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">branches/safari-600.1.4.15-branch/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceJavaScriptCoreftlFTLLowerDFGToLLVMh">branches/safari-600.1.4.15-branch/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001415branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/JavaScriptCore/ChangeLog (180663 => 180664)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/JavaScriptCore/ChangeLog 2015-02-26 07:15:22 UTC (rev 180663)
+++ branches/safari-600.1.4.15-branch/Source/JavaScriptCore/ChangeLog 2015-02-26 07:25:05 UTC (rev 180664)
</span><span class="lines">@@ -1,5 +1,83 @@
</span><span class="cx"> 2015-02-25 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge patch for r180247 and r180249.
+
+ 2015-02-20 Michael Saboff <msaboff@apple.com>
+
+ CrashTracer: DFG_CRASH beneath JSC::FTL::LowerDFGToLLVM::compileNode
+ https://bugs.webkit.org/show_bug.cgi?id=141730
+
+ Reviewed by Geoffrey Garen.
+
+ Added a new failure handler, loweringFailed(), to LowerDFGToLLVM that reports failures
+ while processing DFG lowering. For debug builds, the failures are logged identical
+ to the way the DFG_CRASH() reports them. For release builds, the failures are reported
+ and that FTL compilation is terminated, but the process is allowed to continue.
+ Wrapped calls to loweringFailed() in a macro LOWERING_FAILED so the function and
+ line number are reported at the point of the inconsistancy.
+
+ Converted instances of DFG_CRASH to LOWERING_FAILED.
+
+ * dfg/DFGPlan.cpp:
+ (JSC::DFG::Plan::compileInThreadImpl): Added lowerDFGToLLVM() failure check that
+ will fail the FTL compile.
+
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::LowerDFGToLLVM::LowerDFGToLLVM):
+ Added new member variable, m_loweringSucceeded, to stop compilation on the first
+ reported failure.
+
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::LowerDFGToLLVM::lower):
+ * ftl/FTLLowerDFGToLLVM.h:
+ Added check for compilation failures and now report those failures via a boolean
+ return value.
+
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::LowerDFGToLLVM::createPhiVariables):
+ (JSC::FTL::LowerDFGToLLVM::compileNode):
+ (JSC::FTL::LowerDFGToLLVM::compileUpsilon):
+ (JSC::FTL::LowerDFGToLLVM::compilePhi):
+ (JSC::FTL::LowerDFGToLLVM::compileDoubleRep):
+ (JSC::FTL::LowerDFGToLLVM::compileValueRep):
+ (JSC::FTL::LowerDFGToLLVM::compileValueToInt32):
+ (JSC::FTL::LowerDFGToLLVM::compilePutLocal):
+ (JSC::FTL::LowerDFGToLLVM::compileArithAddOrSub):
+ (JSC::FTL::LowerDFGToLLVM::compileArithMul):
+ (JSC::FTL::LowerDFGToLLVM::compileArithDiv):
+ (JSC::FTL::LowerDFGToLLVM::compileArithMod):
+ (JSC::FTL::LowerDFGToLLVM::compileArithMinOrMax):
+ (JSC::FTL::LowerDFGToLLVM::compileArithAbs):
+ (JSC::FTL::LowerDFGToLLVM::compileArithNegate):
+ (JSC::FTL::LowerDFGToLLVM::compileArrayifyToStructure):
+ (JSC::FTL::LowerDFGToLLVM::compileGetById):
+ (JSC::FTL::LowerDFGToLLVM::compileGetMyArgumentByVal):
+ (JSC::FTL::LowerDFGToLLVM::compileGetArrayLength):
+ (JSC::FTL::LowerDFGToLLVM::compileGetByVal):
+ (JSC::FTL::LowerDFGToLLVM::compilePutByVal):
+ (JSC::FTL::LowerDFGToLLVM::compileArrayPush):
+ (JSC::FTL::LowerDFGToLLVM::compileArrayPop):
+ (JSC::FTL::LowerDFGToLLVM::compileNewArray):
+ (JSC::FTL::LowerDFGToLLVM::compileToString):
+ (JSC::FTL::LowerDFGToLLVM::compileMakeRope):
+ (JSC::FTL::LowerDFGToLLVM::compileCompareEq):
+ (JSC::FTL::LowerDFGToLLVM::compileCompareStrictEq):
+ (JSC::FTL::LowerDFGToLLVM::compileSwitch):
+ (JSC::FTL::LowerDFGToLLVM::compare):
+ (JSC::FTL::LowerDFGToLLVM::boolify):
+ (JSC::FTL::LowerDFGToLLVM::opposite):
+ (JSC::FTL::LowerDFGToLLVM::lowJSValue):
+ (JSC::FTL::LowerDFGToLLVM::speculate):
+ (JSC::FTL::LowerDFGToLLVM::isArrayType):
+ (JSC::FTL::LowerDFGToLLVM::exitValueForAvailability):
+ (JSC::FTL::LowerDFGToLLVM::exitValueForNode):
+ (JSC::FTL::LowerDFGToLLVM::setInt52):
+ Changed DFG_CRASH() to LOWERING_FAILED(). Updated related control flow as appropriate.
+
+ (JSC::FTL::LowerDFGToLLVM::loweringFailed): New error reporting member function.
+
+2015-02-25 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r180516.
</span><span class="cx">
</span><span class="cx"> 2015-02-23 Matthew Mirman <mmirman@apple.com>
</span></span></pre></div>
<a id="branchessafari6001415branchSourceJavaScriptCoredfgDFGPlancpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/JavaScriptCore/dfg/DFGPlan.cpp (180663 => 180664)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/JavaScriptCore/dfg/DFGPlan.cpp 2015-02-26 07:15:22 UTC (rev 180663)
+++ branches/safari-600.1.4.15-branch/Source/JavaScriptCore/dfg/DFGPlan.cpp 2015-02-26 07:25:05 UTC (rev 180664)
</span><span class="lines">@@ -348,7 +348,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FTL::State state(dfg);
</span><del>- FTL::lowerDFGToLLVM(state);
</del><ins>+ if (!FTL::lowerDFGToLLVM(state)) {
+ FTL::fail(state);
+ return FTLPath;
+ }
</ins><span class="cx">
</span><span class="cx"> if (reportCompileTimes())
</span><span class="cx"> beforeFTL = currentTimeMS();
</span></span></pre></div>
<a id="branchessafari6001415branchSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (180663 => 180664)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-02-26 07:15:22 UTC (rev 180663)
+++ branches/safari-600.1.4.15-branch/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-02-26 07:25:05 UTC (rev 180664)
</span><span class="lines">@@ -68,6 +68,7 @@
</span><span class="cx"> LowerDFGToLLVM(State& state)
</span><span class="cx"> : m_graph(state.graph)
</span><span class="cx"> , m_ftlState(state)
</span><ins>+ , m_loweringSucceeded(true)
</ins><span class="cx"> , m_heaps(state.context)
</span><span class="cx"> , m_out(state.context)
</span><span class="cx"> , m_availability(OperandsLike, state.graph.block(0)->variablesAtHead)
</span><span class="lines">@@ -76,8 +77,12 @@
</span><span class="cx"> , m_stackmapIDs(0)
</span><span class="cx"> {
</span><span class="cx"> }
</span><del>-
- void lower()
</del><ins>+
+
+#define LOWERING_FAILED(node, reason) \
+ loweringFailed((node), __FILE__, __LINE__, WTF_PRETTY_FUNCTION, (reason));
+
+ bool lower()
</ins><span class="cx"> {
</span><span class="cx"> CString name;
</span><span class="cx"> if (verboseCompilationEnabled()) {
</span><span class="lines">@@ -157,10 +162,16 @@
</span><span class="cx"> m_out.constInt32(MacroAssembler::maxJumpReplacementSize()));
</span><span class="cx"> m_out.unreachable();
</span><span class="cx">
</span><ins>+ if (!m_loweringSucceeded)
+ return m_loweringSucceeded;
+
</ins><span class="cx"> Vector<BasicBlock*> depthFirst;
</span><span class="cx"> m_graph.getBlocksInDepthFirstOrder(depthFirst);
</span><del>- for (unsigned i = 0; i < depthFirst.size(); ++i)
</del><ins>+ for (unsigned i = 0; i < depthFirst.size(); ++i) {
</ins><span class="cx"> compileBlock(depthFirst[i]);
</span><ins>+ if (!m_loweringSucceeded)
+ return m_loweringSucceeded;
+ }
</ins><span class="cx">
</span><span class="cx"> if (Options::dumpLLVMIR())
</span><span class="cx"> dumpModule(m_ftlState.module);
</span><span class="lines">@@ -169,6 +180,8 @@
</span><span class="cx"> m_ftlState.dumpState("after lowering");
</span><span class="cx"> if (validationEnabled())
</span><span class="cx"> verifyModule(m_ftlState.module);
</span><ins>+
+ return m_loweringSucceeded;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -201,8 +214,8 @@
</span><span class="cx"> type = m_out.int64;
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- RELEASE_ASSERT_NOT_REACHED();
- break;
</del><ins>+ LOWERING_FAILED(node, "Bad Phi node result type");
+ return;
</ins><span class="cx"> }
</span><span class="cx"> m_phis.add(node, buildAlloca(m_out.m_builder, type));
</span><span class="cx"> }
</span><span class="lines">@@ -631,15 +644,13 @@
</span><span class="cx"> case AllocationProfileWatchpoint:
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- dataLog("Unrecognized node in FTL backend:\n");
- m_graph.dump(WTF::dataFile(), " ", m_node);
- dataLog("\n");
- dataLog("Full graph dump:\n");
- m_graph.dump();
- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ LOWERING_FAILED(m_node, "Unrecognized node in FTL backend");
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (!m_loweringSucceeded)
+ return false;
+
</ins><span class="cx"> if (shouldExecuteEffects)
</span><span class="cx"> m_interpreter.executeEffects(nodeIndex);
</span><span class="cx">
</span><span class="lines">@@ -670,7 +681,7 @@
</span><span class="cx"> m_out.set(lowJSValue(m_node->child1()), destination);
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ LOWERING_FAILED(m_node, "Bad use kind");
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -696,7 +707,7 @@
</span><span class="cx"> setJSValue(m_out.get(source));
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ LOWERING_FAILED(m_node, "Bad use kind");
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -739,7 +750,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ LOWERING_FAILED(m_node, "Bad use kind");
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -764,7 +775,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ LOWERING_FAILED(m_node, "Bad use kind");
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -788,7 +799,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ LOWERING_FAILED(m_node, "Bad use kind");
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -827,7 +838,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ LOWERING_FAILED(m_node, "Bad use kind");
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -860,7 +871,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ LOWERING_FAILED(m_node, "Bad flush format");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -890,7 +901,7 @@
</span><span class="cx"> setJSValue(jsValue);
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ LOWERING_FAILED(m_node, "Bad use kind");
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -961,8 +972,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- RELEASE_ASSERT_NOT_REACHED();
- break;
</del><ins>+ LOWERING_FAILED(m_node, "Bad flush format for argument");
+ return;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_availability.operand(variable->local()) = Availability(variable->flushedAt());
</span><span class="lines">@@ -1137,7 +1148,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ LOWERING_FAILED(m_node, "Bad use kind");
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1211,7 +1222,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ LOWERING_FAILED(m_node, "Bad use kind");
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1314,7 +1325,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ LOWERING_FAILED(m_node, "Bad use kind");
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1412,7 +1423,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ LOWERING_FAILED(m_node, "Bad use kind");
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1463,7 +1474,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ LOWERING_FAILED(m_node, "Bad use kind");
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1489,7 +1500,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ LOWERING_FAILED(m_node, "Bad use kind");
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1556,7 +1567,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ LOWERING_FAILED(m_node, "Bad use kind");
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1722,8 +1733,8 @@
</span><span class="cx"> vmCall(m_out.operation(operationEnsureArrayStorage), m_callFrame, cell);
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- RELEASE_ASSERT_NOT_REACHED();
- break;
</del><ins>+ LOWERING_FAILED(m_node, "Bad array type");
+ return;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> structureID = m_out.load32(cell, m_heaps.JSCell_structureID);
</span><span class="lines">@@ -1796,7 +1807,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ LOWERING_FAILED(m_node, "Bad use kind");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1948,7 +1959,8 @@
</span><span class="cx"> // FIXME: FTL should support activations.
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=129576
</span><span class="cx">
</span><del>- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ LOWERING_FAILED(m_node, "Unimplemented");
+ return;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TypedPointer base;
</span><span class="lines">@@ -1985,7 +1997,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ LOWERING_FAILED(m_node, "Bad array type");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2135,7 +2147,8 @@
</span><span class="cx"> result = m_out.load32(pointer);
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ LOWERING_FAILED(m_node, "Bad element size");
+ return;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (elementSize(type) < 4) {
</span><span class="lines">@@ -2179,14 +2192,15 @@
</span><span class="cx"> result = m_out.loadDouble(pointer);
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ LOWERING_FAILED(m_node, "Bad typed array type");
+ return;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> setDouble(result);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ LOWERING_FAILED(m_node, "Bad array type");
</ins><span class="cx"> return;
</span><span class="cx"> } }
</span><span class="cx"> }
</span><span class="lines">@@ -2292,7 +2306,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ LOWERING_FAILED(m_node, "Bad array type");
+ return;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_out.jump(continuation);
</span><span class="lines">@@ -2385,7 +2400,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ LOWERING_FAILED(m_node, "Bad use kind");
+ return;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch (elementSize(type)) {
</span><span class="lines">@@ -2402,7 +2418,8 @@
</span><span class="cx"> refType = m_out.ref32;
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ LOWERING_FAILED(m_node, "Bad element size");
+ return;
</ins><span class="cx"> }
</span><span class="cx"> } else /* !isInt(type) */ {
</span><span class="cx"> LValue value = lowDouble(child3);
</span><span class="lines">@@ -2416,7 +2433,8 @@
</span><span class="cx"> refType = m_out.refDouble;
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ LOWERING_FAILED(m_node, "Bad typed array type");
+ return;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2440,8 +2458,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RELEASE_ASSERT_NOT_REACHED();
- break;
</del><ins>+ LOWERING_FAILED(m_node, "Bad array type");
+ return;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2512,7 +2530,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ LOWERING_FAILED(m_node, "Bad array type");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2570,7 +2588,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ LOWERING_FAILED(m_node, "Bad array type");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2929,8 +2947,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- RELEASE_ASSERT_NOT_REACHED();
- break;
</del><ins>+ LOWERING_FAILED(m_node, "Bad use kind");
+ return;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3021,7 +3039,8 @@
</span><span class="cx"> m_out.operation(operationMakeRope3), m_callFrame, kids[0], kids[1], kids[2]));
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ LOWERING_FAILED(m_node, "Bad number of children");
+ return;
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> m_out.jump(continuation);
</span><span class="lines">@@ -3426,8 +3445,8 @@
</span><span class="cx"> nonSpeculativeCompare(LLVMIntEQ, operationCompareEq);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-
- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+
+ LOWERING_FAILED(m_node, "Bad use kinds");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void compileCompareEqConstant()
</span><span class="lines">@@ -3520,7 +3539,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ LOWERING_FAILED(m_node, "Bad use kinds");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void compileCompareStrictEqConstant()
</span><span class="lines">@@ -3656,8 +3675,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- RELEASE_ASSERT_NOT_REACHED();
- break;
</del><ins>+ LOWERING_FAILED(m_node, "Bad use kind");
+ return;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_out.appendTo(switchOnInts, lastNext);
</span><span class="lines">@@ -3702,8 +3721,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- RELEASE_ASSERT_NOT_REACHED();
- break;
</del><ins>+ LOWERING_FAILED(m_node, "Bad use kind");
+ return;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LBasicBlock lengthIs1 = FTL_NEW_BLOCK(m_out, ("Switch/SwitchChar length is 1"));
</span><span class="lines">@@ -3755,11 +3774,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> case SwitchString:
</span><del>- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ LOWERING_FAILED(m_node, "Unimplemented");
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ LOWERING_FAILED(m_node, "Bad switch kind");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void compileReturn()
</span><span class="lines">@@ -4216,7 +4235,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ LOWERING_FAILED(m_node, "Bad use kinds");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void compareEqObjectOrOtherToObject(Edge leftChild, Edge rightChild)
</span><span class="lines">@@ -4495,7 +4514,7 @@
</span><span class="cx"> return m_out.phi(m_out.boolean, fastResult, slowResult);
</span><span class="cx"> }
</span><span class="cx"> default:
</span><del>- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ LOWERING_FAILED(m_node, "Bad use kind");
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -4868,7 +4887,7 @@
</span><span class="cx"> case StrictInt52:
</span><span class="cx"> return Int52;
</span><span class="cx"> }
</span><del>- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ LOWERING_FAILED(m_node, "Bad use kind");
</ins><span class="cx"> return Int52;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5013,7 +5032,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ LOWERING_FAILED(m_node, "Corrupt array class");
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5325,8 +5344,8 @@
</span><span class="cx"> speculateMisc(edge);
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- dataLog("Unsupported speculation use kind: ", edge.useKind(), "\n");
- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ LOWERING_FAILED(m_node, "Unsupported speculation use kind");
+ return;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5387,7 +5406,7 @@
</span><span class="cx">
</span><span class="cx"> switch (arrayMode.arrayClass()) {
</span><span class="cx"> case Array::OriginalArray:
</span><del>- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ LOWERING_FAILED(m_node, "Unexpected original array");
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> case Array::Array:
</span><span class="lines">@@ -5407,7 +5426,8 @@
</span><span class="cx"> m_out.constInt8(arrayMode.shapeMask()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ LOWERING_FAILED(m_node, "Corrupt array class");
+ return 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><span class="lines">@@ -6043,7 +6063,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ LOWERING_FAILED(m_node, "Corrupt int52 kind");
</ins><span class="cx"> }
</span><span class="cx"> void setJSValue(Node* node, LValue value)
</span><span class="cx"> {
</span><span class="lines">@@ -6170,11 +6190,24 @@
</span><span class="cx"> return addressFor(operand, TagOffset);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ NO_RETURN_DUE_TO_ASSERT void loweringFailed(Node* node, const char* file, int line, const char* function, const char* assertion)
+ {
+ if (!ASSERT_DISABLED) {
+ dataLog("FTL ASSERTION FAILED: ", assertion, "\n");
+ dataLog(file, "(", line, ") : ", function, "\n");
+ dataLog("While handling node ", node, "\n");
+ RELEASE_ASSERT_NOT_REACHED();
+ }
+
+ m_loweringSucceeded = false;
+ }
+
</ins><span class="cx"> VM& vm() { return m_graph.m_vm; }
</span><span class="cx"> CodeBlock* codeBlock() { return m_graph.m_codeBlock; }
</span><span class="cx">
</span><span class="cx"> Graph& m_graph;
</span><span class="cx"> State& m_ftlState;
</span><ins>+ bool m_loweringSucceeded;
</ins><span class="cx"> AbstractHeapRepository m_heaps;
</span><span class="cx"> Output m_out;
</span><span class="cx">
</span><span class="lines">@@ -6215,10 +6248,10 @@
</span><span class="cx"> uint32_t m_stackmapIDs;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-void lowerDFGToLLVM(State& state)
</del><ins>+bool lowerDFGToLLVM(State& state)
</ins><span class="cx"> {
</span><span class="cx"> LowerDFGToLLVM lowering(state);
</span><del>- lowering.lower();
</del><ins>+ return lowering.lower();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } } // namespace JSC::FTL
</span></span></pre></div>
<a id="branchessafari6001415branchSourceJavaScriptCoreftlFTLLowerDFGToLLVMh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.h (180663 => 180664)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.h 2015-02-26 07:15:22 UTC (rev 180663)
+++ branches/safari-600.1.4.15-branch/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.h 2015-02-26 07:25:05 UTC (rev 180664)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC { namespace FTL {
</span><span class="cx">
</span><del>-void lowerDFGToLLVM(State&);
</del><ins>+bool lowerDFGToLLVM(State&);
</ins><span class="cx">
</span><span class="cx"> } } // namespace JSC::FTL
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>