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

Merge branch 'PHP-7.4'

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

231bc7c8be0670272ce33a6584bdaa40c894f1a1
diff --cc Zend/zend_compile.c
index ab34098164,b6a120c94b..d95009703d
--- 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 int zend_begin_func_decl(znode *result, zend_op_array *op_array, zend_ast_decl *decl, zend_bool toplevel) /* {{{ */
+ static void 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;