Merge branch 'PHP-7.3' into PHP-7.4

nikic · nikic · commit b6f1b61f8f22 · 2019-08-12T17:17:42.000+02:00
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -6678,6 +6678,7 @@ void zend_compile_use(zend_ast *ast) /* {{{ */
 		}
 
 		zend_string_addref(old_name);
+		old_name = zend_new_interned_string(old_name);
 		if (!zend_hash_add_ptr(current_import, lookup_name, old_name)) {
 			zend_error_noreturn(E_COMPILE_ERROR, "Cannot use%s %s as %s because the name "
 				"is already in use", zend_get_use_type_str(type), ZSTR_VAL(old_name), ZSTR_VAL(new_name));

Original file line number	Diff line number	Diff line change
`@@ -6678,6 +6678,7 @@ void zend_compile_use(zend_ast ast) / {{{ */`
`6678`	`6678`	`}`
`6679`	`6679`
`6680`	`6680`	`zend_string_addref(old_name);`
	`6681`	`+ old_name = zend_new_interned_string(old_name);`
`6681`	`6682`	`if (!zend_hash_add_ptr(current_import, lookup_name, old_name)) {`
`6682`	`6683`	`zend_error_noreturn(E_COMPILE_ERROR, "Cannot use%s %s as %s because the name "`
`6683`	`6684`	`"is already in use", zend_get_use_type_str(type), ZSTR_VAL(old_name), ZSTR_VAL(new_name));`