Remove now dead V4_BOOTSTRAP #if-ery

Change-Id: I04f8f69ed8ee415ca330e2f7beeffc4ee4c38e65
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 
 
 

6 files changed, 0 insertions, 29 deletions

diff --git a/src/qml/jsruntime/qv4enginebase_p.h b/src/qml/jsruntime/qv4enginebase_p.h
index 00876c71a2..788897bdad 100644
--- a/src/qml/jsruntime/qv4enginebase_p.h
+++ b/src/qml/jsruntime/qv4enginebase_p.h
@@ -147,10 +147,7 @@ Q_STATIC_ASSERT(offsetof(EngineBase, jsStackTop) == offsetof(EngineBase, current
 Q_STATIC_ASSERT(offsetof(EngineBase, hasException) == offsetof(EngineBase, jsStackTop) + QT_POINTER_SIZE);
 Q_STATIC_ASSERT(offsetof(EngineBase, memoryManager) == offsetof(EngineBase, hasException) + 8);
 Q_STATIC_ASSERT(offsetof(EngineBase, runtime) == offsetof(EngineBase, memoryManager) + QT_POINTER_SIZE);
-
-#ifndef V4_BOOTSTRAP
 Q_STATIC_ASSERT(offsetof(EngineBase, isInterrupted) + sizeof(EngineBase::isInterrupted) <= offsetof(EngineBase, hasException) + 4);
-#endif
 
 }
 
diff --git a/src/qml/jsruntime/qv4lookup_p.h b/src/qml/jsruntime/qv4lookup_p.h
index f2e0afd797..94bf1a98ae 100644
--- a/src/qml/jsruntime/qv4lookup_p.h
+++ b/src/qml/jsruntime/qv4lookup_p.h
@@ -54,11 +54,8 @@
 #include "qv4runtime_p.h"
 #include "qv4engine_p.h"
 #include "qv4context_p.h"
-
-#if !defined(V4_BOOTSTRAP)
 #include "qv4object_p.h"
 #include "qv4internalclass_p.h"
-#endif
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qml/jsruntime/qv4object_p.h b/src/qml/jsruntime/qv4object_p.h
index 52ad3ea319..f3375929a3 100644
--- a/src/qml/jsruntime/qv4object_p.h
+++ b/src/qml/jsruntime/qv4object_p.h
@@ -543,13 +543,11 @@ inline const ArrayObject *Value::as() const {
     return isManaged() && m()->internalClass->vtable->type == Managed::Type_ArrayObject ? static_cast<const ArrayObject *>(this) : nullptr;
 }
 
-#ifndef V4_BOOTSTRAP
 template<>
 inline ReturnedValue value_convert<Object>(ExecutionEngine *e, const Value &v)
 {
     return v.toObject(e)->asReturnedValue();
 }
-#endif
 
 }
 
diff --git a/src/qml/jsruntime/qv4stackframe_p.h b/src/qml/jsruntime/qv4stackframe_p.h
index 51a6acf43c..bf689a74bc 100644
--- a/src/qml/jsruntime/qv4stackframe_p.h
+++ b/src/qml/jsruntime/qv4stackframe_p.h
@@ -53,9 +53,7 @@
 #include <private/qv4context_p.h>
 #include <private/qv4enginebase_p.h>
 #include <private/qv4calldata_p.h>
-#ifndef V4_BOOTSTRAP
 #include <private/qv4function_p.h>
-#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -107,7 +105,6 @@ struct Q_QML_EXPORT CppStackFrame {
         engine->jsStackTop = savedStackTop;
     }
 
-#ifndef V4_BOOTSTRAP
     static uint requiredJSStackFrameSize(uint nRegisters) {
         return CallData::HeaderSize() + nRegisters;
     }
@@ -150,7 +147,6 @@ struct Q_QML_EXPORT CppStackFrame {
                 *v = Value::emptyValue().asReturnedValue();
         }
     }
-#endif
 
     QString source() const;
     QString function() const;
