Changeset 26912 in webkit for trunk/JavaScriptCore/kjs/value.cpp

Timestamp:

Oct 22, 2007, 11:44:27 PM (18 years ago)

Author:

darin

Message:

Reviewed by Maciej.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=15636 some JavaScriptCore regression tests are failing due to numeric conversion

This should restore correctness and make speed better too, restoring some
of the optimization we lost in my last check-in.

• kjs/JSImmediate.h: (KJS::JSImmediate::getTruncatedInt32): Added. Uses the range checking idiom I used in my patch yesterday. (KJS::JSImmediate::getTruncatedUInt32): Ditto.

• kjs/internal.h: Removed getInt32 and added getTruncatedInt/UInt32.
• kjs/internal.cpp: (KJS::NumberImp::getUInt32): Changed to always use double, since I can't find a way to write this more efficiently for float. (KJS::NumberImp::getTruncatedInt32): Added. (KJS::NumberImp::getTruncatedUInt32): Added.

• kjs/value.h: Removed getInt32 and added getTruncatedInt/UInt32. (KJS::JSValue::getUInt32): (KJS::JSValue::getTruncatedInt32): Added. (KJS::JSValue::getTruncatedUInt32): Added. (KJS::JSValue::toInt32): Changed getInt32 call to getTruncatedInt32. (KJS::JSValue::toUInt32): Changed getUInt32 call to getTruncatedUInt32.
• kjs/value.cpp: (KJS::JSCell::getTruncatedInt32): Added. (KJS::JSCell::getTruncatedUInt32): Added. (KJS::JSValue::toInteger): Changed getUInt32 call to getTruncatedInt32. (KJS::JSValue::toInt32SlowCase): Removed extra getInt32 call I accidentally had left in here. (KJS::JSValue::toUInt32SlowCase): Ditto. (KJS::JSValue::toUInt16): Changed getUInt32 call to getTruncatedUInt32.

• JavaScriptCore.exp: Updated.

File:

• trunk/JavaScriptCore/kjs/value.cpp (modified) (5 diffs)

trunk/JavaScriptCore/kjs/value.cpp

@@ -41 +41 @@
 }
 
-bool JSCell::getInt32(int32_t&) const
+bool JSCell::getUInt32(uint32_t&) const
 {
     return false;
 }
 
-bool JSCell::getUInt32(uint32_t&) const
+bool JSCell::getTruncatedInt32(int32_t&) const
+{
+    return false;
+}
+
+bool JSCell::getTruncatedUInt32(uint32_t&) const
 {
     return false;
@@ -54 +59 @@
 double JSValue::toInteger(ExecState *exec) const
 {
-    uint32_t i;
-    if (getUInt32(i))
+    int32_t i;
+    if (getTruncatedInt32(i))
         return i;
     return roundValue(exec, const_cast<JSValue*>(this));
@@ -63 +68 @@
 {
     ok = true;
-
-    int32_t i;
-    if (getInt32(i))
-        return i;
 
     double d = roundValue(exec, const_cast<JSValue*>(this));
@@ -90 +91 @@
     ok = true;
 
-    uint32_t i;
-    if (getUInt32(i))
-        return i;
-
     double d = roundValue(exec, const_cast<JSValue*>(this));
     if (d >= 0.0 && d < D32)
@@ -113 +110 @@
 {
     uint32_t i;
-    if (getUInt32(i))
+    if (getTruncatedUInt32(i))
         return static_cast<uint16_t>(i);