]> granicus.if.org Git - php/commitdiff
Elimintate duplicate error message
authorDmitry Stogov <dmitry@zend.com>
Mon, 19 Feb 2018 13:11:28 +0000 (16:11 +0300)
committerDmitry Stogov <dmitry@zend.com>
Mon, 19 Feb 2018 13:11:28 +0000 (16:11 +0300)
Zend/zend_vm_execute.h
Zend/zend_vm_gen.php

index 1f6ab1b412ade7ee7d90dbc34ebc5bcdcc596081..71a6a4d3bfb17968970a83f35914c1e203393a79 100644 (file)
@@ -62259,7 +62259,7 @@ ZEND_API void execute_ex(zend_execute_data *ex)
                                opline = orig_opline;
                                return;
                        HYBRID_DEFAULT:
-                               zend_error_noreturn(E_ERROR, "Invalid opcode %d/%d/%d.", OPLINE->opcode, OPLINE->op1_type, OPLINE->op2_type);
+                               ZEND_NULL_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
                                HYBRID_BREAK(); /* Never reached */
 #else
 #ifdef ZEND_VM_FP_GLOBAL_REG
index f9b2280d3135c7768d2119b1335d3bf0bdcd2fc4..ad99c1086fd9927860c15308b360b97e94da434e 100644 (file)
@@ -1654,7 +1654,7 @@ function gen_executor_code($f, $spec, $kind, $prolog, &$switch_labels = array())
                        out($f,"\t\t\t\topline = orig_opline;\n");
                        out($f,"\t\t\t\treturn;\n");
                        out($f,"\t\t\tHYBRID_DEFAULT:\n");
-                       out($f,"\t\t\t\tzend_error_noreturn(E_ERROR, \"Invalid opcode %d/%d/%d.\", OPLINE->opcode, OPLINE->op1_type, OPLINE->op2_type);\n");
+                       out($f,"\t\t\t\tZEND_NULL_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);\n");
                        out($f,"\t\t\t\tHYBRID_BREAK(); /* Never reached */\n");
                        break;
        }