aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/compiler/qv4regalloc.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2014-01-24 10:21:32 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-24 10:25:46 +0100
commitf9ba7d29464eb7f13004918faa73d37f7b4ea725 (patch)
tree2e031d4ce96214d8301c22a74a50efcb37603a6c /src/qml/compiler/qv4regalloc.cpp
parentbeffe565e3511bdd01a967303066a5dce88022f4 (diff)
parent5225a0f570e6a5dbd9b3453123eb85031656ad19 (diff)
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable
Diffstat (limited to 'src/qml/compiler/qv4regalloc.cpp')
-rw-r--r--src/qml/compiler/qv4regalloc.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/qml/compiler/qv4regalloc.cpp b/src/qml/compiler/qv4regalloc.cpp
index b80e5d3ee8..a3255f26f7 100644
--- a/src/qml/compiler/qv4regalloc.cpp
+++ b/src/qml/compiler/qv4regalloc.cpp
@@ -956,9 +956,6 @@ private:
moveTo = createTemp(Temp::StackSlot, spillSlot, it->temp().type);
} else {
moveTo = createTemp(Temp::PhysicalRegister, platformRegister(*it), it->temp().type);
- const int spillSlot = _assignedSpillSlots.value(it->temp(), -1);
- if (isPhiTarget && spillSlot != -1)
- mapping.add(moveFrom, createTemp(Temp::StackSlot, spillSlot, it->temp().type));
}
// add move to mapping