From c9a25f9484d9a1e1dd6037ebd7a7c130ac40cfde Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Fri, 3 Jul 2015 22:27:36 -0700 Subject: [PATCH] Common: CallLambdaTrampoline can return a value As it is currently written, CallLambdaTrampoline does not return a value. However, some of the functions that are being wrapped may return a value that the JIT is expected to understand. A compiler *cough cough clang* may opt to alter %rax after the wrapped lambda returns, e.g. popping a previous value, which can clobber the return value. If we actually have a return value, then the compiler must not clobber it. --- Source/Core/Common/Arm64Emitter.h | 5 ++--- Source/Core/Common/x64Emitter.h | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Source/Core/Common/Arm64Emitter.h b/Source/Core/Common/Arm64Emitter.h index 6db19dc890..6939984308 100644 --- a/Source/Core/Common/Arm64Emitter.h +++ b/Source/Core/Common/Arm64Emitter.h @@ -711,10 +711,9 @@ public: // (this method might be a thunk in the case of multi-inheritance) so we // have to go through a trampoline function. template - static void CallLambdaTrampoline(const std::function* f, - Args... args) + static T CallLambdaTrampoline(const std::function* f, Args... args) { - (*f)(args...); + return (*f)(args...); } // This function expects you to have set up the state. diff --git a/Source/Core/Common/x64Emitter.h b/Source/Core/Common/x64Emitter.h index 7e3b64f49e..f6faea44bd 100644 --- a/Source/Core/Common/x64Emitter.h +++ b/Source/Core/Common/x64Emitter.h @@ -971,10 +971,9 @@ public: // (this method might be a thunk in the case of multi-inheritance) so we // have to go through a trampoline function. template - static void CallLambdaTrampoline(const std::function* f, - Args... args) + static T CallLambdaTrampoline(const std::function* f, Args... args) { - (*f)(args...); + return (*f)(args...); } template