...

Author: krakjoe

Zend/zend_compile.c

@@ -1920,7 +1920,7 @@ void zend_do_end_function_declaration(const znode *function_token TSRMLS_DC) /*
 /* }}} */
 
 /* {{{ */
-void zend_do_function_return_hint(const znode *return_hint TSRMLS_DC) {
+void zend_do_function_return_hint(znode *return_hint TSRMLS_DC) {
 	if (return_hint->op_type != IS_UNUSED) {
 		CG(active_op_array)->return_hint.used = 1;
 
@@ -1930,7 +1930,6 @@ void zend_do_function_return_hint(const znode *return_hint TSRMLS_DC) {
 				CG(active_op_array)->return_hint.class_name_len = Z_STRLEN(return_hint->u.constant);
 				CG(active_op_array)->return_hint.class_name = zend_new_interned_string
 					(Z_STRVAL(return_hint->u.constant), Z_STRLEN(return_hint->u.constant)+1, 1 TSRMLS_CC);
-				zval_dtor((zval*)&return_hint->u.constant);
 			} else {
 				CG(active_op_array)->return_hint.type = Z_TYPE(return_hint->u.constant);
 			}
@@ -1939,7 +1938,6 @@ void zend_do_function_return_hint(const znode *return_hint TSRMLS_DC) {
 			CG(active_op_array)->return_hint.class_name_len = Z_STRLEN(return_hint->u.constant);
 			CG(active_op_array)->return_hint.class_name = zend_new_interned_string
 				(Z_STRVAL(return_hint->u.constant), Z_STRLEN(return_hint->u.constant)+1, 1 TSRMLS_CC);
-			zval_dtor((zval*)&return_hint->u.constant);
 		}
 	}
 } /* }}} */

Zend/zend_compile.h

@@ -528,7 +528,7 @@ void zend_do_add_variable(znode *result, const znode *op1, const znode *op2 TSRM
 int zend_do_verify_access_types(const znode *current_access_type, const znode *new_modifier);
 void zend_do_begin_function_declaration(znode *function_token, znode *function_name, int is_method, int return_reference, znode *fn_flags_znode TSRMLS_DC);
 void zend_do_end_function_declaration(const znode *function_token TSRMLS_DC);
-void zend_do_function_return_hint(const znode *return_hint TSRMLS_DC);
+void zend_do_function_return_hint(znode *return_hint TSRMLS_DC);
 void zend_do_receive_param(zend_uchar op, znode *varname, const znode *initialization, znode *class_type, zend_bool pass_by_reference, zend_bool is_variadic TSRMLS_DC);
 int zend_do_begin_function_call(znode *function_name, zend_bool check_namespace TSRMLS_DC);
 void zend_do_begin_method_call(znode *left_bracket TSRMLS_DC);