feat: specify only specific use-cases for early instructions

Zend/zend_language_parser.y

@@ -254,7 +254,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
 %type <ast> group_use_declaration inline_use_declarations inline_use_declaration
 %type <ast> mixed_group_use_declaration use_declaration unprefixed_use_declaration
 %type <ast> unprefixed_use_declarations const_decl inner_statement
-%type <ast> expr optional_expr while_statement for_statement foreach_variable
+%type <ast> expr optional_expr while_statement for_statement foreach_variable early_return
 %type <ast> foreach_statement declare_statement finally_statement unset_variable variable
 %type <ast> extends_from parameter optional_type_without_static argument global_var
 %type <ast> static_var class_statement trait_adaptation trait_precedence trait_alias
@@ -511,6 +511,9 @@ statement:
 			{ $$ = zend_ast_create(ZEND_AST_FOR, $3, $5, $7, $9); }
 	|	T_SWITCH '(' expr ')' switch_case_list
 			{ $$ = zend_ast_create(ZEND_AST_SWITCH, $3, $5); }
+    |	T_BREAK optional_expr ';'		{ $$ = zend_ast_create(ZEND_AST_BREAK, $2); }
+	|	T_CONTINUE optional_expr ';'	{ $$ = zend_ast_create(ZEND_AST_CONTINUE, $2); }
+	|	T_RETURN optional_expr ';'		{ $$ = zend_ast_create(ZEND_AST_RETURN, $2); }
 	|	T_GLOBAL global_var_list ';'	{ $$ = $2; }
 	|	T_STATIC static_var_list ';'	{ $$ = $2; }
 	|	T_ECHO echo_expr_list ';'		{ $$ = $2; }
@@ -1297,8 +1300,12 @@ expr:
 			{ $$ = zend_ast_create(ZEND_AST_CONDITIONAL, $1, $3, $5); }
 	|	expr '?' ':' expr
 			{ $$ = zend_ast_create(ZEND_AST_CONDITIONAL, $1, NULL, $4); }
+	|	expr '?' ':' early_return
+			{ $$ = zend_ast_create(ZEND_AST_CONDITIONAL, $1, NULL, $4); }
 	|	expr T_COALESCE expr
 			{ $$ = zend_ast_create(ZEND_AST_COALESCE, $1, $3); }
+	|	expr T_COALESCE early_return
+			{ $$ = zend_ast_create(ZEND_AST_COALESCE, $1, $3); }
 	|	internal_functions_in_yacc { $$ = $1; }
 	|	T_INT_CAST expr		{ $$ = zend_ast_create_cast(IS_LONG, $2); }
 	|	T_DOUBLE_CAST expr	{ $$ = zend_ast_create_cast(IS_DOUBLE, $2); }
@@ -1320,12 +1327,6 @@ expr:
 	|	T_YIELD expr 						{ $$ = zend_ast_create(ZEND_AST_YIELD, $2, NULL); CG(extra_fn_flags) |= ZEND_ACC_GENERATOR; }
 	|	T_YIELD expr T_DOUBLE_ARROW expr 	{ $$ = zend_ast_create(ZEND_AST_YIELD, $4, $2); CG(extra_fn_flags) |= ZEND_ACC_GENERATOR; }
 	|	T_YIELD_FROM expr 				 	{ $$ = zend_ast_create(ZEND_AST_YIELD_FROM, $2); CG(extra_fn_flags) |= ZEND_ACC_GENERATOR; }
-	|	T_CONTINUE							{ $$ = zend_ast_create(ZEND_AST_CONTINUE, NULL); }
-	|	T_CONTINUE expr						{ $$ = zend_ast_create(ZEND_AST_CONTINUE, $2); }
-	|	T_BREAK								{ $$ = zend_ast_create(ZEND_AST_BREAK, NULL); }
-	|	T_BREAK expr						{ $$ = zend_ast_create(ZEND_AST_BREAK, $2); }
-	|	T_RETURN							{ $$ = zend_ast_create(ZEND_AST_RETURN, NULL); }
-	|	T_RETURN expr						{ $$ = zend_ast_create(ZEND_AST_RETURN, $2); }
 	|	T_THROW expr 						{ $$ = zend_ast_create(ZEND_AST_THROW, $2); }
 	|	inline_function 					{ $$ = $1; }
 	|	attributes inline_function 			{ $$ = zend_ast_with_attributes($2, $1); }
