diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-08-30 15:16:15 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-09-01 12:30:43 +0000 |
| commit | cc7a858698063649f9770a89949354e2b58ae288 (patch) | |
| tree | 5a79c1335192ed757edd69b5b9ded873423aa0bd /src/qml/compiler/qv4codegen_p.h | |
| parent | 20596907289d50be3a5e1597ba62cefb733e6f19 (diff) | |
Unify JSStackFrame and CallData
Change-Id: I4494dae8166026074c9efc74bac62de9d3fa2342
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/compiler/qv4codegen_p.h')
| -rw-r--r-- | src/qml/compiler/qv4codegen_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/compiler/qv4codegen_p.h b/src/qml/compiler/qv4codegen_p.h index 5f6385fd62..2ccf97d7a2 100644 --- a/src/qml/compiler/qv4codegen_p.h +++ b/src/qml/compiler/qv4codegen_p.h @@ -201,7 +201,7 @@ public: bool isAccumulator() const { return type == Accumulator; } bool isStackSlot() const { return type == StackSlot; } bool isRegister() const { - return isStackSlot() && theStackSlot.isRegister(); + return isStackSlot(); } static Reference fromAccumulator(Codegen *cg) { @@ -217,7 +217,7 @@ public: } static Reference fromArgument(Codegen *cg, int index) { Reference r(cg, StackSlot); - r.theStackSlot = Moth::StackSlot::createArgument(cg->currentContext()->arguments.size(), index); + r.theStackSlot = Moth::StackSlot::createRegister(index + sizeof(CallData)/sizeof(Value) - 1); r.stackSlotIsLocalOrArgument = true; return r; } |