diff options
| -rw-r--r-- | ext/opcache/jit/zend_jit_trace.c | 8 | ||||
| -rw-r--r-- | ext/opcache/jit/zend_jit_vm_helpers.c | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c index 1e29abf954..d99253e010 100644 --- a/ext/opcache/jit/zend_jit_trace.c +++ b/ext/opcache/jit/zend_jit_trace.c @@ -530,7 +530,7 @@ static int zend_jit_trace_add_phis(zend_jit_trace_rec *trace_buffer, uint32_t ss level++; } else if (p->op == ZEND_JIT_TRACE_BACK) { if (level == 0) { - // Phi for recursive calls and returns are not supporte yet ??? + // Phi for recursive calls and returns are not supported yet ??? assert(0); } else { level--; @@ -865,7 +865,7 @@ static zend_ssa *zend_jit_trace_build_tssa(zend_jit_trace_rec *trace_buffer, uin } } else if (p->op == ZEND_JIT_TRACE_BACK) { if (level == 0) { - stack_bottom += zend_jit_trace_frame_size(op_array);; + stack_bottom += zend_jit_trace_frame_size(op_array); jit_extension = (zend_jit_op_array_trace_extension*)ZEND_FUNC_INFO(op_array); ssa = &jit_extension->func_info.ssa; @@ -1131,7 +1131,7 @@ static zend_ssa *zend_jit_trace_build_tssa(zend_jit_trace_rec *trace_buffer, uin } if (trace_buffer->stop == ZEND_JIT_TRACE_STOP_LOOP) { - /* Propagae initial value through Phi functions */ + /* Propagate initial value through Phi functions */ zend_ssa_phi *phi = tssa->blocks[1].phis; while (phi) { @@ -1449,7 +1449,7 @@ static zend_ssa *zend_jit_trace_build_tssa(zend_jit_trace_rec *trace_buffer, uin } frame->call = call->prev; call->prev = frame; - call->return_ssa_var = find_return_ssa_var(p - 1, ssa_ops + (idx -1)); + call->return_ssa_var = find_return_ssa_var(p - 1, ssa_ops + (idx - 1)); frame = call; level++; diff --git a/ext/opcache/jit/zend_jit_vm_helpers.c b/ext/opcache/jit/zend_jit_vm_helpers.c index 9f23beda17..caf0ef1f0f 100644 --- a/ext/opcache/jit/zend_jit_vm_helpers.c +++ b/ext/opcache/jit/zend_jit_vm_helpers.c @@ -528,7 +528,7 @@ static int zend_jit_trace_record_fake_init_call(zend_execute_data *call, zend_ji * +--------+----------+----------+----------++----------+----------+----------+ * * loop: LOOP if "cycle" and level == 0, otherwise INNER_LOOP - * INNER_LOOP: abort recording and start new one (wit for loop) + * INNER_LOOP: abort recording and start new one (wait for loop) * COMPILED: abort recording (wait while side exit creates outer loop) * unroll: continue recording while unroll limit reached * rec-call: RECURSIVE_CALL if "cycle" and level > N, otherwise continue @@ -584,7 +584,6 @@ zend_jit_trace_stop ZEND_FASTCALL zend_jit_trace_execute(zend_execute_data *ex, ((zend_jit_trace_start_rec*)trace_buffer)->opline = opline; is_toplevel = EX(func)->op_array.function_name == NULL; - if (prev_call) { idx = zend_jit_trace_record_fake_init_call(prev_call, trace_buffer, idx); } |