Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Repare SWITCH VM

diff --cc Zend/zend_execute.c
index 0039f747ee1cfc4a03e9b7d969dc11b8e9d556f8,0a505f55e8375022c1089e50808c1ee81614d78b..bb3ca87b04264330499f2a8cd8f4b9ab2c60f097
--- 1/Zend/zend_execute.c
--- 2/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@@ -63,9 -63,6 +63,9 @@@
  # pragma GCC diagnostic ignored "-Wvolatile-register-var"
    register zend_execute_data* volatile execute_data __asm__(ZEND_VM_FP_GLOBAL_REG);
  # pragma GCC diagnostic warning "-Wvolatile-register-var"
- #ifdef ZEND_VM_FP_GLOBAL_REG
 +#endif
 +
++#if defined(ZEND_VM_FP_GLOBAL_REG) && ((ZEND_VM_KIND == ZEND_VM_KIND_CALL) || (ZEND_VM_KIND == ZEND_VM_KIND_HYBRID))
  # define EXECUTE_DATA_D     void
  # define EXECUTE_DATA_C
  # define EXECUTE_DATA_DC
@@@ -77,14 -78,6 +77,14 @@@
  # define EXECUTE_DATA_DC    , EXECUTE_DATA_D
  # define EXECUTE_DATA_CC    , EXECUTE_DATA_C
  # define NO_EXECUTE_DATA_CC , NULL
- #ifdef ZEND_VM_IP_GLOBAL_REG
 +#endif
 +
++#if defined(ZEND_VM_FP_GLOBAL_REG) && ((ZEND_VM_KIND == ZEND_VM_KIND_CALL) || (ZEND_VM_KIND == ZEND_VM_KIND_HYBRID))
 +# define OPLINE_D           void
 +# define OPLINE_C
 +# define OPLINE_DC
 +# define OPLINE_CC
 +#else
  # define OPLINE_D           const zend_op* opline
  # define OPLINE_C           opline
  # define OPLINE_DC          , OPLINE_D

diff --cc Zend/zend_vm_gen.php
index 34117ff61c8d65de9541cc92e53262955ba9a628,431d39e5a45d95b2023d7c69042d3f78ed4a502f..1847eb07733fecb8205e059ff5137b4ec2da1f06
mode 100755,100644..100755
--- 1/Zend/zend_vm_gen.php
--- 2/Zend/zend_vm_gen.php
+++ b/Zend/zend_vm_gen.php