From cc7a858698063649f9770a89949354e2b58ae288 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Wed, 30 Aug 2017 15:16:15 +0200
Subject: Unify JSStackFrame and CallData

Change-Id: I4494dae8166026074c9efc74bac62de9d3fa2342
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 src/qml/jsruntime/qv4engine_p.h | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

(limited to 'src/qml/jsruntime/qv4engine_p.h')

diff --git a/src/qml/jsruntime/qv4engine_p.h b/src/qml/jsruntime/qv4engine_p.h
index 4cee69ed33..fcadf57508 100644
--- a/src/qml/jsruntime/qv4engine_p.h
+++ b/src/qml/jsruntime/qv4engine_p.h
@@ -87,26 +87,10 @@ struct CompilationUnit;
 struct InternalClass;
 struct InternalClassPool;
 
-struct JSStackFrame {
-    enum Offsets {
-        JSFunction = 0,
-        Context = 1,
-        Accumulator = 2
-    };
-    // callData is directly before this
-    union {
-        Value jsFunction;
-        Value stack[1];
-    };
-    Value context;
-    Value accumulator; // ###
-    // registers follow
-};
-
 struct Q_QML_EXPORT CppStackFrame {
     CppStackFrame *parent;
     Function *v4Function;
-    JSStackFrame *jsFrame;
+    CallData *jsFrame;
     const uchar *instructionPointer;
 
     QString source() const;
-- 
cgit v1.2.3