@@ -1335,6 +1336,15 @@ expr:
 	|	match { $$ = $1; }
 ;
 
+early_return:
+        T_RETURN							{ $$ = zend_ast_create(ZEND_AST_RETURN, NULL); }
+	|	T_RETURN expr						{ $$ = zend_ast_create(ZEND_AST_RETURN, $2); }
+    |   T_BREAK								{ $$ = zend_ast_create(ZEND_AST_BREAK, NULL); }
+    |	T_BREAK expr						{ $$ = zend_ast_create(ZEND_AST_BREAK, $2); }
+    |   T_CONTINUE							{ $$ = zend_ast_create(ZEND_AST_CONTINUE, NULL); }
+    |	T_CONTINUE expr						{ $$ = zend_ast_create(ZEND_AST_CONTINUE, $2); }
+;
+
 
 inline_function:
 		function returns_ref backup_doc_comment '(' parameter_list ')' lexical_vars return_type

tests/lang/early-return/001.phpt

@@ -5,14 +5,12 @@ Early break
 function test($a,$b) {
     $b ?? return 0;
     $a ?: return 1;
-    $c = $a <= 0 ? return "negative" : $a*2;
 
     return 2;
 }
 echo test(1, null);
 echo test(0, 1);
-echo test(-1, 1);
 echo test(3, 1);
 ?>
 --EXPECT--
-01negative2
+012

tests/lang/early-return/003.phpt

@@ -14,7 +14,7 @@ echo PHP_EOL;
 function test2(int $v, int $stop) {
     while (true) {
         $v-- ?: return $v;
-        $stop === $v ? return $v : continue;
+        $stop !== $v ?: return $v;
     }
     return 'never here';
 }

tests/lang/early-return/early-return1.phpt

@@ -0,0 +1,30 @@
+--TEST--
+Memory leaks
+--FILE--
+<?php
+function test($input = null, $fallback = 'fallback') {
+    $return = $input ?: return $fallback;
+    var_dump($return);
+}
+function test2($input = null, $fallback = 'fallback') {
+    $return = $input ?? return $fallback;
+    var_dump($return);
+}
+
+echo test('hello');
+echo test(false, 'false');
+echo test(null, 'null');
+
+echo PHP_EOL;
+
+echo test2('world');
+echo test2(false, 'false');
+echo test2(null, 'null');
+
+?>
+--EXPECT--
+string(5) "hello"
+falsenull
+string(5) "world"
+bool(false)
+null

tests/lang/loops/break_001.phpt

@@ -14,12 +14,8 @@ for($i = 5; $i >= 0; $i--) {
     }
     echo $i;
 }
-echo PHP_EOL;
+
 // new way break
-for($i = 5; $i >= 0; $i--) {
-    $i < 3 ? break : null;
-    echo $i;
-}
 echo PHP_EOL;
 for($i = 5; $i >= 0; $i--) {
     $i > 3 ?: break;
@@ -34,6 +30,5 @@ for($i = 5; $i >= 0; $i--) {
 --EXPECTF--
 543210
 543
-543
 54
 54321

tests/lang/loops/continue_001.phpt

@@ -14,12 +14,8 @@ for($i = 5; $i >= 0; $i--) {
     }
     echo $i;
 }
-echo PHP_EOL;
+
 // new way continue
-for($i = 5; $i >= 0; $i--) {
-    $i < 3 ? continue : null;
-    echo $i;
-}
 echo PHP_EOL;
 for($i = 5; $i >= 0; $i--) {
     $i > 3 ?: continue;
@@ -34,6 +30,5 @@ for($i = 5; $i >= 0; $i--) {
 --EXPECT--
 543210
 543
-543
 54
 54321