Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (180246 => 180247)
--- trunk/Source/_javascript_Core/ChangeLog 2015-02-18 00:38:02 UTC (rev 180246)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-02-18 02:38:16 UTC (rev 180247)
@@ -1,3 +1,77 @@
+2015-02-17 Michael Saboff <msab...@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-17 Filip Pizlo <fpi...@apple.com>
StackLayoutPhase should use CodeBlock::usesArguments rather than FunctionExecutable::usesArguments
Modified: trunk/Source/_javascript_Core/dfg/DFGPlan.cpp (180246 => 180247)
--- trunk/Source/_javascript_Core/dfg/DFGPlan.cpp 2015-02-18 00:38:02 UTC (rev 180246)
+++ trunk/Source/_javascript_Core/dfg/DFGPlan.cpp 2015-02-18 02:38:16 UTC (rev 180247)
@@ -386,7 +386,10 @@
}
FTL::State state(dfg);
- FTL::lowerDFGToLLVM(state);
+ if (!FTL::lowerDFGToLLVM(state)) {
+ FTL::fail(state);
+ return FTLPath;
+ }
if (reportCompileTimes())
m_timeBeforeFTL = monotonicallyIncreasingTime();
Modified: trunk/Source/_javascript_Core/ftl/FTLLowerDFGToLLVM.cpp (180246 => 180247)
--- trunk/Source/_javascript_Core/ftl/FTLLowerDFGToLLVM.cpp 2015-02-18 00:38:02 UTC (rev 180246)
+++ trunk/Source/_javascript_Core/ftl/FTLLowerDFGToLLVM.cpp 2015-02-18 02:38:16 UTC (rev 180247)
@@ -93,6 +93,7 @@
LowerDFGToLLVM(State& state)
: m_graph(state.graph)
, m_ftlState(state)
+ , m_loweringSucceeded(true)
, m_heaps(state.context)
, m_out(state.context)
, m_state(state.graph)
@@ -102,8 +103,12 @@
, m_tbaaStructKind(mdKindID(state.context, "tbaa.struct"))
{
}
-
- void lower()
+
+
+#define LOWERING_FAILED(node, reason) \
+ loweringFailed((node), __FILE__, __LINE__, WTF_PRETTY_FUNCTION, (reason));
+
+ bool lower()
{
CString name;
if (verboseCompilationEnabled()) {
@@ -251,14 +256,22 @@
case FlushedJSValue:
break;
default:
- DFG_CRASH(m_graph, node, "Bad flush format for argument");
+ LOWERING_FAILED(node, "Bad flush format for argument");
break;
}
}
+
+ if (!m_loweringSucceeded)
+ return m_loweringSucceeded;
+
m_out.jump(lowBlock(m_graph.block(0)));
- for (BasicBlock* block : preOrder)
+ for (BasicBlock* block : preOrder) {
compileBlock(block);
+
+ if (!m_loweringSucceeded)
+ return m_loweringSucceeded;
+ }
if (Options::dumpLLVMIR())
dumpModule(m_ftlState.module);
@@ -267,6 +280,8 @@
m_ftlState.dumpState("after lowering");
if (validationEnabled())
verifyModule(m_ftlState.module);
+
+ return m_loweringSucceeded;
}
private:
@@ -299,8 +314,8 @@
type = m_out.int64;
break;
default:
- DFG_CRASH(m_graph, node, "Bad Phi node result type");
- break;
+ LOWERING_FAILED(node, "Bad Phi node result type");
+ return;
}
m_phis.add(node, buildAlloca(m_out.m_builder, type));
}
@@ -796,10 +811,13 @@
case KillLocal:
break;
default:
- DFG_CRASH(m_graph, m_node, "Unrecognized node in FTL backend");
+ LOWERING_FAILED(m_node, "Unrecognized node in FTL backend");
break;
}
+ if (!m_loweringSucceeded)
+ return false;
+
if (!m_state.isValid()) {
safelyInvalidateAfterTermination();
return false;
@@ -835,7 +853,7 @@
m_out.set(lowJSValue(m_node->child1()), destination);
break;
default:
- DFG_CRASH(m_graph, m_node, "Bad use kind");
+ LOWERING_FAILED(m_node, "Bad use kind");
break;
}
}
@@ -861,7 +879,7 @@
setJSValue(m_out.get(source));
break;
default:
- DFG_CRASH(m_graph, m_node, "Bad use kind");
+ LOWERING_FAILED(m_node, "Bad use kind");
break;
}
}
@@ -899,7 +917,7 @@
}
default:
- DFG_CRASH(m_graph, m_node, "Bad use kind");
+ LOWERING_FAILED(m_node, "Bad use kind");
}
}
@@ -924,7 +942,7 @@
}
default:
- DFG_CRASH(m_graph, m_node, "Bad use kind");
+ LOWERING_FAILED(m_node, "Bad use kind");
}
}
@@ -987,7 +1005,7 @@
}
default:
- DFG_CRASH(m_graph, m_node, "Bad use kind");
+ LOWERING_FAILED(m_node, "Bad use kind");
break;
}
}
@@ -1094,7 +1112,7 @@
}
default:
- DFG_CRASH(m_graph, m_node, "Bad flush format");
+ LOWERING_FAILED(m_node, "Bad flush format");
break;
}
}
@@ -1254,7 +1272,7 @@
}
default:
- DFG_CRASH(m_graph, m_node, "Bad use kind");
+ LOWERING_FAILED(m_node, "Bad use kind");
break;
}
}
@@ -1328,7 +1346,7 @@
}
default:
- DFG_CRASH(m_graph, m_node, "Bad use kind");
+ LOWERING_FAILED(m_node, "Bad use kind");
break;
}
}
@@ -1431,7 +1449,7 @@
}
default:
- DFG_CRASH(m_graph, m_node, "Bad use kind");
+ LOWERING_FAILED(m_node, "Bad use kind");
break;
}
}
@@ -1529,7 +1547,7 @@
}
default:
- DFG_CRASH(m_graph, m_node, "Bad use kind");
+ LOWERING_FAILED(m_node, "Bad use kind");
break;
}
}
@@ -1580,7 +1598,7 @@
}
default:
- DFG_CRASH(m_graph, m_node, "Bad use kind");
+ LOWERING_FAILED(m_node, "Bad use kind");
break;
}
}
@@ -1606,7 +1624,7 @@
}
default:
- DFG_CRASH(m_graph, m_node, "Bad use kind");
+ LOWERING_FAILED(m_node, "Bad use kind");
break;
}
}
@@ -1731,7 +1749,7 @@
}
default:
- DFG_CRASH(m_graph, m_node, "Bad use kind");
+ LOWERING_FAILED(m_node, "Bad use kind");
break;
}
}
@@ -1869,8 +1887,8 @@
vmCall(m_out.operation(operationEnsureArrayStorage), m_callFrame, cell);
break;
default:
- DFG_CRASH(m_graph, m_node, "Bad array type");
- break;
+ LOWERING_FAILED(m_node, "Bad array type");
+ return;
}
structureID = m_out.load32(cell, m_heaps.JSCell_structureID);
@@ -1938,7 +1956,7 @@
}
default:
- DFG_CRASH(m_graph, m_node, "Bad use kind");
+ LOWERING_FAILED(m_node, "Bad use kind");
return;
}
}
@@ -2089,7 +2107,8 @@
// FIXME: FTL should support activations.
// https://bugs.webkit.org/show_bug.cgi?id=129576
- DFG_CRASH(m_graph, m_node, "Unimplemented");
+ LOWERING_FAILED(m_node, "Unimplemented");
+ return;
}
TypedPointer base;
@@ -2135,7 +2154,7 @@
return;
}
- DFG_CRASH(m_graph, m_node, "Bad array type");
+ LOWERING_FAILED(m_node, "Bad array type");
return;
}
}
@@ -2285,7 +2304,8 @@
result = m_out.load32(pointer);
break;
default:
- DFG_CRASH(m_graph, m_node, "Bad element size");
+ LOWERING_FAILED(m_node, "Bad element size");
+ return;
}
if (elementSize(type) < 4) {
@@ -2329,14 +2349,15 @@
result = m_out.loadDouble(pointer);
break;
default:
- DFG_CRASH(m_graph, m_node, "Bad typed array type");
+ LOWERING_FAILED(m_node, "Bad typed array type");
+ return;
}
setDouble(result);
return;
}
- DFG_CRASH(m_graph, m_node, "Bad array type");
+ LOWERING_FAILED(m_node, "Bad array type");
return;
} }
}
@@ -2440,9 +2461,10 @@
m_out.storeDouble(value, elementPointer);
break;
}
-
+
default:
- DFG_CRASH(m_graph, m_node, "Bad array type");
+ LOWERING_FAILED(m_node, "Bad array type");
+ return;
}
m_out.jump(continuation);
@@ -2535,7 +2557,8 @@
}
default:
- DFG_CRASH(m_graph, m_node, "Bad use kind");
+ LOWERING_FAILED(m_node, "Bad use kind");
+ return;
}
switch (elementSize(type)) {
@@ -2552,7 +2575,8 @@
refType = m_out.ref32;
break;
default:
- DFG_CRASH(m_graph, m_node, "Bad element size");
+ LOWERING_FAILED(m_node, "Bad element size");
+ return;
}
} else /* !isInt(type) */ {
LValue value = lowDouble(child3);
@@ -2566,7 +2590,8 @@
refType = m_out.refDouble;
break;
default:
- DFG_CRASH(m_graph, m_node, "Bad typed array type");
+ LOWERING_FAILED(m_node, "Bad typed array type");
+ return;
}
}
@@ -2590,8 +2615,8 @@
return;
}
- DFG_CRASH(m_graph, m_node, "Bad array type");
- break;
+ LOWERING_FAILED(m_node, "Bad array type");
+ return;
}
}
@@ -2662,7 +2687,7 @@
}
default:
- DFG_CRASH(m_graph, m_node, "Bad array type");
+ LOWERING_FAILED(m_node, "Bad array type");
return;
}
}
@@ -2720,7 +2745,7 @@
}
default:
- DFG_CRASH(m_graph, m_node, "Bad array type");
+ LOWERING_FAILED(m_node, "Bad array type");
return;
}
}
@@ -2757,8 +2782,8 @@
switch (m_node->indexingType()) {
case ALL_BLANK_INDEXING_TYPES:
case ALL_UNDECIDED_INDEXING_TYPES:
- DFG_CRASH(m_graph, m_node, "Bad indexing type");
- break;
+ LOWERING_FAILED(m_node, "Bad indexing type");
+ return;
case ALL_DOUBLE_INDEXING_TYPES:
m_out.storeDouble(
@@ -2775,8 +2800,8 @@
break;
default:
- DFG_CRASH(m_graph, m_node, "Corrupt indexing type");
- break;
+ LOWERING_FAILED(m_node, "Corrupt indexing type");
+ return;
}
}
@@ -3057,8 +3082,8 @@
}
default:
- DFG_CRASH(m_graph, m_node, "Bad use kind");
- break;
+ LOWERING_FAILED(m_node, "Bad use kind");
+ return;
}
}
@@ -3149,8 +3174,8 @@
m_out.operation(operationMakeRope3), m_callFrame, kids[0], kids[1], kids[2]));
break;
default:
- DFG_CRASH(m_graph, m_node, "Bad number of children");
- break;
+ LOWERING_FAILED(m_node, "Bad number of children");
+ return;
}
m_out.jump(continuation);
@@ -3570,8 +3595,8 @@
nonSpeculativeCompare(LLVMIntEQ, operationCompareEq);
return;
}
-
- DFG_CRASH(m_graph, m_node, "Bad use kinds");
+
+ LOWERING_FAILED(m_node, "Bad use kinds");
}
void compileCompareEqConstant()
@@ -3664,7 +3689,7 @@
return;
}
- DFG_CRASH(m_graph, m_node, "Bad use kinds");
+ LOWERING_FAILED(m_node, "Bad use kinds");
}
void compileCompareStrictEqConstant()
@@ -3850,8 +3875,8 @@
}
default:
- DFG_CRASH(m_graph, m_node, "Bad use kind");
- break;
+ LOWERING_FAILED(m_node, "Bad use kind");
+ return;
}
m_out.appendTo(switchOnInts, lastNext);
@@ -3896,8 +3921,8 @@
}
default:
- DFG_CRASH(m_graph, m_node, "Bad use kind");
- break;
+ LOWERING_FAILED(m_node, "Bad use kind");
+ return;
}
LBasicBlock lengthIs1 = FTL_NEW_BLOCK(m_out, ("Switch/SwitchChar length is 1"));
@@ -3949,7 +3974,7 @@
}
case SwitchString: {
- DFG_CRASH(m_graph, m_node, "Unimplemented");
+ LOWERING_FAILED(m_node, "Unimplemented");
return;
}
@@ -3972,7 +3997,7 @@
}
default:
- DFG_CRASH(m_graph, m_node, "Bad use kind");
+ LOWERING_FAILED(m_node, "Bad use kind");
return;
}
@@ -3980,7 +4005,7 @@
return;
} }
- DFG_CRASH(m_graph, m_node, "Bad switch kind");
+ LOWERING_FAILED(m_node, "Bad switch kind");
}
void compileReturn()
@@ -4950,7 +4975,7 @@
return;
}
- DFG_CRASH(m_graph, m_node, "Bad use kinds");
+ LOWERING_FAILED(m_node, "Bad use kinds");
}
void compareEqObjectOrOtherToObject(Edge leftChild, Edge rightChild)
@@ -5263,7 +5288,7 @@
return m_out.phi(m_out.boolean, fastResult, slowResult);
}
default:
- DFG_CRASH(m_graph, m_node, "Bad use kind");
+ LOWERING_FAILED(m_node, "Bad use kind");
return 0;
}
}
@@ -5642,7 +5667,7 @@
case StrictInt52:
return Int52;
}
- DFG_CRASH(m_graph, m_node, "Bad use kind");
+ LOWERING_FAILED(m_node, "Bad use kind");
return Int52;
}
@@ -5786,7 +5811,7 @@
return result;
}
- DFG_CRASH(m_graph, m_node, "Value not defined");
+ LOWERING_FAILED(m_node, "Value not defined");
return 0;
}
@@ -6101,7 +6126,8 @@
speculateMisc(edge);
break;
default:
- DFG_CRASH(m_graph, m_node, "Unsupported speculation use kind");
+ LOWERING_FAILED(m_node, "Unsupported speculation use kind");
+ return;
}
}
@@ -6162,7 +6188,7 @@
switch (arrayMode.arrayClass()) {
case Array::OriginalArray:
- DFG_CRASH(m_graph, m_node, "Unexpected original array");
+ LOWERING_FAILED(m_node, "Unexpected original array");
return 0;
case Array::Array:
@@ -6182,7 +6208,8 @@
m_out.constInt8(arrayMode.shapeMask()));
}
- DFG_CRASH(m_graph, m_node, "Corrupt array class");
+ LOWERING_FAILED(m_node, "Corrupt array class");
+ return 0;
}
default:
@@ -6716,7 +6743,7 @@
return ExitValue::argumentsObjectThatWasNotCreated();
}
- DFG_CRASH(m_graph, m_node, "Invalid flush format");
+ LOWERING_FAILED(m_node, "Invalid flush format");
return ExitValue::dead();
}
@@ -6789,7 +6816,7 @@
if (isValid(value))
return exitArgument(arguments, ValueFormatDouble, value.value());
- DFG_CRASH(m_graph, m_node, toCString("Cannot find value for node: ", node).data());
+ LOWERING_FAILED(m_node, toCString("Cannot find value for node: ", node).data());
return ExitValue::dead();
}
@@ -6847,7 +6874,7 @@
return;
}
- DFG_CRASH(m_graph, m_node, "Corrupt int52 kind");
+ LOWERING_FAILED(m_node, "Corrupt int52 kind");
}
void setJSValue(Node* node, LValue value)
{
@@ -7001,7 +7028,21 @@
#endif
m_out.unreachable();
}
-
+
+ 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;
+ }
+
AvailabilityMap& availabilityMap() { return m_availabilityCalculator.m_availability; }
VM& vm() { return m_graph.m_vm; }
@@ -7009,6 +7050,7 @@
Graph& m_graph;
State& m_ftlState;
+ bool m_loweringSucceeded;
AbstractHeapRepository m_heaps;
Output m_out;
@@ -7056,12 +7098,14 @@
uint32_t m_stackmapIDs;
unsigned m_tbaaKind;
unsigned m_tbaaStructKind;
+
+#undef LOWERING_FAILED
};
-void lowerDFGToLLVM(State& state)
+bool lowerDFGToLLVM(State& state)
{
LowerDFGToLLVM lowering(state);
- lowering.lower();
+ return lowering.lower();
}
} } // namespace JSC::FTL
Modified: trunk/Source/_javascript_Core/ftl/FTLLowerDFGToLLVM.h (180246 => 180247)
--- trunk/Source/_javascript_Core/ftl/FTLLowerDFGToLLVM.h 2015-02-18 00:38:02 UTC (rev 180246)
+++ trunk/Source/_javascript_Core/ftl/FTLLowerDFGToLLVM.h 2015-02-18 02:38:16 UTC (rev 180247)
@@ -33,7 +33,7 @@
namespace JSC { namespace FTL {
-void lowerDFGToLLVM(State&);
+bool lowerDFGToLLVM(State&);
} } // namespace JSC::FTL
_______________________________________________ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
