1 files changed, 42 insertions, 9 deletions

diff --git a/src/qml/jsruntime/qv4engine_p.h b/src/qml/jsruntime/qv4engine_p.h
index aeb2533d35..843a6f4d94 100644
--- a/src/qml/jsruntime/qv4engine_p.h
+++ b/src/qml/jsruntime/qv4engine_p.h
@@ -54,7 +54,7 @@
 #include "private/qv4isel_p.h"
 #include "qv4managed_p.h"
 #include "qv4context_p.h"
-#include "qv4internalclass_p.h"
+#include "qv4runtimeapi_p.h"
 #include <private/qintrusivelist_p.h>
 
 #ifndef V4_BOOTSTRAP
@@ -85,6 +85,9 @@ namespace CompiledData {
 struct CompilationUnit;
 }
 
+struct InternalClass;
+struct InternalClassPool;
+
 struct Q_QML_EXPORT ExecutionEngine
 {
 private:
@@ -109,6 +112,8 @@ public:
 
     Value *jsStackLimit;
 
+    Runtime runtime;
+
     WTF::BumpPointerAllocator *bumperPointerAllocator; // Used by Yarr Regex engine.
 
     enum { JSStackLimit = 4*1024*1024 };
@@ -132,9 +137,6 @@ public:
 
     IdentifierTable *identifierTable;
 
-    QV4::Debugging::Debugger *debugger;
-    QV4::Profiling::Profiler *profiler;
-
     Object *globalObject;
 
     Function *globalCode;
@@ -377,8 +379,19 @@ public:
     ExecutionEngine(EvalISelFactory *iselFactory = 0);
     ~ExecutionEngine();
 
+#ifdef QT_NO_QML_DEBUGGER
+    QV4::Debugging::Debugger *debugger() const { return nullptr; }
+    QV4::Profiling::Profiler *profiler() const { return nullptr; }
+
+    void setDebugger(Debugging::Debugger *) {}
+    void setProfiler(Profiling::Profiler *) {}
+#else
+    QV4::Debugging::Debugger *debugger() const { return m_debugger; }
+    QV4::Profiling::Profiler *profiler() const { return m_profiler; }
+
     void setDebugger(Debugging::Debugger *debugger);
-    void enableProfiler();
+    void setProfiler(Profiling::Profiler *profiler);
+#endif // QT_NO_QML_DEBUGGER
 
     ExecutionContext *pushGlobalContext();
     void pushContext(Heap::ExecutionContext *context);
@@ -406,6 +419,7 @@ public:
 
     Heap::DateObject *newDateObject(const Value &value);
     Heap::DateObject *newDateObject(const QDateTime &dt);
+    Heap::DateObject *newDateObjectFromTime(const QTime &t);
 
     Heap::RegExpObject *newRegExpObject(const QString &pattern, int flags);
     Heap::RegExpObject *newRegExpObject(RegExp *re, bool global);
@@ -475,9 +489,28 @@ public:
 
     void assertObjectBelongsToEngine(const Heap::Base &baseObject);
 
-    bool checkStackLimits(ReturnedValue &exception);
+    bool checkStackLimits(Scope &scope);
+
+private:
+    void failStackLimitCheck(Scope &scope);
+
+#ifndef QT_NO_QML_DEBUGGER
+    QV4::Debugging::Debugger *m_debugger;
+    QV4::Profiling::Profiler *m_profiler;
+#endif
 };
 
+// This is a trick to tell the code generators that functions taking a NoThrowContext won't
+// throw exceptions and therefore don't need a check after the call.
+#ifndef V4_BOOTSTRAP
+struct NoThrowEngine : public ExecutionEngine
+{
+};
+#else
+struct NoThrowEngine;
+#endif
+
+
 inline void ExecutionEngine::pushContext(Heap::ExecutionContext *context)
 {
     Q_ASSERT(currentContext && context);
@@ -557,7 +590,7 @@ inline void Value::mark(ExecutionEngine *e)
         o->mark(e);
 }
 
-#define CHECK_STACK_LIMITS(v4) { ReturnedValue e; if ((v4)->checkStackLimits(e)) return e; } \
+#define CHECK_STACK_LIMITS(v4, scope) if ((v4)->checkStackLimits(scope)) return; \
     ExecutionEngineCallDepthRecorder _executionEngineCallDepthRecorder(v4);
 
 struct ExecutionEngineCallDepthRecorder
@@ -568,10 +601,10 @@ struct ExecutionEngineCallDepthRecorder
     ~ExecutionEngineCallDepthRecorder() { --ee->callDepth; }
 };
 
-inline bool ExecutionEngine::checkStackLimits(ReturnedValue &exception)
+inline bool ExecutionEngine::checkStackLimits(Scope &scope)
 {
     if (Q_UNLIKELY((jsStackTop > jsStackLimit) || (callDepth >= maxCallDepth))) {
-        exception = throwRangeError(QStringLiteral("Maximum call stack size exceeded."));
+        failStackLimitCheck(scope);
         return true;
     }