Trigger op_array_handler() if HAVE_OP_ARRAY_HANDLER is set

Julien Pauli · Julien Pauli · commit bec0aec11691 · 2016-01-12T15:19:14.000+01:00
diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c
@@ -585,7 +585,7 @@ ZEND_API int pass_two(zend_op_array *op_array)
 		zend_update_extended_info(op_array);
 	}
 	if (CG(compiler_options) & ZEND_COMPILE_HANDLE_OP_ARRAY) {
-		if (zend_extension_flags & ZEND_EXTENSIONS_HAVE_OP_ARRAY_PERSIST) {
+		if (zend_extension_flags & ZEND_EXTENSIONS_HAVE_OP_ARRAY_HANDLER) {
 			zend_llist_apply_with_argument(&zend_extensions, (llist_apply_with_arg_func_t) zend_extension_op_array_handler, op_array);
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -585,7 +585,7 @@ ZEND_API int pass_two(zend_op_array *op_array)`
`585`	`585`	`zend_update_extended_info(op_array);`
`586`	`586`	`}`
`587`	`587`	`if (CG(compiler_options) & ZEND_COMPILE_HANDLE_OP_ARRAY) {`
`588`		`- if (zend_extension_flags & ZEND_EXTENSIONS_HAVE_OP_ARRAY_PERSIST) {`
	`588`	`+ if (zend_extension_flags & ZEND_EXTENSIONS_HAVE_OP_ARRAY_HANDLER) {`
`589`	`589`	`zend_llist_apply_with_argument(&zend_extensions, (llist_apply_with_arg_func_t) zend_extension_op_array_handler, op_array);`
`590`	`590`	`}`
`591`	`591`	`}`