v8::Handle::IsEmpty() is not the same as containing a null value.

Change-Id: Ia9a55ef403074f7813f6c6fcceb61cc41c1d1183
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

diff --git a/src/qml/qml/v4vm/qv4v8_p.h b/src/qml/qml/v4vm/qv4v8_p.h
index bf6563a..b46312d 100644 (file)
--- a/src/qml/qml/v4vm/qv4v8_p.h
+++ b/src/qml/qml/v4vm/qv4v8_p.h
@@ -195,9 +195,9 @@ struct HandleOperations
     static void init(Handle<T> *handle)
     {
 #if QT_POINTER_SIZE == 8
-        handle->val = quint64(Handle<T>::_Null_Type) << Handle<T>::Tag_Shift;
+        handle->val = quint64(Handle<T>::_Deleted_Type) << Handle<T>::Tag_Shift;
 #else
-        handle->tag = Handle<T>::_Null_Type;
+        handle->tag = Handle<T>::_Deleted_Type;
         handle->int_32 = 0;
 #endif
     }
@@ -231,7 +231,7 @@ struct HandleOperations
 
     static bool isEmpty(const Handle<T> *handle)
     {
-        return handle->tag == Handle<T>::_Null_Type;
+        return handle->tag == Handle<T>::_Deleted_Type;
     }
 
     static T *get(const Handle<T> *handle)
@@ -361,7 +361,8 @@ struct Handle {
         Boolean_Type = Immediate_Mask | 0x20000,
         Integer_Type = Immediate_Mask | 0x30000,
         Object_Type = NotDouble_Mask | 0x00000,
-        String_Type = NotDouble_Mask | 0x10000
+        String_Type = NotDouble_Mask | 0x10000,
+        Deleted_Type = NotDouble_Mask | 0x30000
     };
 
     enum ImmediateFlags {
@@ -370,12 +371,12 @@ struct Handle {
 
     enum ValueTypeInternal {
         _Undefined_Type = Undefined_Type,
+        _Deleted_Type = Deleted_Type,
         _Null_Type = Null_Type | ConvertibleToInt,
         _Boolean_Type = Boolean_Type | ConvertibleToInt,
         _Integer_Type = Integer_Type | ConvertibleToInt,
         _Object_Type = Object_Type,
         _String_Type = String_Type
-
     };
 
     union {

diff --git a/src/qml/qml/v4vm/qv4value_p.h b/src/qml/qml/v4vm/qv4value_p.h
index 9a9c8ab..24df037 100644 (file)
--- a/src/qml/qml/v4vm/qv4value_p.h
+++ b/src/qml/qml/v4vm/qv4value_p.h
@@ -106,7 +106,7 @@ struct Q_QML_EXPORT Value
         Integer_Type = Immediate_Mask | 0x30000,
         Object_Type = NotDouble_Mask | 0x00000,
         String_Type = NotDouble_Mask | 0x10000,
-        Deleted_Type = NotDouble_Mask | 0x30000,
+        Deleted_Type = NotDouble_Mask | 0x30000
     };
 
     enum ImmediateFlags {