Title: [198015] releases/WebKitGTK/webkit-2.12/Source/_javascript_Core
- Revision
- 198015
- Author
- [email protected]
- Date
- 2016-03-11 06:28:40 -0800 (Fri, 11 Mar 2016)
Log Message
Merge r197305 - REGRESSION(r197303): 4 jsc tests failing on bots.
Unreviewed follow-up fix.
* bytecode/UnlinkedCodeBlock.cpp:
(JSC::UnlinkedCodeBlock::typeProfilerExpressionInfoForBytecodeOffset): This function
can still get called with !m_rareData, in case the type profiler is active but this
particular code block doesn't have type profiler data. Handle it gracefully.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/Source/_javascript_Core/ChangeLog (198014 => 198015)
--- releases/WebKitGTK/webkit-2.12/Source/_javascript_Core/ChangeLog 2016-03-11 14:28:31 UTC (rev 198014)
+++ releases/WebKitGTK/webkit-2.12/Source/_javascript_Core/ChangeLog 2016-03-11 14:28:40 UTC (rev 198015)
@@ -1,5 +1,16 @@
2016-02-28 Andreas Kling <[email protected]>
+ REGRESSION(r197303): 4 jsc tests failing on bots.
+
+ Unreviewed follow-up fix.
+
+ * bytecode/UnlinkedCodeBlock.cpp:
+ (JSC::UnlinkedCodeBlock::typeProfilerExpressionInfoForBytecodeOffset): This function
+ can still get called with !m_rareData, in case the type profiler is active but this
+ particular code block doesn't have type profiler data. Handle it gracefully.
+
+2016-02-28 Andreas Kling <[email protected]>
+
Shrink UnlinkedCodeBlock a bit.
<https://webkit.org/b/154797>
Modified: releases/WebKitGTK/webkit-2.12/Source/_javascript_Core/bytecode/UnlinkedCodeBlock.cpp (198014 => 198015)
--- releases/WebKitGTK/webkit-2.12/Source/_javascript_Core/bytecode/UnlinkedCodeBlock.cpp 2016-03-11 14:28:31 UTC (rev 198014)
+++ releases/WebKitGTK/webkit-2.12/Source/_javascript_Core/bytecode/UnlinkedCodeBlock.cpp 2016-03-11 14:28:40 UTC (rev 198015)
@@ -274,8 +274,15 @@
bool UnlinkedCodeBlock::typeProfilerExpressionInfoForBytecodeOffset(unsigned bytecodeOffset, unsigned& startDivot, unsigned& endDivot)
{
- ASSERT(m_rareData);
static const bool verbose = false;
+ if (!m_rareData) {
+ if (verbose)
+ dataLogF("Don't have assignment info for offset:%u\n", bytecodeOffset);
+ startDivot = UINT_MAX;
+ endDivot = UINT_MAX;
+ return false;
+ }
+
auto iter = m_rareData->m_typeProfilerInfoMap.find(bytecodeOffset);
if (iter == m_rareData->m_typeProfilerInfoMap.end()) {
if (verbose)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
