From: Simon Hausmann <simon.hausmann@digia.com>
Date: Fri, 21 Jun 2013 06:58:02 +0000 (+0200)
Subject: Prospective fix for JIT crashes on ARM
X-Git-Tag: upstream/5.2.1~669^2~147
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f750c25593ff047163b236efe3f70992a2045565;p=platform%2Fupstream%2Fqtdeclarative.git

Prospective fix for JIT crashes on ARM

Don't do the ret(n) cleanup dance on ARM, as the address of where to
store the return value is provided in r0 and therefore there's nothing
to clean up.

Change-Id: I5b34355e52c9d374d31981361bdfb67193530d38
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
---

diff --git a/src/qml/qml/v4/qv4isel_masm.cpp b/src/qml/qml/v4/qv4isel_masm.cpp
index fce0252..98d357a 100644
--- a/src/qml/qml/v4/qv4isel_masm.cpp
+++ b/src/qml/qml/v4/qv4isel_masm.cpp
@@ -1283,7 +1283,7 @@ void InstructionSelection::visitRet(V4IR::Ret *s)
     }
 
     _as->leaveStandardStackFrame(_locals);
-#if !defined(RETURN_VALUE_IN_REGISTER)
+#if !defined(ARGUMENTS_IN_REGISTERS) && !defined(RETURN_VALUE_IN_REGISTER)
     // Emulate ret(n) instruction
     // Pop off return address into scratch register ...
     _as->pop(Assembler::ScratchRegister);