Passing node loader to callback trampoline in node loader.

Author: viferga

source/loaders/node_loader/source/node_loader_impl.cpp

@@ -224,6 +224,7 @@ typedef napi_value (*future_reject_trampoline)(loader_impl_node, future_reject_c
 
 typedef struct loader_impl_async_future_await_trampoline_type
 {
+	loader_impl_node node_loader;
 	future_resolve_trampoline resolve_trampoline;
 	future_reject_trampoline reject_trampoline;
 	future_resolve_callback resolve_callback;
@@ -1301,6 +1302,7 @@ void node_loader_impl_async_future_await(uv_async_t * async)
 		napi_ref trampoline_ref;
 
 		/* Set trampoline object values */
+		trampoline->node_loader = async_data->node_impl;
 		trampoline->resolve_trampoline = &node_loader_impl_async_future_resolve;
 		trampoline->reject_trampoline = &node_loader_impl_async_future_reject;
 		trampoline->resolve_callback = async_data->resolve_callback;

source/loaders/node_loader/trampoline/CMakeLists.txt

@@ -56,7 +56,7 @@ if(MSVC)
 		FOLDER "${IDE_FOLDER}"
 	)
 
-	add_dependencies(${target} ${target_binding})
+	add_dependencies(${target_binding} ${target})
 else()
 	add_custom_target(${target} ALL
 		WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}

source/loaders/node_loader/trampoline/source/trampoline.cc

@@ -31,6 +31,7 @@ typedef napi_value (*future_reject_trampoline)(void *, future_reject_callback, n
 
 typedef struct loader_impl_async_future_await_trampoline_type
 {
+	void * node_loader;
 	future_resolve_trampoline resolve_trampoline;
 	future_reject_trampoline reject_trampoline;
 	future_resolve_callback resolve_callback;
@@ -169,10 +170,8 @@ napi_value node_loader_trampoline_resolve(napi_env env, napi_callback_info info)
 	napi_value args[args_size];
 	napi_valuetype valuetype[args_size];
 
-	void * node_loader;
-
 	/* Parse arguments */
-	status = napi_get_cb_info(env, info, &argc, args, nullptr, &node_loader);
+	status = napi_get_cb_info(env, info, &argc, args, nullptr, nullptr);
 
 	assert(status == napi_ok);
 
@@ -214,7 +213,7 @@ napi_value node_loader_trampoline_resolve(napi_env env, napi_callback_info info)
 	/* Execute the callback */
 	loader_impl_async_future_await_trampoline trampoline = static_cast<loader_impl_async_future_await_trampoline>(result);
 
-	return trampoline->resolve_trampoline(node_loader, trampoline->resolve_callback, args[1], trampoline->context);
+	return trampoline->resolve_trampoline(trampoline->node_loader, trampoline->resolve_callback, args[1], trampoline->context);
 }
 
 napi_value node_loader_trampoline_reject(napi_env env, napi_callback_info info)
@@ -227,10 +226,8 @@ napi_value node_loader_trampoline_reject(napi_env env, napi_callback_info info)
 	napi_value args[args_size];
 	napi_valuetype valuetype[args_size];
 
-	void * node_loader;
-
 	/* Parse arguments */
-	status = napi_get_cb_info(env, info, &argc, args, nullptr, &node_loader);
+	status = napi_get_cb_info(env, info, &argc, args, nullptr, nullptr);
 
 	assert(status == napi_ok);
 
@@ -272,7 +269,7 @@ napi_value node_loader_trampoline_reject(napi_env env, napi_callback_info info)
 	/* Execute the callback */
 	loader_impl_async_future_await_trampoline trampoline = static_cast<loader_impl_async_future_await_trampoline>(result);
 
-	return trampoline->reject_trampoline(node_loader, trampoline->reject_callback, args[1], trampoline->context);
+	return trampoline->reject_trampoline(trampoline->node_loader, trampoline->reject_callback, args[1], trampoline->context);
 }
 
 napi_value node_loader_trampoline_initialize(napi_env env, napi_value exports)