Title: [209956] trunk/Source/_javascript_Core
- Revision
- 209956
- Author
- mcatanz...@igalia.com
- Date
- 2016-12-16 19:32:39 -0800 (Fri, 16 Dec 2016)
Log Message
Unreviewed, fix GCC 6 build failure after r209952
Return false, not nullptr, in function returning bool.
* bytecompiler/BytecodeGenerator.cpp:
(JSC::BytecodeGenerator::emitJumpViaFinallyIfNeeded):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (209955 => 209956)
--- trunk/Source/_javascript_Core/ChangeLog 2016-12-17 03:19:48 UTC (rev 209955)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-12-17 03:32:39 UTC (rev 209956)
@@ -1,3 +1,12 @@
+2016-12-16 Michael Catanzaro <mcatanz...@igalia.com>
+
+ Unreviewed, fix GCC 6 build failure after r209952
+
+ Return false, not nullptr, in function returning bool.
+
+ * bytecompiler/BytecodeGenerator.cpp:
+ (JSC::BytecodeGenerator::emitJumpViaFinallyIfNeeded):
+
2016-12-16 Saam Barati <sbar...@apple.com>
WebAssembly: We still have some incorrect parsing productions inside unreachable code
Modified: trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.cpp (209955 => 209956)
--- trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.cpp 2016-12-17 03:19:48 UTC (rev 209955)
+++ trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.cpp 2016-12-17 03:32:39 UTC (rev 209956)
@@ -4799,7 +4799,7 @@
size_t scopeDelta = labelScopeDepth() - targetLabelScopeDepth;
ASSERT(scopeDelta <= m_controlFlowScopeStack.size());
if (!scopeDelta)
- return nullptr; // No finallys to thread through.
+ return false; // No finallys to thread through.
ControlFlowScope* topScope = &m_controlFlowScopeStack.last();
ControlFlowScope* bottomScope = &m_controlFlowScopeStack.last() - scopeDelta;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
