[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
barraclough at apple.com
barraclough at apple.com
Wed Apr 7 23:23:06 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit dd866dae44e0c475e7aaadc070eea16611d4064a
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Nov 5 03:04:39 2009 +0000
Rubber Stamped by Mark Rowe, Oliver Hunt, and Sam Weinig.
Patch by Gavin Barraclough <barraclough at apple.com> on 2009-11-04
Add a missing assert to the ARMv7 JIT.
* assembler/ARMv7Assembler.h:
(JSC::ARMThumbImmediate::ARMThumbImmediate):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50539 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 9ca9957..7816b91 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-04 Gavin Barraclough <barraclough at apple.com>
+
+ Rubber Stamped by Mark Rowe, Oliver Hunt, and Sam Weinig.
+
+ Add a missing assert to the ARMv7 JIT.
+
+ * assembler/ARMv7Assembler.h:
+ (JSC::ARMThumbImmediate::ARMThumbImmediate):
+
2009-11-04 Mark Rowe <mrowe at apple.com>
Rubber-stamped by Oliver Hunt.
diff --git a/JavaScriptCore/assembler/ARMv7Assembler.h b/JavaScriptCore/assembler/ARMv7Assembler.h
index 02ce2e9..e253a53 100644
--- a/JavaScriptCore/assembler/ARMv7Assembler.h
+++ b/JavaScriptCore/assembler/ARMv7Assembler.h
@@ -236,6 +236,11 @@ class ARMThumbImmediate {
ARMThumbImmediate(ThumbImmediateType type, uint16_t value)
: m_type(TypeUInt16)
{
+ // Make sure this constructor is only reached with type TypeUInt16;
+ // this extra parameter makes the code a little clearer by making it
+ // explicit at call sites which type is being constructed
+ ASSERT_UNUSED(type, type == TypeUInt16);
+
m_value.asInt = value;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list