]> granicus.if.org Git - php/commitdiff
cleanup
authorDmitry Stogov <dmitry@zend.com>
Fri, 8 May 2020 07:07:55 +0000 (10:07 +0300)
committerDmitry Stogov <dmitry@zend.com>
Fri, 8 May 2020 07:07:55 +0000 (10:07 +0300)
ext/opcache/jit/zend_jit_trace.c

index ac51f9673e1ece55f35f7caa12315bb72ea448a8..8d919dbf5d405c045800ae6cca61abccaa763f13 100644 (file)
@@ -1257,11 +1257,9 @@ static zend_ssa *zend_jit_trace_build_tssa(zend_jit_trace_rec *trace_buffer, uin
                if (p->op == ZEND_JIT_TRACE_VM) {
                        uint8_t op1_type, op2_type, op3_type;
 
-                       // TODO: use types recorded in trace (add guards) ???
                        // TODO: range inference ???
                        opline = p->opline;
 
-
                        op1_type = p->op1_type;
                        op2_type = p->op2_type;
                        op3_type = p->op3_type;
@@ -3119,7 +3117,6 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
                                                        if ((opline->opcode == ZEND_SEND_VAR_EX
                                                          || opline->opcode == ZEND_SEND_FUNC_ARG)
                                                         && ARG_SHOULD_BE_SENT_BY_REF(frame->call->func, opline->op2.num)) {
-                                                               // TODO: this may require invalidation, if caller is changed ???
                                                                goto done;
                                                        }
                                                        if (op1_type != IS_UNKNOWN) {
@@ -3812,6 +3809,7 @@ done:
                        op_array_ssa = &jit_extension->func_info.ssa;
                        call = frame->call;
                        if (!call) {
+                               assert(0); // This should be handled by "fake" ZEND_JIT_TRACE_INIT_CALL
                                /* Trace missed INIT_FCALL opcode */
                                call = top;
                                TRACE_FRAME_INIT(call, op_array, 0, -1); // TODO: should be possible to get the real number af arguments ???