From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 26 Dec 2018 15:29:04 +0000 (+0300)
Subject: Reduce agressive inlining
X-Git-Tag: php-7.4.0alpha1~1344
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df850bf2d2c16798e9877aaf36780493fbf47c82;p=php

Reduce agressive inlining
---

diff --git a/main/output.c b/main/output.c
index 9622167926..e56757c6b2 100644
--- a/main/output.c
+++ b/main/output.c
@@ -58,12 +58,12 @@ static inline php_output_handler_status_t php_output_handler_op(php_output_handl
 static inline int php_output_handler_append(php_output_handler *handler, const php_output_buffer *buf);
 static inline zval *php_output_handler_status(php_output_handler *handler, zval *entry);
 
-static inline php_output_context *php_output_context_init(php_output_context *context, int op);
+static inline void php_output_context_init(php_output_context *context, int op);
 static inline void php_output_context_reset(php_output_context *context);
 static inline void php_output_context_swap(php_output_context *context);
 static inline void php_output_context_dtor(php_output_context *context);
 
-static inline int php_output_stack_pop(int flags);
+static int php_output_stack_pop(int flags);
 
 static int php_output_stack_apply_op(void *h, void *c);
 static int php_output_stack_apply_clean(void *h, void *c);
@@ -781,16 +781,10 @@ static inline int php_output_lock_error(int op)
 
 /* {{{ static php_output_context *php_output_context_init(php_output_context *context, int op)
  * Initialize a new output context */
-static inline php_output_context *php_output_context_init(php_output_context *context, int op)
+static inline void php_output_context_init(php_output_context *context, int op)
 {
-	if (!context) {
-		context = emalloc(sizeof(php_output_context));
-	}
-
 	memset(context, 0, sizeof(php_output_context));
 	context->op = op;
-
-	return context;
 }
 /* }}} */
 
@@ -1199,7 +1193,7 @@ static inline zval *php_output_handler_status(php_output_handler *handler, zval
 
 /* {{{ static int php_output_stack_pop(int flags)
  * Pops an output handler off the stack */
-static inline int php_output_stack_pop(int flags)
+static int php_output_stack_pop(int flags)
 {
 	php_output_context context;
 	php_output_handler **current, *orphan = OG(active);