Changeset 27759 in webkit for trunk/JavaScriptCore/kjs/JSImmediate.h

Timestamp:

Nov 13, 2007, 12:37:17 PM (18 years ago)

Author:

[email protected]

Message:

2007-11-13 Eric Seidel <​[email protected]>

Reviewed by Maciej.

Add an ASSERT to getTruncatedInt32 to enforce proper usage.
Best part about this patch? It doesn't break the web!

• kjs/JSImmediate.h: (KJS::JSImmediate::getTruncatedInt32): (KJS::JSImmediate::toDouble): (KJS::JSImmediate::getUInt32):

File:

• trunk/JavaScriptCore/kjs/JSImmediate.h (modified) (4 diffs)

trunk/JavaScriptCore/kjs/JSImmediate.h

@@ -243 +243 @@
 ALWAYS_INLINE int32_t JSImmediate::getTruncatedInt32(const JSValue* v)
 {
+    ASSERT(isNumber(v));
     return static_cast<int32_t>(unTag(v)) >> 2;
 }
@@ -249 +250 @@
 {
     ASSERT(isImmediate(v));
-    const int32_t i = getTruncatedInt32(v);
+    const int32_t i = static_cast<int32_t>(unTag(v)) >> 2;
     if (JSImmediate::getTag(v) == UndefinedType && i)
         return std::numeric_limits<double>::quiet_NaN();
@@ -257 +258 @@
 ALWAYS_INLINE bool JSImmediate::getUInt32(const JSValue* v, uint32_t& i)
 {
-    const int32_t si = getTruncatedInt32(v);
+    const int32_t si = static_cast<int32_t>(unTag(v)) >> 2;
     i = si;
     return isNumber(v) & (si >= 0);
@@ -264 +265 @@
 ALWAYS_INLINE bool JSImmediate::getTruncatedInt32(const JSValue* v, int32_t& i)
 {
-    i = getTruncatedInt32(v);
+    i = static_cast<int32_t>(unTag(v)) >> 2;
     return isNumber(v);
 }