Commit:    60a59d27b48a7d2db204011322a6b32dfc186008
Author:    Dmitry Stogov <dmi...@zend.com>         Thu, 18 Apr 2013 22:22:48 
+0400
Parents:   edfeab8bf2750da4616f802650d28b0774eccba3
Branches:  master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=60a59d27b48a7d2db204011322a6b32dfc186008

Log:
Disable FCALL optimization pass for PHP older than 5.4

Changed paths:
  M  ext/opcache/Optimizer/optimize_func_calls.c
  M  ext/opcache/Optimizer/zend_optimizer.c


Diff:
diff --git a/ext/opcache/Optimizer/optimize_func_calls.c 
b/ext/opcache/Optimizer/optimize_func_calls.c
index ee271f2..727678b 100644
--- 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 9cbcd06..f3fbabc 100644
--- 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,
         */
 #include "Optimizer/pass3.c"
 
+#if ZEND_EXTENSION_API_NO > PHP_5_3_X_API_NO
        /* pass 4:
         * - INIT_FCALL_BY_NAME -> DO_FCALL
         */
        if (ZEND_OPTIMIZER_PASS_4 & OPTIMIZATION_LEVEL) {
                optimize_func_calls(op_array, script TSRMLS_CC);
        }
+#endif
 
        /* pass 5:
         * - CFG optimization


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to