Catch exceptions without capturing them to variables

MaxSem · MaxSem · commit 1e412f98db85 · 2020-04-03T17:22:17.000-04:00
Work in progress, will be posted to RFC later.
diff --git a/Zend/tests/try/catch_novar.phpt b/Zend/tests/try/catch_novar.phpt
@@ -0,0 +1,12 @@
+--TEST--
+catch without capturing a variable
+--FILE--
+<?php
+
+try {
+    throw new Exception()
+} catch (Exception) {
+    echo "caught!\n";
+}
+--EXPECT--
+caught!
diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c
@@ -1992,8 +1992,10 @@ static ZEND_COLD void zend_ast_export_ex(smart_str *str, zend_ast *ast, int prio
 		case ZEND_AST_CATCH:
 			smart_str_appends(str, "} catch (");
 			zend_ast_export_catch_name_list(str, zend_ast_get_list(ast->child[0]), indent);
-			smart_str_appends(str, " $");
-			zend_ast_export_var(str, ast->child[1], 0, indent);
+			if (ast->child[1]) {
+				smart_str_appends(str, " $");
+				zend_ast_export_var(str, ast->child[1], 0, indent);
+			}
 			smart_str_appends(str, ") {\n");
 			zend_ast_export_stmt(str, ast->child[2], indent + 1);
 			zend_ast_export_indent(str, indent);
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -5229,7 +5229,7 @@ void zend_compile_try(zend_ast *ast) /* {{{ */
 		zend_ast_list *classes = zend_ast_get_list(catch_ast->child[0]);
 		zend_ast *var_ast = catch_ast->child[1];
 		zend_ast *stmt_ast = catch_ast->child[2];
-		zend_string *var_name = zval_make_interned_string(zend_ast_get_zval(var_ast));
+		zend_string *var_name = var_ast ? zval_make_interned_string(zend_ast_get_zval(var_ast)) : NULL;
 		zend_bool is_last_catch = (i + 1 == catches->children);
 
 		uint32_t *jmp_multicatch = safe_emalloc(sizeof(uint32_t), classes->children - 1, 0);
@@ -5257,12 +5257,12 @@ void zend_compile_try(zend_ast *ast) /* {{{ */
 					zend_resolve_class_name_ast(class_ast));
 			opline->extended_value = zend_alloc_cache_slot();
 
-			if (zend_string_equals_literal(var_name, "this")) {
+			if (var_name && zend_string_equals_literal(var_name, "this")) {
 				zend_error_noreturn(E_COMPILE_ERROR, "Cannot re-assign $this");
 			}
 
-			opline->result_type = IS_CV;
-			opline->result.var = lookup_cv(var_name);
+			opline->result_type = var_name ? IS_CV : IS_UNUSED;
+			opline->result.var = var_name ? lookup_cv(var_name) : -1;
 
 			if (is_last_catch && is_last_class) {
 				opline->extended_value |= ZEND_LAST_CATCH;
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
@@ -247,7 +247,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
 %type <ast> encaps_var encaps_var_offset isset_variables
 %type <ast> top_statement_list use_declarations const_list inner_statement_list if_stmt
 %type <ast> alt_if_stmt for_exprs switch_case_list global_var_list static_var_list
-%type <ast> echo_expr_list unset_variables catch_name_list catch_list parameter_list class_statement_list
+%type <ast> echo_expr_list unset_variables catch_name_list catch_list optional_variable parameter_list class_statement_list
 %type <ast> implements_list case_list if_stmt_without_else
 %type <ast> non_empty_parameter_list argument_list non_empty_argument_list property_list
 %type <ast> class_const_list class_const_decl class_name_list trait_adaptations method_body non_empty_for_exprs
@@ -465,7 +465,7 @@ statement:
 catch_list:
 		%empty
 			{ $$ = zend_ast_create_list(0, ZEND_AST_CATCH_LIST); }
-	|	catch_list T_CATCH '(' catch_name_list T_VARIABLE ')' '{' inner_statement_list '}'
+	|	catch_list T_CATCH '(' catch_name_list optional_variable ')' '{' inner_statement_list '}'
 			{ $$ = zend_ast_list_add($1, zend_ast_create(ZEND_AST_CATCH, $4, $5, $8)); }
 ;
 
@@ -474,6 +474,11 @@ catch_name_list:
 	|	catch_name_list '|' class_name { $$ = zend_ast_list_add($1, $3); }
 ;
 
+optional_variable:
+		%empty { $$ = NULL; }
+	|	T_VARIABLE { $$ = $1; }
+;
+
 finally_statement:
 		%empty { $$ = NULL; }
 	|	T_FINALLY '{' inner_statement_list '}' { $$ = $3; }
