Merge pull request #2697 from endrift/fix-jit-trampoline

Common: CallLambdaTrampoline can return a value

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 <typename T, typename... Args>
-	static void CallLambdaTrampoline(const std::function<T(Args...)>* f,
+	static T CallLambdaTrampoline(const std::function<T(Args...)>* f, Args... args)
-	                                 Args... args)
 	{
-		(*f)(args...);
+		return (*f)(args...);
 	}
 
 	// This function expects you to have set up the state.

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 <typename T, typename... Args>
-	static void CallLambdaTrampoline(const std::function<T(Args...)>* f,
+	static T CallLambdaTrampoline(const std::function<T(Args...)>* f, Args... args)
-	                                 Args... args)
 	{
-		(*f)(args...);
+		return (*f)(args...);
 	}
 
 	template <typename T, typename... Args>