X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Flibjit.c;h=23d53c16a4efe9ceb70702c1bf9634e4b36e5b1c;hb=5e240548ba570610ce0dbc248a2b7654a0e080fa;hp=de743a1295fd7bc1ec128703d461814d61e8d154;hpb=898c6dac30d12d7fe56662d66a8e73c340926d64;p=m6w6%2Fext-psi

diff --git a/src/libjit.c b/src/libjit.c
index de743a1..23d53c1 100644
--- a/src/libjit.c
+++ b/src/libjit.c
@@ -1,5 +1,7 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
+#else
+# include "php_config.h"
 #endif
 
 #include "php.h"
@@ -178,10 +180,6 @@ static inline jit_type_t psi_jit_decl_arg_type(decl_arg *darg) {
 struct psi_jit_context {
 	jit_context_t jit;
 	jit_type_t signature;
-	struct {
-		struct psi_jit_data **list;
-		size_t count;
-	} data;
 };
 
 struct psi_jit_call {
@@ -190,12 +188,6 @@ struct psi_jit_call {
 	void *params[1]; /* [type1, type2, NULL, arg1, arg2] ... */
 };
 
-struct psi_jit_data {
-	struct psi_jit_context *context;
-	impl *impl;
-	zend_internal_arg_info *arginfo;
-};
-
 static inline struct psi_jit_call *psi_jit_call_alloc(struct psi_context *C, decl *decl) {
 	size_t i, c = decl->args ? decl->args->count : 0;
 	struct psi_jit_call *call = calloc(1, sizeof(*call) + 2 * c * sizeof(void *));
@@ -386,12 +378,12 @@ static zend_function_entry *psi_jit_compile(struct psi_context *C)
 		if (!impl->decl) {
 			continue;
 		}
-
-		if ((call = psi_jit_call_alloc(C, impl->decl))) {
-			if (!psi_jit_call_init_closure(C, call, impl)) {
-				psi_jit_call_free(call);
-				continue;
-			}
+		if (!(call = psi_jit_call_alloc(C, impl->decl))) {
+			continue;
+		}
+		if (!psi_jit_call_init_closure(C, call, impl)) {
+			psi_jit_call_free(call);
+			continue;
 		}
 
 		zf->fname = impl->func->name + (impl->func->name[0] == '\\');