From: Joe Watkins <krakjoe@php.net>
Date: Tue, 2 Jul 2019 11:19:25 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d41ab644567012846416ea9d5efdd4a065f40a03;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  simple ignore arguments in exceptions implementation
---

d41ab644567012846416ea9d5efdd4a065f40a03
diff --cc Zend/zend_globals.h
index 281450f3fe,1d427fe478..cfaf3bd1dd
--- a/Zend/zend_globals.h
+++ b/Zend/zend_globals.h
@@@ -232,8 -232,12 +232,10 @@@ struct _zend_executor_globals 
  	zend_function trampoline;
  	zend_op       call_trampoline_op;
  
 -	zend_bool each_deprecation_thrown;
 -
  	HashTable weakrefs;
  
+ 	zend_bool exception_ignore_args;
+ 
  	void *reserved[ZEND_MAX_RESERVED_RESOURCES];
  };