Disable FCALL optimization pass for PHP older than 5.4

diff --git a/ext/opcache/Optimizer/optimize_func_calls.c b/ext/opcache/Optimizer/optimize_func_calls.c
index ee271f22aadb9d06722be455eef2bbad683d04bb..727678bb2deec4726c921489ca7a85c88ef1e8b0 100644 (file)
--- a/ext/opcache/Optimizer/optimize_func_calls.c
+++ b/ext/opcache/Optimizer/optimize_func_calls.c
@@ -1,6 +1,7 @@
 /* pass 4
  * - optimize INIT_FCALL_BY_NAME to DO_FCALL
  */
+#if ZEND_EXTENSION_API_NO > PHP_5_3_X_API_NO
 
 typedef struct _optimizer_call_info {
        zend_function *func;
@@ -134,3 +135,4 @@ static void optimize_func_calls(zend_op_array *op_array, zend_persistent_script
 
        efree(call_stack);
 }
+#endif

diff --git a/ext/opcache/Optimizer/zend_optimizer.c b/ext/opcache/Optimizer/zend_optimizer.c
index 9cbcd06ac85d1de09cf0eb31c086812452d6370a..f3fbabcf81afa7336b88e143da0f3bfe9d14a96a 100644 (file)
--- a/ext/opcache/Optimizer/zend_optimizer.c
+++ b/ext/opcache/Optimizer/zend_optimizer.c
@@ -146,12 +146,14 @@ static void zend_optimize(zend_op_array           *op_array,
         */\r
 #include "Optimizer/pass3.c"\r
 \r
+#if ZEND_EXTENSION_API_NO > PHP_5_3_X_API_NO\r
        /* pass 4:\r
         * - INIT_FCALL_BY_NAME -> DO_FCALL\r
         */\r
        if (ZEND_OPTIMIZER_PASS_4 & OPTIMIZATION_LEVEL) {\r
                optimize_func_calls(op_array, script TSRMLS_CC);\r
        }\r
+#endif\r
 \r
        /* pass 5:\r
         * - CFG optimization\r