Changeset 35651 in webkit for trunk/JavaScriptCore

Timestamp:

Aug 8, 2008, 8:56:46 PM (17 years ago)

Author:

[email protected]

Message:

2008-08-08 Cameron Zwarich <​[email protected]>

Reviewed by Oliver.

Bug 20330: JSCore crash loading any filehurricane media page
<​https://bugs.webkit.org/show_bug.cgi?id=20330>

Fix a typo in the constant loading patch. Also, add a case for
op_unexpected_load to CodeBlock::dump().

JavaScriptCore:

• VM/CodeBlock.cpp: (KJS::CodeBlock::dump):
• VM/CodeGenerator.cpp: (KJS::CodeGenerator::addUnexpectedConstant):

LayoutTests:

• fast/js/resources/unexpected-constant-crash.js: Added.
• fast/js/unexpected-constant-crash-expected.txt: Added.
• fast/js/unexpected-constant-crash.html: Added.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• VM/CodeBlock.cpp (modified) (1 diff)
• VM/CodeGenerator.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-08-08  Cameron Zwarich  <[email protected]>
+
+        Reviewed by Oliver.
+
+        Bug 20330: JSCore crash loading any filehurricane media page
+        <https://bugs.webkit.org/show_bug.cgi?id=20330>
+
+        Fix a typo in the constant loading patch. Also, add a case for
+        op_unexpected_load to CodeBlock::dump().
+
+        * VM/CodeBlock.cpp:
+        (KJS::CodeBlock::dump):
+        * VM/CodeGenerator.cpp:
+        (KJS::CodeGenerator::addUnexpectedConstant):
+
 2008-08-08  Matt Lilek  <[email protected]>
 

trunk/JavaScriptCore/VM/CodeBlock.cpp

@@ -260 +260 @@
     int location = it - begin;
     switch (exec->machine()->getOpcodeID(it->u.opcode)) {
+        case op_unexpected_load: {
+            int r0 = (++it)->u.operand;
+            int k0 = (++it)->u.operand;
+            printf("[%4d] unexpected_load\t %s, %s\n", location, registerName(r0).c_str(), constantName(exec, k0, unexpectedConstants[k0]).c_str());
+            break;
+        }
         case op_new_object: {
             int r0 = (++it)->u.operand;

trunk/JavaScriptCore/VM/CodeGenerator.cpp

@@ -541 +541 @@
 unsigned CodeGenerator::addUnexpectedConstant(JSValue* v)
 {
-    int index = m_codeBlock->regexps.size();
+    int index = m_codeBlock->unexpectedConstants.size();
     m_codeBlock->unexpectedConstants.append(v);
     return index;