flush

[m6w6/ext-psi] / src / libjit.c

diff --git a/src/libjit.c b/src/libjit.c
index 055ba1b125ece773ddb560c53c7c56f79fbd8b76..ee9b1f341bb7d5380f4fb069d711f4ee74702b76 100644 (file)
--- a/src/libjit.c
+++ b/src/libjit.c
@@ -163,13 +163,13 @@ static void psi_jit_handler(jit_type_t _sig, void *result, void **_args, void *_
 
        jit_apply(data->signature, data->impl->decl->dlptr, arg_prm, data->impl->decl->args->count, &ret_val);
 
-       psi_do_return(data->impl, &ret_val, *(zval **)_args[1]);
+       psi_do_return(data->impl->stmts->ret.list[0], &ret_val, *(zval **)_args[1]);
 
        for (i = 0; i < data->impl->stmts->set.count; ++i) {
                set_stmt *set = data->impl->stmts->set.list[i];
 
                if (set->arg->_zv) {
-                       psi_do_set(set->arg->_zv, set->val->func, set->val->vars);
+                       psi_do_set(set->arg->_zv, set->val);
                }
        }
 
@@ -196,25 +196,30 @@ static void psi_jit_dtor(PSI_Context *C)
        PSI_LibjitContextFree((void *) &C->context);
 }
 
-static zend_function_entry *psi_jit_compile(PSI_Context *C, PSI_Data *D)
+static zend_function_entry *psi_jit_compile(PSI_Context *C)
 {
        size_t i, j = 0;
-       zend_function_entry *zfe = calloc(D->impls->count + 1, sizeof(*zfe));
+       zend_function_entry *zfe;
        PSI_LibjitContext *ctx = C->context;
 
+       if (!C->impls) {
+               return NULL;
+       }
+
+       zfe = calloc(C->impls->count + 1, sizeof(*zfe));
        jit_context_build_start(ctx->jit);
 
-       for (i = 0; i < D->impls->count; ++i) {
+       for (i = 0; i < C->impls->count; ++i) {
                zend_function_entry *zf = &zfe[j];
                PSI_LibjitData *data;
 
-               if (!D->impls->list[i]->decl) {
+               if (!C->impls->list[i]->decl) {
                        continue;
                }
 
-               data = PSI_LibjitDataAlloc(ctx, D->impls->list[i]);
-               zf->fname = D->impls->list[i]->func->name + (D->impls->list[i]->func->name[0] == '\\');
-               zf->num_args = D->impls->list[i]->func->args->count;
+               data = PSI_LibjitDataAlloc(ctx, C->impls->list[i]);
+               zf->fname = C->impls->list[i]->func->name + (C->impls->list[i]->func->name[0] == '\\');
+               zf->num_args = C->impls->list[i]->func->args->count;
                zf->handler = data->closure;
                zf->arg_info = data->arginfo;
                ++j;