[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[abarth at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit a45feffb01ec7ad5b043d292c7d725a75329f047
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 21 08:36:20 2010 +0000

    2010-10-21  Adam Barth  <abarth at 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 at 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.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70212 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 95bf475..332761d 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-21  Adam Barth  <abarth at 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 at apple.com>
 
         Fix the EFL build.
diff --git a/JavaScriptCore/interpreter/Interpreter.cpp b/JavaScriptCore/interpreter/Interpreter.cpp
index 632571d..2877565 100644
--- a/JavaScriptCore/interpreter/Interpreter.cpp
+++ b/JavaScriptCore/interpreter/Interpreter.cpp
@@ -676,15 +676,7 @@ NEVER_INLINE HandlerInfo* Interpreter::throwException(CallFrame*& callFrame, JSV
     }
 
     // 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.
     ScopeChainNode* scopeChain = callFrame->scopeChain();
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index e30df8d..6d91bbb 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-21  Adam Barth  <abarth at 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 at igalia.com>
 
         Rebaseline some tests after r70170.
diff --git a/LayoutTests/fast/js/exception-registerfile-shrink-expected.txt b/LayoutTests/fast/js/exception-registerfile-shrink-expected.txt
deleted file mode 100644
index 94d65d2..0000000
--- a/LayoutTests/fast/js/exception-registerfile-shrink-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Test for REGRESSION(r60392): Registerfile can be unwound too far following an exception. If the test doesn't crash, you pass.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/fast/js/exception-registerfile-shrink.html b/LayoutTests/fast/js/exception-registerfile-shrink.html
deleted file mode 100644
index 1bc1cc9..0000000
--- a/LayoutTests/fast/js/exception-registerfile-shrink.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<link rel="stylesheet" href="resources/js-test-style.css">
-<script src="resources/js-test-pre.js"></script>
-</head>
-<body>
-<p id="description"></p>
-<div id="console"></div>
-<script src="script-tests/exception-registerfile-shrink.js"></script>
-<script src="resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/fast/js/script-tests/exception-registerfile-shrink.js b/LayoutTests/fast/js/script-tests/exception-registerfile-shrink.js
deleted file mode 100644
index c3cec22..0000000
--- a/LayoutTests/fast/js/script-tests/exception-registerfile-shrink.js
+++ /dev/null
@@ -1,10 +0,0 @@
-description(
-"Test for <a href='https://bugs.webkit.org/show_bug.cgi?id=41948'>REGRESSION(r60392): Registerfile can be unwound too far following an exception</a>. If the test doesn't crash, you pass."
-);
-
-eval('try { throw 0; } catch(e) {}');
-
-var x = new String();
-'' + escape(x.substring(0, 1));
-
-var successfullyParsed = true;

-- 
WebKit Debian packaging