From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 19 Feb 2018 13:11:28 +0000 (+0300)
Subject: Elimintate duplicate error message
X-Git-Tag: php-7.3.0alpha1~344
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=190a970dd6117ce7504e78ca4eac950e49a057e0;p=php

Elimintate duplicate error message
---

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 1f6ab1b412..71a6a4d3bf 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -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
diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php
index f9b2280d31..ad99c1086f 100644
--- a/Zend/zend_vm_gen.php
+++ b/Zend/zend_vm_gen.php
@@ -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;
 	}