Fixed repeatable opcodes on CALL VM without global registers

Author: dstogov

Zend/zend_execute.c

@@ -2224,7 +2224,9 @@ static zend_always_inline zend_generator *zend_get_running_generator(zend_execut
 # define ZEND_VM_REPEATABLE_OPCODE \
 	do {
 # define ZEND_VM_REPEAT_OPCODE(_opcode) \
-	} while (UNEXPECTED(OPLINE->opcode == _opcode))
+	} while (UNEXPECTED((++opline)->opcode == _opcode)); \
+	OPLINE = opline; \
+	ZEND_VM_CONTINUE()
 # define ZEND_VM_SMART_BRANCH(_result, _check) do { \
 		int __result; \
 		if (EXPECTED((opline+1)->opcode == ZEND_JMPZ)) { \

Zend/zend_vm_def.h

@@ -4660,9 +4660,8 @@ ZEND_VM_HANDLER(64, ZEND_RECV_INIT, ANY, CONST)
 		}
 	}
 
-	ZEND_VM_INC_OPCODE();
 	ZEND_VM_REPEAT_OPCODE(ZEND_RECV_INIT);
-	ZEND_VM_CONTINUE();
+	ZEND_VM_NEXT_OPCODE();
 }
 
 ZEND_VM_HANDLER(164, ZEND_RECV_VARIADIC, ANY, ANY)
@@ -7719,9 +7718,8 @@ ZEND_VM_C_LABEL(check_indirect):
 		ZVAL_REF(variable_ptr, ref);
 	}
 
-	ZEND_VM_INC_OPCODE();
 	ZEND_VM_REPEAT_OPCODE(ZEND_BIND_GLOBAL);
-	ZEND_VM_CONTINUE();
+	ZEND_VM_NEXT_OPCODE();
 }
 
 ZEND_VM_HANDLER(121, ZEND_STRLEN, CONST|TMPVAR|CV, ANY)

Zend/zend_vm_execute.h

@@ -2254,9 +2254,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_RECV_INIT_SPEC_CONST_HANDLER(Z
 		}
 	}
 
-	ZEND_VM_INC_OPCODE();
 	ZEND_VM_REPEAT_OPCODE(ZEND_RECV_INIT);
-	ZEND_VM_CONTINUE();
+	ZEND_VM_NEXT_OPCODE();
 }
 
 static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_BRK_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
@@ -32807,9 +32806,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_BIND_GLOBAL_SPEC_CV_CONST_HAND
 		ZVAL_REF(variable_ptr, ref);
 	}
 
-	ZEND_VM_INC_OPCODE();
 	ZEND_VM_REPEAT_OPCODE(ZEND_BIND_GLOBAL);
-	ZEND_VM_CONTINUE();
+	ZEND_VM_NEXT_OPCODE();
 }
 
 static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_IS_IDENTICAL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)