Changeset 44022

Timestamp:

05/21/09 18:38:53 (10 months ago)

Author:

mrowe@apple.com

Message:

Merge r43976.

Location:

branches/WWDC-2009-branch/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bytecompiler/BytecodeGenerator.cpp (modified) (1 diff)

branches/WWDC-2009-branch/JavaScriptCore/ChangeLog

@@ +1 @@
+2009-05-21  Mark Rowe  <mrowe@apple.com>
+
+        Merge r43976.
+
+    2009-05-21  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        Fix <https://bugs.webkit.org/show_bug.cgi?id=25917> / <rdar://problem/6910066>.
+        Bug 25917: REGRESSION (r43559?): Javascript debugger crashes when pausing page
+
+        The debugger currently retrieves the arguments object from an activation rather than pulling
+        it from a call frame.  This is unreliable to due to the recent optimization to lazily create
+        the arguments object.  In the long-term it should stop doing that (<rdar://problem/6911886>),
+        but for now we force eager creation of the arguments object when debugging.
+
+        * bytecompiler/BytecodeGenerator.cpp:
+        (JSC::BytecodeGenerator::BytecodeGenerator):
+
 2009-05-21  Mark Rowe  <mrowe@apple.com>
 

branches/WWDC-2009-branch/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp

@@ -333 +333 @@
         emitOpcode(op_enter);
 
-     if (usesArguments)
+     if (usesArguments) {
         emitOpcode(op_init_arguments);
+
+        // The debugger currently retrieves the arguments object from an activation rather than pulling
+        // it from a call frame.  In the long-term it should stop doing that (<rdar://problem/6911886>),
+        // but for now we force eager creation of the arguments object when debugging.
+        if (m_shouldEmitDebugHooks)
+            emitOpcode(op_create_arguments);
+    }
 
     const DeclarationStacks::FunctionStack& functionStack = functionBody->functionStack();