Better make this be consistent with DO_ICALL/DO_CALL

Revert "Use more specific op type"
This reverts commit 9b07ed6dcc6f0f77fa75ee6a5c2b21298b87f509.

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index a460c0f5a98d830b37c9a0b21306ba43ebd3d77f..ab2c7b89a37818aab2df1d758899a54e5ae388ac 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -7363,7 +7363,7 @@ ZEND_VM_HANDLER(151, ZEND_ASSERT_CHECK, ANY, ANY)
        }
 }
 
-ZEND_VM_HANDLER(157, ZEND_FETCH_CLASS_NAME, UNUSED, UNUSED)
+ZEND_VM_HANDLER(157, ZEND_FETCH_CLASS_NAME, ANY, ANY)
 {
        USE_OPLINE
 
@@ -7373,4 +7373,4 @@ ZEND_VM_HANDLER(157, ZEND_FETCH_CLASS_NAME, UNUSED, UNUSED)
                ZVAL_EMPTY_STRING(EX_VAR(opline->result.var));
        }
        ZEND_VM_NEXT_OPCODE();
-}
+}
\ No newline at end of file

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 7d36fd708b56d76c04b7f8977d616de50905033b..e5547f3e1eaf9910bea3e3114e5afb8615cc1da4 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -1779,7 +1779,17 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSERT_CHECK_SPEC_HANDLER(ZEND
        }
 }
 
-static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
+static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_NAME_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
+{
+       USE_OPLINE
+
+       if (EG(scope) && EG(scope)->name) {
+               ZVAL_STR_COPY(EX_VAR(opline->result.var), EG(scope)->name);
+       } else {
+               ZVAL_EMPTY_STRING(EX_VAR(opline->result.var));
+       }
+       ZEND_VM_NEXT_OPCODE();
+}static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
 
@@ -23014,17 +23024,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_YIELD_SPEC_UNUSED_UNUSED_HANDL
        ZEND_VM_RETURN();
 }
 
-static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_NAME_SPEC_UNUSED_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       USE_OPLINE
-
-       if (EG(scope) && EG(scope)->name) {
-               ZVAL_STR_COPY(EX_VAR(opline->result.var), EG(scope)->name);
-       } else {
-               ZVAL_EMPTY_STRING(EX_VAR(opline->result.var));
-       }
-       ZEND_VM_NEXT_OPCODE();
-}
 static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_UNUSED_CV(binary_op_type binary_op ZEND_OPCODE_HANDLER_ARGS_DC)
 {
        USE_OPLINE
@@ -45501,31 +45500,31 @@ void zend_init_opcodes_handlers(void)
        ZEND_NULL_HANDLER,
        ZEND_NULL_HANDLER,
        ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_FETCH_CLASS_NAME_SPEC_UNUSED_UNUSED_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
-       ZEND_NULL_HANDLER,
+       ZEND_FETCH_CLASS_NAME_SPEC_HANDLER,
+       ZEND_FETCH_CLASS_NAME_SPEC_HANDLER,
+       ZEND_FETCH_CLASS_NAME_SPEC_HANDLER,
+       ZEND_FETCH_CLASS_NAME_SPEC_HANDLER,
+       ZEND_FETCH_CLASS_NAME_SPEC_HANDLER,
+       ZEND_FETCH_CLASS_NAME_SPEC_HANDLER,
+       ZEND_FETCH_CLASS_NAME_SPEC_HANDLER,
+       ZEND_FETCH_CLASS_NAME_SPEC_HANDLER,
+       ZEND_FETCH_CLASS_NAME_SPEC_HANDLER,
+       ZEND_FETCH_CLASS_NAME_SPEC_HANDLER,
+       ZEND_FETCH_CLASS_NAME_SPEC_HANDLER,
+       ZEND_FETCH_CLASS_NAME_SPEC_HANDLER,
+       ZEND_FETCH_CLASS_NAME_SPEC_HANDLER,
+       ZEND_FETCH_CLASS_NAME_SPEC_HANDLER,
+       ZEND_FETCH_CLASS_NAME_SPEC_HANDLER,
+       ZEND_FETCH_CLASS_NAME_SPEC_HANDLER,
+       ZEND_FETCH_CLASS_NAME_SPEC_HANDLER,
+       ZEND_FETCH_CLASS_NAME_SPEC_HANDLER,
+       ZEND_FETCH_CLASS_NAME_SPEC_HANDLER,
+       ZEND_FETCH_CLASS_NAME_SPEC_HANDLER,
+       ZEND_FETCH_CLASS_NAME_SPEC_HANDLER,
+       ZEND_FETCH_CLASS_NAME_SPEC_HANDLER,
+       ZEND_FETCH_CLASS_NAME_SPEC_HANDLER,
+       ZEND_FETCH_CLASS_NAME_SPEC_HANDLER,
+       ZEND_FETCH_CLASS_NAME_SPEC_HANDLER,
        ZEND_NULL_HANDLER,
        ZEND_NULL_HANDLER,
        ZEND_NULL_HANDLER,