Title: [174301] trunk/Source/_javascript_Core
- Revision
- 174301
- Author
- msab...@apple.com
- Date
- 2014-10-03 16:22:21 -0700 (Fri, 03 Oct 2014)
Log Message
REGRESSION(r174216): CodeBlock::dumpByteCodes crashes on op_push_name_scope
https://bugs.webkit.org/show_bug.cgi?id=137412
Reviewed by Mark Lam.
Added support for the JSNameScope::type opcode parameter in dumpBytecode().
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::dumpBytecode):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (174300 => 174301)
--- trunk/Source/_javascript_Core/ChangeLog 2014-10-03 23:17:00 UTC (rev 174300)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-10-03 23:22:21 UTC (rev 174301)
@@ -1,3 +1,15 @@
+2014-10-03 Michael Saboff <msab...@apple.com>
+
+ REGRESSION(r174216): CodeBlock::dumpByteCodes crashes on op_push_name_scope
+ https://bugs.webkit.org/show_bug.cgi?id=137412
+
+ Reviewed by Mark Lam.
+
+ Added support for the JSNameScope::type opcode parameter in dumpBytecode().
+
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::dumpBytecode):
+
2014-10-03 Saam Barati <saambara...@gmail.com>
Implement op_profile_type in the 32-bit baseline JIT
Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp (174300 => 174301)
--- trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2014-10-03 23:17:00 UTC (rev 174300)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2014-10-03 23:22:21 UTC (rev 174301)
@@ -1445,8 +1445,9 @@
int id0 = (++it)->u.operand;
int r1 = (++it)->u.operand;
unsigned attributes = (++it)->u.operand;
+ JSNameScope::Type scopeType = (JSNameScope::Type)(++it)->u.operand;
printLocationAndOp(out, exec, location, it, "push_name_scope");
- out.printf("%s, %s, %u", idName(id0, identifier(id0)).data(), registerName(r1).data(), attributes);
+ out.printf("%s, %s, %u %s", idName(id0, identifier(id0)).data(), registerName(r1).data(), attributes, (scopeType == JSNameScope::FunctionNameScope) ? "functionScope" : ((scopeType == JSNameScope::CatchScope) ? "catchScope" : "unknownScopeType"));
break;
}
case op_catch: {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
