webassembly: revert the bitfield patch

The bitfield changes are no longer needed, as the problem with
variables becoming unchangable seems to have been fixed, or has cleared
itself up.

Change-Id: Ia681b7410922473ab26ff57894582f8386380a86
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>

5 files changed, 0 insertions, 61 deletions

diff --git a/src/qml/compiler/qv4compileddata_p.h b/src/qml/compiler/qv4compileddata_p.h
index a1eefe3988..2c0320f7f1 100644
--- a/src/qml/compiler/qv4compileddata_p.h
+++ b/src/qml/compiler/qv4compileddata_p.h
@@ -801,11 +801,7 @@ struct TypeReference
         , errorWhenNotFound(false)
     {}
     Location location; // first use
-#ifndef QT_NO_BITFIELDS
     bool needsCreation : 1; // whether the type needs to be creatable or not
-#else
-    bool needsCreation = 1;
-#endif
     bool errorWhenNotFound: 1;
 };
 
diff --git a/src/qml/jsruntime/qv4global_p.h b/src/qml/jsruntime/qv4global_p.h
index 382dd9b7e1..7f82a02ae0 100644
--- a/src/qml/jsruntime/qv4global_p.h
+++ b/src/qml/jsruntime/qv4global_p.h
@@ -267,7 +267,6 @@ struct PropertyAttributes
             uchar m_mask : 4;
         };
         struct {
-#ifndef QT_NO_BITFIELDS
             uchar m_type : 1;
             uchar m_writable : 1;
             uchar m_enumerable : 1;
@@ -276,16 +275,6 @@ struct PropertyAttributes
             uchar writable_set : 1;
             uchar enumerable_set : 1;
             uchar configurable_set : 1;
-#else
-            uchar m_type = 1;
-            uchar m_writable = 1;
-            uchar m_enumerable = 1;
-            uchar m_configurable = 1;
-            uchar type_set = 1;
-            uchar writable_set = 1;
-            uchar enumerable_set = 1;
-            uchar configurable_set = 1;
-#endif
         };
     };
 
diff --git a/src/qml/memory/qv4heap_p.h b/src/qml/memory/qv4heap_p.h
index 63d6b0a609..53933cd090 100644
--- a/src/qml/memory/qv4heap_p.h
+++ b/src/qml/memory/qv4heap_p.h
@@ -70,7 +70,6 @@ struct InternalClass;
 struct VTable
 {
     const VTable * const parent;
-#ifndef QT_NO_BITFIELDS
     uint inlinePropertyOffset : 16;
     uint nInlineProperties : 16;
     uint isExecutionContext : 1;
@@ -81,18 +80,6 @@ struct VTable
     uint isArrayData : 1;
     uint unused : 18;
     uint type : 8;
-#else
-    uint inlinePropertyOffset = 16;
-    uint nInlineProperties = 16;
-    uint isExecutionContext = 1;
-    uint isString = 1;
-    uint isObject = 1;
-    uint isFunctionObject = 1;
-    uint isErrorObject = 1;
-    uint isArrayData = 1;
-    uint unused = 18;
-    uint type = 8;
-#endif
     const char *className;
     void (*destroy)(Heap::Base *);
     void (*markObjects)(Heap::Base *, MarkStack *markStack);
diff --git a/src/qml/qml/qqmlpropertycache_p.h b/src/qml/qml/qqmlpropertycache_p.h
index 5553fe6b80..51a191a41f 100644
--- a/src/qml/qml/qqmlpropertycache_p.h
+++ b/src/qml/qml/qqmlpropertycache_p.h
@@ -108,7 +108,6 @@ public:
         enum { BitsLeftInFlags = 10 };
         unsigned _otherBits       : BitsLeftInFlags; // align to 32 bits
 
-#ifndef QT_NO_BITFIELDS
         // Can apply to all properties, except IsFunction
         unsigned isConstant       : 1; // Has CONST flag
         unsigned isWritable       : 1; // Has WRITE function
@@ -134,33 +133,7 @@ public:
         // Internal QQmlPropertyCache flags
         unsigned notFullyResolved : 1; // True if the type data is to be lazily resolved
         unsigned overrideIndexIsProperty: 1;
-#else
-        unsigned isConstant       = 1; // Has CONST flag
-        unsigned isWritable       = 1; // Has WRITE function
-        unsigned isResettable     = 1; // Has RESET function
-        unsigned isAlias          = 1; // Is a QML alias to another property
-        unsigned isFinal          = 1; // Has FINAL flag
-        unsigned isOverridden     = 1; // Is overridden by a extension property
-        unsigned isDirect         = 1; // Exists on a C++ QMetaObject
 
-        unsigned type             = 4; // stores an entry of Types
-
-        // Apply only to IsFunctions
-        unsigned isVMEFunction    = 1; // Function was added by QML
-        unsigned hasArguments     = 1; // Function takes arguments
-        unsigned isSignal         = 1; // Function is a signal
-        unsigned isVMESignal      = 1; // Signal was added by QML
-        unsigned isV4Function     = 1; // Function takes QQmlV4Function* args
-        unsigned isSignalHandler  = 1; // Function is a signal handler
-        unsigned isOverload       = 1; // Function is an overload of another function
-        unsigned isCloned         = 1; // The function was marked as cloned
-        unsigned isConstructor    = 1; // The function was marked is a constructor
-
-        // Internal QQmlPropertyCache flags
-        unsigned notFullyResolved = 1; // True if the type data is to be lazily resolved
-        unsigned overrideIndexIsProperty = 1;
-
-#endif
         inline Flags();
         inline bool operator==(const Flags &other) const;
         inline void copyPropertyTypeFlags(Flags from);
diff --git a/src/qml/qml/qqmltypeloader_p.h b/src/qml/qml/qqmltypeloader_p.h
index e1a7ac7f06..713f707387 100644
--- a/src/qml/qml/qqmltypeloader_p.h
+++ b/src/qml/qml/qqmltypeloader_p.h
@@ -217,15 +217,9 @@ private:
     // List of QQmlDataBlob's that I am waiting for to complete.
     QList<QQmlDataBlob *> m_waitingFor;
 
-#ifndef QT_NO_BITFIELDS
     int m_redirectCount:30;
     bool m_inCallback:1;
     bool m_isDone:1;
-#else
-    int m_redirectCount = 30;
-    bool m_inCallback = 1;
-    bool m_isDone =1;
-#endif
 };
 
 class QQmlTypeLoaderThread;