diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-05-04 10:20:20 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-05-04 10:20:49 +0200 |
| commit | 1648c166dbb541bbe663f3d6e5ad2a39d0735aea (patch) | |
| tree | 099a31921aa2f9ab605fb1d8c3ffcaa030f75793 /src/qml/compiler | |
| parent | 6c1d99c2490e1af5c42d03cf10e8fe4d2e30c025 (diff) | |
| parent | 2fdb6eba0a58b629db32f9eefec2f26df08d3d2e (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Change-Id: Ie8ea118ed0a1a9a1c3d81e1e34d85c03c695c9a4
Diffstat (limited to 'src/qml/compiler')
| -rw-r--r-- | src/qml/compiler/qv4codegen.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/compiler/qv4codegen.cpp b/src/qml/compiler/qv4codegen.cpp index 02274ca793..9168889c8c 100644 --- a/src/qml/compiler/qv4codegen.cpp +++ b/src/qml/compiler/qv4codegen.cpp @@ -538,7 +538,7 @@ IR::Expr *Codegen::subscript(IR::Expr *base, IR::Expr *index) IR::Expr *Codegen::argument(IR::Expr *expr) { - if (expr && !expr->asTemp() && !expr->asArgLocal()) { + if (expr && !expr->asTemp()) { const unsigned t = _block->newTemp(); move(_block->TEMP(t), expr); expr = _block->TEMP(t); |