Changeset 49005 in webkit for trunk/JavaScriptCore/runtime/JSValue.h

Timestamp:

Oct 1, 2009, 4:49:28 PM (16 years ago)

Author:

[email protected]

Message:

Roll out r49004 since it broke the debug build.

File:

• trunk/JavaScriptCore/runtime/JSValue.h (modified) (5 diffs)

trunk/JavaScriptCore/runtime/JSValue.h

@@ -214 +214 @@
         enum { NullTag =         0xfffffffb };
         enum { UndefinedTag =    0xfffffffa };
-        enum { EmptyValueTag =   0xfffffff9 };
-        enum { DeletedValueTag = 0xfffffff8 };
+        enum { DeletedValueTag = 0xfffffff9 };
 
         enum { LowestTag =  DeletedValueTag };
@@ -429 +428 @@
     inline JSValue::JSValue()
     {
-        u.asBits.tag = EmptyValueTag;
+        u.asBits.tag = CellTag;
         u.asBits.payload = 0;
     }
@@ -465 +464 @@
     inline JSValue::JSValue(JSCell* ptr)
     {
-        if (ptr)
-            u.asBits.tag = CellTag;
-        else
-            u.asBits.tag = EmptyValueTag;
+        u.asBits.tag = CellTag;
         u.asBits.payload = reinterpret_cast<int32_t>(ptr);
     }
@@ -474 +470 @@
     inline JSValue::JSValue(const JSCell* ptr)
     {
-        if (ptr)
-            u.asBits.tag = CellTag;
-        else
-            u.asBits.tag = EmptyValueTag;
+        u.asBits.tag = CellTag;
         u.asBits.payload = reinterpret_cast<int32_t>(const_cast<JSCell*>(ptr));
     }
@@ -483 +476 @@
     inline JSValue::operator bool() const
     {
-        ASSERT(tag() != DeletedValueTag);
-        return tag() != EmptyValueTag;
+        return u.asBits.payload || tag() != CellTag;
     }