Changeset 37182 in webkit for trunk/JavaScriptCore/kjs/Arguments.cpp

Timestamp:

Oct 1, 2008, 10:06:59 PM (17 years ago)

Author:

[email protected]

Message:

2008-10-01 Cameron Zwarich <​[email protected]>

Reviewed by Maciej Stachowiak.

Bug 21289: REGRESSION (r37160): Inspector crashes on load
<​https://bugs.webkit.org/show_bug.cgi?id=21289>

The code in Arguments::mark() in r37160 was wrong. It marks indices in
d->registers, but that makes no sense (they are local variables, not
arguments). It should mark those indices in d->registerArray instead.

This patch also changes Arguments::copyRegisters() to use d->numParameters
instead of recomputing it.

• kjs/Arguments.cpp: (JSC::Arguments::mark):
• kjs/Arguments.h: (JSC::Arguments::copyRegisters):

File:

• trunk/JavaScriptCore/kjs/Arguments.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/Arguments.cpp

@@ -44 +44 @@
 }
 
-void Arguments::mark() 
+void Arguments::mark()
 {
     JSObject::mark();
 
-    for (unsigned i = 0; i < d->numParameters; ++i) {
-        if (!d->registers[i].marked())
-            d->registers[i].mark();
+    if (d->registerArray) {
+        for (unsigned i = 0; i < d->numParameters; ++i) {
+            if (!d->registerArray[i].marked())
+                d->registerArray[i].mark();
+        }
     }