diff options
| author | Erik Verbruggen <erik.verbruggen@me.com> | 2013-09-13 12:06:45 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-25 09:46:09 +0200 |
| commit | 226f8cc9fe166ba15ead8e6fdefe9bbaad40b697 (patch) | |
| tree | 702565a2f6c3218af1c7b113f2a97e384912af3b | |
| parent | 0bf86704fc1a5239cf3e8b468ccbafe8d9878eec (diff) | |
V4: re-enable SSA transformation and optimization.
But keep the register allocator disabled for now.
Change-Id: I475835ec35ef31d76e084788a754c00b1f8fdda6
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| -rw-r--r-- | src/qml/compiler/qv4isel_masm.cpp | 2 | ||||
| -rw-r--r-- | src/qml/compiler/qv4ssa.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/compiler/qv4isel_masm.cpp b/src/qml/compiler/qv4isel_masm.cpp index 7d43066d3e..27cc764f2d 100644 --- a/src/qml/compiler/qv4isel_masm.cpp +++ b/src/qml/compiler/qv4isel_masm.cpp @@ -620,7 +620,7 @@ void InstructionSelection::run(int functionIndex) opt.run(); #if CPU(X86_64) && (OS(MAC_OS_X) || OS(LINUX)) - static const bool withRegisterAllocator = qgetenv("QV4_NO_REGALLOC").isEmpty(); + static const bool withRegisterAllocator = qgetenv("QV4_NO_REGALLOC").isEmpty() && false; // disabled for now if (opt.isInSSA() && withRegisterAllocator) { static const QVector<int> intRegisters = QVector<int>() << JSC::X86Registers::edi diff --git a/src/qml/compiler/qv4ssa.cpp b/src/qml/compiler/qv4ssa.cpp index f44203817b..6617cfeb82 100644 --- a/src/qml/compiler/qv4ssa.cpp +++ b/src/qml/compiler/qv4ssa.cpp @@ -2786,7 +2786,7 @@ void Optimizer::run() // showMeTheCode(function); - static bool doSSA = /*qgetenv("QV4_NO_SSA").isEmpty();*/ false; + static bool doSSA = qgetenv("QV4_NO_SSA").isEmpty();; static bool doOpt = qgetenv("QV4_NO_OPT").isEmpty(); if (!function->hasTry && !function->hasWith && doSSA) { |