From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 8 Apr 2019 22:17:10 +0000 (+0300)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Tag: php-7.4.0alpha1~578
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fe0a0897bab5fb8de14478f800f36af6d559164e;p=php

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Repare SWITCH VM
---

fe0a0897bab5fb8de14478f800f36af6d559164e
diff --cc Zend/zend_execute.c
index 0039f747ee,0a505f55e8..bb3ca87b04
--- a/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"
 +#endif
 +
- #ifdef ZEND_VM_FP_GLOBAL_REG
++#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
 +#endif
 +
- #ifdef ZEND_VM_IP_GLOBAL_REG
++#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 34117ff61c,431d39e5a4..1847eb0773
mode 100755,100644..100755
--- a/Zend/zend_vm_gen.php
+++ b/Zend/zend_vm_gen.php