Merge branch 'PHP-7.3' into PHP-7.4

nikic · nikic · commit 80a2bfafa451 · 2019-08-14T17:53:24.000+02:00
diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c
@@ -268,7 +268,7 @@ static uint32_t calc_gc_buffer_size(zend_generator *generator) /* {{{ */
 		if (EX_CALL_INFO() & ZEND_CALL_FREE_EXTRA_ARGS) {
 			size += EX_NUM_ARGS() - op_array->num_args;
 		}
-		size += Z_TYPE(execute_data->This) == IS_OBJECT; /* $this */
+		size += (EX_CALL_INFO() & ZEND_CALL_RELEASE_THIS) != 0; /* $this */
 		size += (EX_CALL_INFO() & ZEND_CALL_CLOSURE) != 0; /* Closure object */
 
 		/* Live vars */
@@ -349,7 +349,7 @@ static HashTable *zend_generator_get_gc(zval *object, zval **table, int *n) /* {
 		}
 	}
 
-	if (Z_TYPE(execute_data->This) == IS_OBJECT) {
+	if (EX_CALL_INFO() & ZEND_CALL_RELEASE_THIS) {
 		ZVAL_OBJ(gc_buffer++, Z_OBJ(execute_data->This));
 	}
 	if (EX_CALL_INFO() & ZEND_CALL_CLOSURE) {

Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@ static uint32_t calc_gc_buffer_size(zend_generator generator) / {{{ */`
`268`	`268`	`if (EX_CALL_INFO() & ZEND_CALL_FREE_EXTRA_ARGS) {`
`269`	`269`	`size += EX_NUM_ARGS() - op_array->num_args;`
`270`	`270`	`}`
`271`		`- size += Z_TYPE(execute_data->This) == IS_OBJECT; /* $this */`
	`271`	`+ size += (EX_CALL_INFO() & ZEND_CALL_RELEASE_THIS) != 0; /* $this */`
`272`	`272`	`size += (EX_CALL_INFO() & ZEND_CALL_CLOSURE) != 0; /* Closure object */`
`273`	`273`
`274`	`274`	`/* Live vars */`
`@@ -349,7 +349,7 @@ static HashTable zend_generator_get_gc(zval object, zval *table, int n) /* {`
`349`	`349`	`}`
`350`	`350`	`}`
`351`	`351`
`352`		`- if (Z_TYPE(execute_data->This) == IS_OBJECT) {`
	`352`	`+ if (EX_CALL_INFO() & ZEND_CALL_RELEASE_THIS) {`
`353`	`353`	`ZVAL_OBJ(gc_buffer++, Z_OBJ(execute_data->This));`
`354`	`354`	`}`
`355`	`355`	`if (EX_CALL_INFO() & ZEND_CALL_CLOSURE) {`