From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 11 Dec 2019 12:08:12 +0000 (+0100)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=33648585d68c1e807e60f65b5e34cc776eceb2ec;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed bug #78903: Conflict in RTD key for closures results in crash
---

33648585d68c1e807e60f65b5e34cc776eceb2ec
diff --cc Zend/zend_compile.c
index d95009703d,47ed1608ba..ab34098164
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@@ -6079,8 -5874,9 +6079,8 @@@ void zend_begin_method_decl(zend_op_arr
  }
  /* }}} */
  
- static void zend_begin_func_decl(znode *result, zend_op_array *op_array, zend_ast_decl *decl, zend_bool toplevel) /* {{{ */
+ static int zend_begin_func_decl(znode *result, zend_op_array *op_array, zend_ast_decl *decl, zend_bool toplevel) /* {{{ */
  {
 -	zend_ast *params_ast = decl->child[0];
  	zend_string *unqualified_name, *name, *lcname, *key;
  	zend_op *opline;