Changeset 70212 in webkit

Timestamp:

Oct 21, 2010 1:36:20 AM (14 years ago)

Author:

abarth@webkit.org

Message:

2010-10-21 Adam Barth <​abarth@webkit.org>

Unreviewed, rolling out r70174.
​http://trac.webkit.org/changeset/70174
​https://bugs.webkit.org/show_bug.cgi?id=41948

This patch reverts a change that causes
http/tests/xmlhttprequest/origin-whitelisting-removal.html to crash.

• interpreter/Interpreter.cpp: (JSC::Interpreter::throwException):

2010-10-21 Adam Barth <​abarth@webkit.org>

Unreviewed, rolling out r70174.
​http://trac.webkit.org/changeset/70174
​https://bugs.webkit.org/show_bug.cgi?id=41948

This patch reverts a change that causes
http/tests/xmlhttprequest/origin-whitelisting-removal.html to crash.

• fast/js/exception-registerfile-shrink-expected.txt: Removed.
• fast/js/exception-registerfile-shrink.html: Removed.
• fast/js/script-tests/exception-registerfile-shrink.js: Removed.

Location:

trunk

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/interpreter/Interpreter.cpp (modified) (1 diff)
• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/js/exception-registerfile-shrink-expected.txt (deleted)
• LayoutTests/fast/js/exception-registerfile-shrink.html (deleted)
• LayoutTests/fast/js/script-tests/exception-registerfile-shrink.js (deleted)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-10-21  Adam Barth  <abarth@webkit.org>
+
+        Unreviewed, rolling out r70174.
+        http://trac.webkit.org/changeset/70174
+        https://bugs.webkit.org/show_bug.cgi?id=41948
+
+        This patch reverts a change that causes
+        http/tests/xmlhttprequest/origin-whitelisting-removal.html to crash.
+
+        * interpreter/Interpreter.cpp:
+        (JSC::Interpreter::throwException):
+
 2010-10-20  Simon Fraser  <simon.fraser@apple.com>
 

trunk/JavaScriptCore/interpreter/Interpreter.cpp

@@ -677 +677 @@
 
     // Shrink the JS stack, in case stack overflow made it huge.
-    Register* highWaterMark = callFrame->registers() + callFrame->codeBlock()->m_numCalleeRegisters;
-    for (CallFrame* callerFrame = callFrame->callerFrame()->removeHostCallFrameFlag(); callerFrame; callerFrame = callerFrame->callerFrame()->removeHostCallFrameFlag()) {
-        CodeBlock* codeBlock = callerFrame->codeBlock();
-        if (!codeBlock)
-            continue;
-        Register* callerHighWaterMark = callerFrame->registers() + codeBlock->m_numCalleeRegisters;
-        highWaterMark = max(highWaterMark, callerHighWaterMark);
-    }
-    m_registerFile.shrink(highWaterMark);
+    m_registerFile.shrink(callFrame->registers() + callFrame->codeBlock()->m_numCalleeRegisters);
 
     // Unwind the scope chain within the exception handler's call frame.

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-10-21  Adam Barth  <abarth@webkit.org>
+
+        Unreviewed, rolling out r70174.
+        http://trac.webkit.org/changeset/70174
+        https://bugs.webkit.org/show_bug.cgi?id=41948
+
+        This patch reverts a change that causes
+        http/tests/xmlhttprequest/origin-whitelisting-removal.html to crash.
+
+        * fast/js/exception-registerfile-shrink-expected.txt: Removed.
+        * fast/js/exception-registerfile-shrink.html: Removed.
+        * fast/js/script-tests/exception-registerfile-shrink.js: Removed.
+
 2010-10-21  Martin Robinson  <mrobinson@igalia.com>