<!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>[180317] trunk/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/180317">180317</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2015-02-18 15:52:16 -0800 (Wed, 18 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rollout <a href="http://trac.webkit.org/projects/webkit/changeset/180247">r180247</a> & <a href="http://trac.webkit.org/projects/webkit/changeset/180249">r180249</a> from trunk
https://bugs.webkit.org/show_bug.cgi?id=141773
Reviewed by Filip Pizlo.
Theses changes makes sense to fix the crash reported in https://bugs.webkit.org/show_bug.cgi?id=141730
only for branches. The change to fail the FTL compile but continue running is not comprehensive
enough for general use on trunk.
* dfg/DFGPlan.cpp:
(JSC::DFG::Plan::compileInThreadImpl):
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::LowerDFGToLLVM::LowerDFGToLLVM):
(JSC::FTL::LowerDFGToLLVM::lower):
(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):
(JSC::FTL::lowerDFGToLLVM):
(JSC::FTL::LowerDFGToLLVM::loweringFailed): Deleted.
* ftl/FTLLowerDFGToLLVM.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGPlancpp">trunk/Source/JavaScriptCore/dfg/DFGPlan.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMh">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (180316 => 180317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-02-18 23:50:12 UTC (rev 180316)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-02-18 23:52:16 UTC (rev 180317)
</span><span class="lines">@@ -1,3 +1,61 @@
</span><ins>+2015-02-18 Michael Saboff <msaboff@apple.com>
+
+ Rollout r180247 & r180249 from trunk
+ https://bugs.webkit.org/show_bug.cgi?id=141773
+
+ Reviewed by Filip Pizlo.
+
+ Theses changes makes sense to fix the crash reported in https://bugs.webkit.org/show_bug.cgi?id=141730
+ only for branches. The change to fail the FTL compile but continue running is not comprehensive
+ enough for general use on trunk.
+
+ * dfg/DFGPlan.cpp:
+ (JSC::DFG::Plan::compileInThreadImpl):
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::LowerDFGToLLVM::LowerDFGToLLVM):
+ (JSC::FTL::LowerDFGToLLVM::lower):
+ (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):
+ (JSC::FTL::lowerDFGToLLVM):
+ (JSC::FTL::LowerDFGToLLVM::loweringFailed): Deleted.
+ * ftl/FTLLowerDFGToLLVM.h:
+
</ins><span class="cx"> 2015-02-18 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> DFG should really support varargs
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGPlancpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGPlan.cpp (180316 => 180317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGPlan.cpp 2015-02-18 23:50:12 UTC (rev 180316)
+++ trunk/Source/JavaScriptCore/dfg/DFGPlan.cpp 2015-02-18 23:52:16 UTC (rev 180317)
</span><span class="lines">@@ -386,10 +386,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FTL::State state(dfg);
</span><del>- if (!FTL::lowerDFGToLLVM(state)) {
- FTL::fail(state);
- return FTLPath;
- }
</del><ins>+ FTL::lowerDFGToLLVM(state);
</ins><span class="cx">
</span><span class="cx"> if (reportCompileTimes())
</span><span class="cx"> m_timeBeforeFTL = monotonicallyIncreasingTime();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (180316 => 180317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-02-18 23:50:12 UTC (rev 180316)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-02-18 23:52:16 UTC (rev 180317)
</span><span class="lines">@@ -93,7 +93,6 @@
</span><span class="cx"> LowerDFGToLLVM(State& state)
</span><span class="cx"> : m_graph(state.graph)
</span><span class="cx"> , m_ftlState(state)
</span><del>- , m_loweringSucceeded(true)
</del><span class="cx"> , m_heaps(state.context)
</span><span class="cx"> , m_out(state.context)
</span><span class="cx"> , m_state(state.graph)
</span><span class="lines">@@ -103,12 +102,8 @@
</span><span class="cx"> , m_tbaaStructKind(mdKindID(state.context, "tbaa.struct"))
</span><span class="cx"> {
</span><span class="cx"> }
</span><del>-
-
-#define LOWERING_FAILED(node, reason) \
- loweringFailed((node), __FILE__, __LINE__, WTF_PRETTY_FUNCTION, (reason));
-
- bool lower()
</del><ins>+
+ void lower()
</ins><span class="cx"> {
</span><span class="cx"> CString name;
</span><span class="cx"> if (verboseCompilationEnabled()) {
</span><span class="lines">@@ -280,22 +275,14 @@
</span><span class="cx"> case FlushedJSValue:
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- LOWERING_FAILED(node, "Bad flush format for argument");
</del><ins>+ DFG_CRASH(m_graph, node, "Bad flush format for argument");
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
- if (!m_loweringSucceeded)
- return m_loweringSucceeded;
-
</del><span class="cx"> m_out.jump(lowBlock(m_graph.block(0)));
</span><span class="cx">
</span><del>- for (BasicBlock* block : preOrder) {
</del><ins>+ for (BasicBlock* block : preOrder)
</ins><span class="cx"> compileBlock(block);
</span><del>-
- if (!m_loweringSucceeded)
- return m_loweringSucceeded;
- }
</del><span class="cx">
</span><span class="cx"> if (Options::dumpLLVMIR())
</span><span class="cx"> dumpModule(m_ftlState.module);
</span><span class="lines">@@ -304,8 +291,6 @@
</span><span class="cx"> m_ftlState.dumpState("after lowering");
</span><span class="cx"> if (validationEnabled())
</span><span class="cx"> verifyModule(m_ftlState.module);
</span><del>-
- return m_loweringSucceeded;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -338,8 +323,8 @@
</span><span class="cx"> type = m_out.int64;
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- LOWERING_FAILED(node, "Bad Phi node result type");
- return;
</del><ins>+ DFG_CRASH(m_graph, node, "Bad Phi node result type");
+ break;
</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">@@ -843,13 +828,10 @@
</span><span class="cx"> case KillLocal:
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- LOWERING_FAILED(m_node, "Unrecognized node in FTL backend");
</del><ins>+ DFG_CRASH(m_graph, m_node, "Unrecognized node in FTL backend");
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!m_loweringSucceeded)
- return false;
-
</del><span class="cx"> if (!m_state.isValid()) {
</span><span class="cx"> safelyInvalidateAfterTermination();
</span><span class="cx"> return false;
</span><span class="lines">@@ -885,7 +867,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>- LOWERING_FAILED(m_node, "Bad use kind");
</del><ins>+ DFG_CRASH(m_graph, m_node, "Bad use kind");
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -911,7 +893,7 @@
</span><span class="cx"> setJSValue(m_out.get(source));
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- LOWERING_FAILED(m_node, "Bad use kind");
</del><ins>+ DFG_CRASH(m_graph, m_node, "Bad use kind");
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -949,7 +931,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- LOWERING_FAILED(m_node, "Bad use kind");
</del><ins>+ DFG_CRASH(m_graph, m_node, "Bad use kind");
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -974,7 +956,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- LOWERING_FAILED(m_node, "Bad use kind");
</del><ins>+ DFG_CRASH(m_graph, m_node, "Bad use kind");
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1037,7 +1019,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- LOWERING_FAILED(m_node, "Bad use kind");
</del><ins>+ DFG_CRASH(m_graph, m_node, "Bad use kind");
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1144,7 +1126,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- LOWERING_FAILED(m_node, "Bad flush format");
</del><ins>+ DFG_CRASH(m_graph, m_node, "Bad flush format");
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1304,7 +1286,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- LOWERING_FAILED(m_node, "Bad use kind");
</del><ins>+ DFG_CRASH(m_graph, m_node, "Bad use kind");
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1378,7 +1360,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- LOWERING_FAILED(m_node, "Bad use kind");
</del><ins>+ DFG_CRASH(m_graph, m_node, "Bad use kind");
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1481,7 +1463,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- LOWERING_FAILED(m_node, "Bad use kind");
</del><ins>+ DFG_CRASH(m_graph, m_node, "Bad use kind");
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1579,7 +1561,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- LOWERING_FAILED(m_node, "Bad use kind");
</del><ins>+ DFG_CRASH(m_graph, m_node, "Bad use kind");
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1630,7 +1612,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- LOWERING_FAILED(m_node, "Bad use kind");
</del><ins>+ DFG_CRASH(m_graph, m_node, "Bad use kind");
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1656,7 +1638,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- LOWERING_FAILED(m_node, "Bad use kind");
</del><ins>+ DFG_CRASH(m_graph, m_node, "Bad use kind");
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1781,7 +1763,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- LOWERING_FAILED(m_node, "Bad use kind");
</del><ins>+ DFG_CRASH(m_graph, m_node, "Bad use kind");
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1919,8 +1901,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>- LOWERING_FAILED(m_node, "Bad array type");
- return;
</del><ins>+ DFG_CRASH(m_graph, m_node, "Bad array type");
+ break;
</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">@@ -1988,7 +1970,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- LOWERING_FAILED(m_node, "Bad use kind");
</del><ins>+ DFG_CRASH(m_graph, m_node, "Bad use kind");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2160,8 +2142,7 @@
</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>- LOWERING_FAILED(m_node, "Unimplemented");
- return;
</del><ins>+ DFG_CRASH(m_graph, m_node, "Unimplemented");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TypedPointer base;
</span><span class="lines">@@ -2207,7 +2188,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- LOWERING_FAILED(m_node, "Bad array type");
</del><ins>+ DFG_CRASH(m_graph, m_node, "Bad array type");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2357,8 +2338,7 @@
</span><span class="cx"> result = m_out.load32(pointer);
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- LOWERING_FAILED(m_node, "Bad element size");
- return;
</del><ins>+ DFG_CRASH(m_graph, m_node, "Bad element size");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (elementSize(type) < 4) {
</span><span class="lines">@@ -2402,15 +2382,14 @@
</span><span class="cx"> result = m_out.loadDouble(pointer);
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- LOWERING_FAILED(m_node, "Bad typed array type");
- return;
</del><ins>+ DFG_CRASH(m_graph, m_node, "Bad typed array type");
</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>- LOWERING_FAILED(m_node, "Bad array type");
</del><ins>+ DFG_CRASH(m_graph, m_node, "Bad array type");
</ins><span class="cx"> return;
</span><span class="cx"> } }
</span><span class="cx"> }
</span><span class="lines">@@ -2514,10 +2493,9 @@
</span><span class="cx"> m_out.storeDouble(value, elementPointer);
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> default:
</span><del>- LOWERING_FAILED(m_node, "Bad array type");
- return;
</del><ins>+ DFG_CRASH(m_graph, m_node, "Bad array type");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_out.jump(continuation);
</span><span class="lines">@@ -2610,8 +2588,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- LOWERING_FAILED(m_node, "Bad use kind");
- return;
</del><ins>+ DFG_CRASH(m_graph, m_node, "Bad use kind");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch (elementSize(type)) {
</span><span class="lines">@@ -2628,8 +2605,7 @@
</span><span class="cx"> refType = m_out.ref32;
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- LOWERING_FAILED(m_node, "Bad element size");
- return;
</del><ins>+ DFG_CRASH(m_graph, m_node, "Bad element size");
</ins><span class="cx"> }
</span><span class="cx"> } else /* !isInt(type) */ {
</span><span class="cx"> LValue value = lowDouble(child3);
</span><span class="lines">@@ -2643,8 +2619,7 @@
</span><span class="cx"> refType = m_out.refDouble;
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- LOWERING_FAILED(m_node, "Bad typed array type");
- return;
</del><ins>+ DFG_CRASH(m_graph, m_node, "Bad typed array type");
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2668,8 +2643,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- LOWERING_FAILED(m_node, "Bad array type");
- return;
</del><ins>+ DFG_CRASH(m_graph, m_node, "Bad array type");
+ break;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2740,7 +2715,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- LOWERING_FAILED(m_node, "Bad array type");
</del><ins>+ DFG_CRASH(m_graph, m_node, "Bad array type");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2798,7 +2773,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- LOWERING_FAILED(m_node, "Bad array type");
</del><ins>+ DFG_CRASH(m_graph, m_node, "Bad array type");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2835,8 +2810,8 @@
</span><span class="cx"> switch (m_node->indexingType()) {
</span><span class="cx"> case ALL_BLANK_INDEXING_TYPES:
</span><span class="cx"> case ALL_UNDECIDED_INDEXING_TYPES:
</span><del>- LOWERING_FAILED(m_node, "Bad indexing type");
- return;
</del><ins>+ DFG_CRASH(m_graph, m_node, "Bad indexing type");
+ break;
</ins><span class="cx">
</span><span class="cx"> case ALL_DOUBLE_INDEXING_TYPES:
</span><span class="cx"> m_out.storeDouble(
</span><span class="lines">@@ -2853,8 +2828,8 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- LOWERING_FAILED(m_node, "Corrupt indexing type");
- return;
</del><ins>+ DFG_CRASH(m_graph, m_node, "Corrupt indexing type");
+ break;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3135,8 +3110,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- LOWERING_FAILED(m_node, "Bad use kind");
- return;
</del><ins>+ DFG_CRASH(m_graph, m_node, "Bad use kind");
+ break;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3227,8 +3202,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>- LOWERING_FAILED(m_node, "Bad number of children");
- return;
</del><ins>+ DFG_CRASH(m_graph, m_node, "Bad number of children");
+ break;
</ins><span class="cx"> }
</span><span class="cx"> m_out.jump(continuation);
</span><span class="cx">
</span><span class="lines">@@ -3648,8 +3623,8 @@
</span><span class="cx"> nonSpeculativeCompare(LLVMIntEQ, operationCompareEq);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-
- LOWERING_FAILED(m_node, "Bad use kinds");
</del><ins>+
+ DFG_CRASH(m_graph, m_node, "Bad use kinds");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void compileCompareEqConstant()
</span><span class="lines">@@ -3742,7 +3717,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- LOWERING_FAILED(m_node, "Bad use kinds");
</del><ins>+ DFG_CRASH(m_graph, m_node, "Bad use kinds");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void compileCompareStrictEqConstant()
</span><span class="lines">@@ -4009,8 +3984,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- LOWERING_FAILED(m_node, "Bad use kind");
- return;
</del><ins>+ DFG_CRASH(m_graph, m_node, "Bad use kind");
+ break;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_out.appendTo(switchOnInts, lastNext);
</span><span class="lines">@@ -4055,8 +4030,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- LOWERING_FAILED(m_node, "Bad use kind");
- return;
</del><ins>+ DFG_CRASH(m_graph, m_node, "Bad use kind");
+ break;
</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">@@ -4108,7 +4083,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> case SwitchString: {
</span><del>- LOWERING_FAILED(m_node, "Unimplemented");
</del><ins>+ DFG_CRASH(m_graph, m_node, "Unimplemented");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4131,7 +4106,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- LOWERING_FAILED(m_node, "Bad use kind");
</del><ins>+ DFG_CRASH(m_graph, m_node, "Bad use kind");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4139,7 +4114,7 @@
</span><span class="cx"> return;
</span><span class="cx"> } }
</span><span class="cx">
</span><del>- LOWERING_FAILED(m_node, "Bad switch kind");
</del><ins>+ DFG_CRASH(m_graph, m_node, "Bad switch kind");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void compileReturn()
</span><span class="lines">@@ -5109,7 +5084,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- LOWERING_FAILED(m_node, "Bad use kinds");
</del><ins>+ DFG_CRASH(m_graph, 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">@@ -5422,7 +5397,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>- LOWERING_FAILED(m_node, "Bad use kind");
</del><ins>+ DFG_CRASH(m_graph, m_node, "Bad use kind");
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -5801,7 +5776,7 @@
</span><span class="cx"> case StrictInt52:
</span><span class="cx"> return Int52;
</span><span class="cx"> }
</span><del>- LOWERING_FAILED(m_node, "Bad use kind");
</del><ins>+ DFG_CRASH(m_graph, m_node, "Bad use kind");
</ins><span class="cx"> return Int52;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5945,7 +5920,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- LOWERING_FAILED(m_node, "Value not defined");
</del><ins>+ DFG_CRASH(m_graph, m_node, "Value not defined");
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -6260,8 +6235,7 @@
</span><span class="cx"> speculateMisc(edge);
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- LOWERING_FAILED(m_node, "Unsupported speculation use kind");
- return;
</del><ins>+ DFG_CRASH(m_graph, m_node, "Unsupported speculation use kind");
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -6322,7 +6296,7 @@
</span><span class="cx">
</span><span class="cx"> switch (arrayMode.arrayClass()) {
</span><span class="cx"> case Array::OriginalArray:
</span><del>- LOWERING_FAILED(m_node, "Unexpected original array");
</del><ins>+ DFG_CRASH(m_graph, 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">@@ -6342,8 +6316,7 @@
</span><span class="cx"> m_out.constInt8(arrayMode.shapeMask()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- LOWERING_FAILED(m_node, "Corrupt array class");
- return 0;
</del><ins>+ DFG_CRASH(m_graph, m_node, "Corrupt array class");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><span class="lines">@@ -6853,7 +6826,7 @@
</span><span class="cx"> return ExitValue::argumentsObjectThatWasNotCreated();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- LOWERING_FAILED(m_node, "Invalid flush format");
</del><ins>+ DFG_CRASH(m_graph, m_node, "Invalid flush format");
</ins><span class="cx"> return ExitValue::dead();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -6926,7 +6899,7 @@
</span><span class="cx"> if (isValid(value))
</span><span class="cx"> return exitArgument(arguments, ValueFormatDouble, value.value());
</span><span class="cx">
</span><del>- LOWERING_FAILED(m_node, toCString("Cannot find value for node: ", node).data());
</del><ins>+ DFG_CRASH(m_graph, m_node, toCString("Cannot find value for node: ", node).data());
</ins><span class="cx"> return ExitValue::dead();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -6984,7 +6957,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- LOWERING_FAILED(m_node, "Corrupt int52 kind");
</del><ins>+ DFG_CRASH(m_graph, 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">@@ -7139,20 +7112,6 @@
</span><span class="cx"> m_out.unreachable();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- NO_RETURN_DUE_TO_ASSERT void loweringFailed(Node* node, const char* file, int line, const char* function, const char* assertion)
- {
-#ifndef NDEBUG
- m_graph.handleAssertionFailure(node, file, line, function, (assertion));
-#else
- UNUSED_PARAM(node);
- UNUSED_PARAM(file);
- UNUSED_PARAM(line);
- UNUSED_PARAM(function);
- UNUSED_PARAM(assertion);
-#endif
- m_loweringSucceeded = false;
- }
-
</del><span class="cx"> AvailabilityMap& availabilityMap() { return m_availabilityCalculator.m_availability; }
</span><span class="cx">
</span><span class="cx"> VM& vm() { return m_graph.m_vm; }
</span><span class="lines">@@ -7160,7 +7119,6 @@
</span><span class="cx">
</span><span class="cx"> Graph& m_graph;
</span><span class="cx"> State& m_ftlState;
</span><del>- bool m_loweringSucceeded;
</del><span class="cx"> AbstractHeapRepository m_heaps;
</span><span class="cx"> Output m_out;
</span><span class="cx">
</span><span class="lines">@@ -7208,14 +7166,12 @@
</span><span class="cx"> uint32_t m_stackmapIDs;
</span><span class="cx"> unsigned m_tbaaKind;
</span><span class="cx"> unsigned m_tbaaStructKind;
</span><del>-
-#undef LOWERING_FAILED
</del><span class="cx"> };
</span><span class="cx">
</span><del>-bool lowerDFGToLLVM(State& state)
</del><ins>+void lowerDFGToLLVM(State& state)
</ins><span class="cx"> {
</span><span class="cx"> LowerDFGToLLVM lowering(state);
</span><del>- return lowering.lower();
</del><ins>+ lowering.lower();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } } // namespace JSC::FTL
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.h (180316 => 180317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.h 2015-02-18 23:50:12 UTC (rev 180316)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.h 2015-02-18 23:52:16 UTC (rev 180317)
</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>-bool lowerDFGToLLVM(State&);
</del><ins>+void lowerDFGToLLVM(State&);
</ins><span class="cx">
</span><span class="cx"> } } // namespace JSC::FTL
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>