diff --git a/src/qml/jsruntime/qv4string.cpp b/src/qml/jsruntime/qv4string.cpp
index 24a17bf5d5..223f4a4769 100644
--- a/src/qml/jsruntime/qv4string.cpp
+++ b/src/qml/jsruntime/qv4string.cpp
@@ -39,19 +39,15 @@
 
 #include "qv4string_p.h"
 #include "qv4value_p.h"
-#ifndef V4_BOOTSTRAP
 #include "qv4identifiertable_p.h"
 #include "qv4runtime_p.h"
 #include "qv4objectproto_p.h"
 #include "qv4stringobject_p.h"
-#endif
 #include <QtCore/QHash>
 #include <QtCore/private/qnumeric_p.h>
 
 using namespace QV4;
 
-#ifndef V4_BOOTSTRAP
-
 void Heap::StringOrSymbol::markObjects(Heap::Base *that, MarkStack *markStack)
 {
     StringOrSymbol *s = static_cast<StringOrSymbol *>(that);
@@ -254,5 +250,3 @@ qint64 String::virtualGetLength(const Managed *m)
 {
     return static_cast<const String *>(m)->d()->length();
 }
-
-#endif // V4_BOOTSTRAP
diff --git a/src/qml/jsruntime/qv4string_p.h b/src/qml/jsruntime/qv4string_p.h
index a986fe185e..7888809490 100644
--- a/src/qml/jsruntime/qv4string_p.h
+++ b/src/qml/jsruntime/qv4string_p.h
@@ -105,7 +105,6 @@ struct Q_QML_PRIVATE_EXPORT StringOrSymbol : Base
 struct Q_QML_PRIVATE_EXPORT String : StringOrSymbol {
     static void markObjects(Heap::Base *that, MarkStack *markStack);
 
-#ifndef V4_BOOTSTRAP
     const VTable *vtable() const {
         return internalClass->vtable;
     }
@@ -141,11 +140,9 @@ struct Q_QML_PRIVATE_EXPORT String : StringOrSymbol {
 
 private:
     static void append(const String *data, QChar *ch);
-#endif
 };
 Q_STATIC_ASSERT(std::is_trivial< String >::value);
 
-#ifndef V4_BOOTSTRAP
 struct ComplexString : String {
     void init(String *l, String *n);
     void init(String *ref, int from, int len);
@@ -163,12 +160,10 @@ inline
 int String::length() const {
     return text ? text->size : static_cast<const ComplexString *>(this)->len;
 }
-#endif
 
 }
 
 struct Q_QML_PRIVATE_EXPORT StringOrSymbol : public Managed {
-#ifndef V4_BOOTSTRAP
     V4_MANAGED(StringOrSymbol, Managed)
     V4_NEEDS_DESTROY
     enum {
@@ -185,11 +180,9 @@ public:
     inline QString toQString() const {
         return d()->toQString();
     }
-#endif
 };
 
 struct Q_QML_PRIVATE_EXPORT String : public StringOrSymbol {
-#ifndef V4_BOOTSTRAP
     V4_MANAGED(String, StringOrSymbol)
     Q_MANAGED_TYPE(String)
     V4_INTERNALCLASS(String)
@@ -240,7 +233,6 @@ struct Q_QML_PRIVATE_EXPORT String : public StringOrSymbol {
 protected:
     static bool virtualIsEqualTo(Managed *that, Managed *o);
     static qint64 virtualGetLength(const Managed *m);
-#endif
 
 public:
     template <typename T>
@@ -265,7 +257,6 @@ public:
     }
 };
 
-#ifndef V4_BOOTSTRAP
 struct ComplexString : String {
     typedef QV4::Heap::ComplexString Data;
     QV4::Heap::ComplexString *d_unchecked() const { return static_cast<QV4::Heap::ComplexString *>(m()); }
@@ -304,8 +295,6 @@ inline ReturnedValue value_convert<String>(ExecutionEngine *e, const Value &v)
 {
     return v.toString(e)->asReturnedValue();
 }
-#endif
-
 
 }