diff options
author | Lars Knoll <lars.knoll@theqtcompany.com> | 2014-11-18 21:22:44 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-12-20 15:16:39 +0100 |
commit | e7b66a60584b3fcb1436a7dbe8396b71cb69fe1b (patch) | |
tree | 4ff62f582408df5e948063c18420f61b262c7334 /src/qml/jsruntime/qv4vme_moth.cpp | |
parent | 74c658bb631fd5bab433b9867ff2e568a56ec082 (diff) |
Make Managed inherit Value
This completes the first milestone towards being able to move
objects across the GC heap.
Change-Id: I8e6ce90254ea767188a31f0dc85b133534c87eb0
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4vme_moth.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4vme_moth.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4vme_moth.cpp b/src/qml/jsruntime/qv4vme_moth.cpp index eb5fd1bcd8..e86c673bf1 100644 --- a/src/qml/jsruntime/qv4vme_moth.cpp +++ b/src/qml/jsruntime/qv4vme_moth.cpp @@ -145,7 +145,7 @@ QV4::ReturnedValue VME::run(ExecutionEngine *engine, const uchar *code QV4::Scope scope(engine); QV4::ScopedContext context(scope, engine->currentContext()); - context->d()->lineNumber = -1; + engine->currentContext()->lineNumber = -1; #ifdef DO_TRACE_INSTR qDebug("Starting VME with context=%p and code=%p", context, code); @@ -616,14 +616,14 @@ QV4::ReturnedValue VME::run(ExecutionEngine *engine, const uchar *code MOTH_END_INSTR(Ret) MOTH_BEGIN_INSTR(Debug) - context->d()->lineNumber = instr.lineNumber; + engine->currentContext()->lineNumber = instr.lineNumber; QV4::Debugging::Debugger *debugger = context->engine()->debugger; if (debugger && debugger->pauseAtNextOpportunity()) debugger->maybeBreakAtInstruction(); MOTH_END_INSTR(Debug) MOTH_BEGIN_INSTR(Line) - context->d()->lineNumber = instr.lineNumber; + engine->currentContext()->lineNumber = instr.lineNumber; MOTH_END_INSTR(Debug) MOTH_BEGIN_INSTR(LoadThis) |