[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
mjs at apple.com
mjs at apple.com
Thu Apr 8 00:30:51 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 1e2ffc739ee8f7e36cfda5110677fc2e49c97678
Author: mjs at apple.com <mjs at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Dec 10 07:47:41 2009 +0000
2009-12-09 Maciej Stachowiak <mjs at apple.com>
Reviewed by Oliver Hunt.
Google reader gets stuck in the "Loading..." state and does not complete
https://bugs.webkit.org/show_bug.cgi?id=32256
<rdar://problem/7456388>
* jit/JITArithmetic.cpp:
(JSC::JIT::emitSlow_op_jless): Fix some backward branches.
2009-12-09 Maciej Stachowiak <mjs at apple.com>
Reviewed by Oliver Hunt.
Test for: Google reader gets stuck in the "Loading..." state and does not complete
https://bugs.webkit.org/show_bug.cgi?id=32256
* fast/js/codegen-jless-expected.txt: Added.
* fast/js/codegen-jless.html: Added.
* fast/js/script-tests/codegen-jless.js: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51939 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index aa0a0b3..56e58ad 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,14 @@
+2009-12-09 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Oliver Hunt.
+
+ Google reader gets stuck in the "Loading..." state and does not complete
+ https://bugs.webkit.org/show_bug.cgi?id=32256
+ <rdar://problem/7456388>
+
+ * jit/JITArithmetic.cpp:
+ (JSC::JIT::emitSlow_op_jless): Fix some backward branches.
+
2009-12-09 Gavin Barraclough <barraclough at apple.com>
Reviewed by Oliver Hunt.
diff --git a/JavaScriptCore/jit/JITArithmetic.cpp b/JavaScriptCore/jit/JITArithmetic.cpp
index 1b9e55e..70f7564 100644
--- a/JavaScriptCore/jit/JITArithmetic.cpp
+++ b/JavaScriptCore/jit/JITArithmetic.cpp
@@ -1614,7 +1614,7 @@ void JIT::emitSlow_op_jless(Instruction* currentInstruction, Vector<SlowCaseEntr
stubCall.addArgument(regT0);
stubCall.addArgument(op2, regT2);
stubCall.call();
- emitJumpSlowToHot(branchTest32(Zero, regT0), target);
+ emitJumpSlowToHot(branchTest32(NonZero, regT0), target);
} else if (isOperandConstantImmediateInt(op1)) {
linkSlowCase(iter);
@@ -1655,7 +1655,7 @@ void JIT::emitSlow_op_jless(Instruction* currentInstruction, Vector<SlowCaseEntr
stubCall.addArgument(op1, regT2);
stubCall.addArgument(regT1);
stubCall.call();
- emitJumpSlowToHot(branchTest32(Zero, regT0), target);
+ emitJumpSlowToHot(branchTest32(NonZero, regT0), target);
} else {
linkSlowCase(iter);
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 0f38649..f7be8a4 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2009-12-09 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Oliver Hunt.
+
+ Test for: Google reader gets stuck in the "Loading..." state and does not complete
+ https://bugs.webkit.org/show_bug.cgi?id=32256
+
+ * fast/js/codegen-jless-expected.txt: Added.
+ * fast/js/codegen-jless.html: Added.
+ * fast/js/script-tests/codegen-jless.js: Added.
+
2009-12-09 Csaba Osztrogonác <ossy at webkit.org>
[Qt] Unreviewed. Skip a timeouter flakey test.
diff --git a/LayoutTests/fast/js/codegen-jless-expected.txt b/LayoutTests/fast/js/codegen-jless-expected.txt
new file mode 100644
index 0000000..74c1adc
--- /dev/null
+++ b/LayoutTests/fast/js/codegen-jless-expected.txt
@@ -0,0 +1,10 @@
+Tests particular unusual cases of jump-if-less codegen.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS !(true && undefined > 0) ? 'true' : 'false' is 'true'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/fast/js/codegen-jless.html b/LayoutTests/fast/js/codegen-jless.html
new file mode 100644
index 0000000..792ccbc
--- /dev/null
+++ b/LayoutTests/fast/js/codegen-jless.html
@@ -0,0 +1,13 @@
+<!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/codegen-jless.js"></script>
+<script src="resources/js-test-post.js"></script>
+</body>
+</html>
diff --git a/LayoutTests/fast/js/script-tests/codegen-jless.js b/LayoutTests/fast/js/script-tests/codegen-jless.js
new file mode 100644
index 0000000..6cbb0ac
--- /dev/null
+++ b/LayoutTests/fast/js/script-tests/codegen-jless.js
@@ -0,0 +1,7 @@
+description(
+"Tests particular unusual cases of jump-if-less codegen."
+);
+
+shouldBe("!(true && undefined > 0) ? 'true' : 'false'", "'true'");
+
+var successfullyParsed = true;
diff --git a/LayoutTests/platform/win/editing/selection/doubleclick-should-not-expand-across-lines.html b/LayoutTests/platform/win/editing/selection/doubleclick-should-not-expand-across-lines.html
index 4e2b439..fbf2e67 100644
--- a/LayoutTests/platform/win/editing/selection/doubleclick-should-not-expand-across-lines.html
+++ b/LayoutTests/platform/win/editing/selection/doubleclick-should-not-expand-across-lines.html
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<html>
<head>
-<link rel="stylesheet" href="../../../../fast/js/resources/js-test-style.css">
-<script src="../../../../fast/js/resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../fast/js/resources/js-test-style.css">
+<script src="../../../fast/js/resources/js-test-pre.js"></script>
</head>
<body>
<p id="description"></p>
<div id="console"></div>
<script src="script-tests/doubleclick-should-not-expand-across-lines.js"></script>
-<script src="../../../../fast/js/resources/js-test-post.js"></script>
+<script src="../../../fast/js/resources/js-test-post.js"></script>
</body>
</html>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list