Inline only the most useful code

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index f7feff43b052b500eb54ebcb87e96dcc0df04faf..5fba77a475daa0c043fc8707895c998f5442bd08 100644 (file)
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -65,7 +65,7 @@ static void zend_extension_fcall_end_handler(const zend_extension *extension, ze
 
 #define TEMP_VAR_STACK_LIMIT 2000
 
-static inline void zend_pzval_unlock_func(zval *z, zend_free_op *should_free, int unref TSRMLS_DC)
+static zend_always_inline void zend_pzval_unlock_func(zval *z, zend_free_op *should_free, int unref TSRMLS_DC)
 {
        if (!Z_DELREF_P(z)) {
                Z_SET_REFCOUNT_P(z, 1);
@@ -81,7 +81,7 @@ static inline void zend_pzval_unlock_func(zval *z, zend_free_op *should_free, in
        }
 }
 
-static inline void zend_pzval_unlock_free_func(zval *z TSRMLS_DC)
+static zend_always_inline void zend_pzval_unlock_free_func(zval *z TSRMLS_DC)
 {
        if (!Z_DELREF_P(z)) {
                if (z != &EG(uninitialized_zval)) {
@@ -177,7 +177,7 @@ static zend_always_inline zval *_get_zval_ptr_tmp(const znode *node, const temp_
        return should_free->var = &T(node->u.var).tmp_var;
 }
 
-static inline zval *_get_zval_ptr_var_string_offset(const znode *node, const temp_variable *Ts, zend_free_op *should_free TSRMLS_DC)
+static zval *_get_zval_ptr_var_string_offset(const znode *node, const temp_variable *Ts, zend_free_op *should_free TSRMLS_DC)
 {
        temp_variable *T = &T(node->u.var);
        zval *str = T->str_offset.str;
@@ -215,7 +215,7 @@ static zend_always_inline zval *_get_zval_ptr_var(const znode *node, const temp_
        }
 }
 
-static inline zval **_get_zval_cv_lookup(zval ***ptr, zend_uint var, int type TSRMLS_DC)
+static zval **_get_zval_cv_lookup(zval ***ptr, zend_uint var, int type TSRMLS_DC)
 {
        zend_compiled_variable *cv = &CV_DEF_OF(var);
 
@@ -284,7 +284,7 @@ static inline zval *_get_zval_ptr(znode *node, const temp_variable *Ts, zend_fre
        return NULL;
 }
 
-static inline zval **_get_zval_ptr_ptr_var(const znode *node, const temp_variable *Ts, zend_free_op *should_free TSRMLS_DC)
+static zend_always_inline zval **_get_zval_ptr_ptr_var(const znode *node, const temp_variable *Ts, zend_free_op *should_free TSRMLS_DC)
 {
        zval** ptr_ptr = T(node->u.var).var.ptr_ptr;
 
@@ -320,7 +320,7 @@ static inline zval **_get_zval_ptr_ptr(const znode *node, const temp_variable *T
        }
 }
 
-static inline zval *_get_obj_zval_ptr_unused(TSRMLS_D)
+static zend_always_inline zval *_get_obj_zval_ptr_unused(TSRMLS_D)
 {
        if (EXPECTED(EG(This) != NULL)) {
                return EG(This);
@@ -345,7 +345,7 @@ static inline zval **_get_obj_zval_ptr_ptr(const znode *op, const temp_variable
        return get_zval_ptr_ptr(op, Ts, should_free, type);
 }
 
-static inline zval **_get_obj_zval_ptr_ptr_unused(TSRMLS_D)
+static zend_always_inline zval **_get_obj_zval_ptr_ptr_unused(TSRMLS_D)
 {
        if (EXPECTED(EG(This) != NULL)) {
                return &EG(This);