Implement with parser approach

iluuu1994 · iluuu1994 · commit 40751f088279 · 2024-05-29T01:54:09.000+02:00
diff --git a/Zend/tests/exit/ast_print_assert_die_const.phpt b/Zend/tests/exit/ast_print_assert_die_const.phpt
@@ -13,4 +13,4 @@ try {
 
 ?>
 --EXPECT--
-AssertionError: assert(0 && die)
+AssertionError: assert(0 && \exit())
diff --git a/Zend/tests/exit/ast_print_assert_die_function.phpt b/Zend/tests/exit/ast_print_assert_die_function.phpt
@@ -13,4 +13,4 @@ try {
 
 ?>
 --EXPECT--
-AssertionError: assert(0 && die())
+AssertionError: assert(0 && \exit())
diff --git a/Zend/tests/exit/ast_print_assert_exit_const.phpt b/Zend/tests/exit/ast_print_assert_exit_const.phpt
@@ -13,4 +13,4 @@ try {
 
 ?>
 --EXPECT--
-AssertionError: assert(0 && exit)
+AssertionError: assert(0 && \exit())
diff --git a/Zend/tests/exit/ast_print_assert_exit_function.phpt b/Zend/tests/exit/ast_print_assert_exit_function.phpt
@@ -13,4 +13,4 @@ try {
 
 ?>
 --EXPECT--
-AssertionError: assert(0 && exit())
+AssertionError: assert(0 && \exit())
diff --git a/Zend/tests/exit/define_die_constant.phpt b/Zend/tests/exit/define_die_constant.phpt
@@ -9,4 +9,4 @@ var_dump(die);
 
 ?>
 --EXPECTF--
-Fatal error: Cannot define constant with name die in %s on line %d
+Parse error: syntax error, unexpected token "exit", expecting identifier in %s on line %d
diff --git a/Zend/tests/exit/define_die_constant_namespace.phpt b/Zend/tests/exit/define_die_constant_namespace.phpt
@@ -11,4 +11,4 @@ var_dump(die);
 
 ?>
 --EXPECTF--
-Fatal error: Cannot define constant with name die in %s on line %d
+Parse error: syntax error, unexpected token "exit", expecting identifier in %s on line %d
diff --git a/Zend/tests/exit/define_die_function.phpt b/Zend/tests/exit/define_die_function.phpt
@@ -7,4 +7,4 @@ function die() { }
 
 ?>
 --EXPECTF--
-Fatal error: Defining a custom die() function is not allowed, as the function has special semantics in %s on line %d
+Parse error: syntax error, unexpected token "exit", expecting "(" in %s on line %d
diff --git a/Zend/tests/exit/define_die_function_namespace.phpt b/Zend/tests/exit/define_die_function_namespace.phpt
@@ -11,4 +11,4 @@ var_dump(die());
 
 ?>
 --EXPECTF--
-Fatal error: Defining a custom die() function is not allowed, as the function has special semantics in %s on line %d
+Parse error: syntax error, unexpected token "exit", expecting "(" in %s on line %d
diff --git a/Zend/tests/exit/define_exit_constant.phpt b/Zend/tests/exit/define_exit_constant.phpt
@@ -9,4 +9,4 @@ var_dump(exit);
 
 ?>
 --EXPECTF--
-Fatal error: Cannot define constant with name exit in %s on line %d
+Parse error: syntax error, unexpected token "exit", expecting identifier in %s on line %d
diff --git a/Zend/tests/exit/define_exit_constant_namespace.phpt b/Zend/tests/exit/define_exit_constant_namespace.phpt
@@ -11,4 +11,4 @@ var_dump(exit);
 
 ?>
 --EXPECTF--
-Fatal error: Cannot define constant with name exit in %s on line %d
+Parse error: syntax error, unexpected token "exit", expecting identifier in %s on line %d
diff --git a/Zend/tests/exit/define_exit_function.phpt b/Zend/tests/exit/define_exit_function.phpt
@@ -7,4 +7,4 @@ function exit() { }
 
 ?>
 --EXPECTF--
-Fatal error: Defining a custom exit() function is not allowed, as the function has special semantics in %s on line %d
+Parse error: syntax error, unexpected token "exit", expecting "(" in %s on line %d
diff --git a/Zend/tests/exit/define_exit_function_namespace.phpt b/Zend/tests/exit/define_exit_function_namespace.phpt
@@ -9,4 +9,4 @@ function exit() { }
 
 ?>
 --EXPECTF--
-Fatal error: Defining a custom exit() function is not allowed, as the function has special semantics in %s on line %d
+Parse error: syntax error, unexpected token "exit", expecting "(" in %s on line %d
diff --git a/Zend/tests/exit/define_goto_label_die.phpt b/Zend/tests/exit/define_goto_label_die.phpt
@@ -10,7 +10,5 @@ die:
 echo "After\n";
 
 ?>
---EXPECT--
-Before
-In between
-After
+--EXPECTF--
+Parse error: syntax error, unexpected token ":" in %s on line %d
diff --git a/Zend/tests/exit/define_goto_label_die_with_jump.phpt b/Zend/tests/exit/define_goto_label_die_with_jump.phpt
@@ -10,6 +10,5 @@ die:
 echo "After\n";
 
 ?>
---EXPECT--
-Before
-After
+--EXPECTF--
+Parse error: syntax error, unexpected token "exit", expecting identifier in %s on line %d
diff --git a/Zend/tests/exit/define_goto_label_exit.phpt b/Zend/tests/exit/define_goto_label_exit.phpt
@@ -10,7 +10,5 @@ exit:
 echo "After\n";
 
 ?>
---EXPECT--
-Before
-In between
-After
+--EXPECTF--
+Parse error: syntax error, unexpected token ":" in %s on line %d
diff --git a/Zend/tests/exit/define_goto_label_exit_with_jump.phpt b/Zend/tests/exit/define_goto_label_exit_with_jump.phpt
@@ -10,6 +10,5 @@ exit:
 echo "After\n";
 
 ?>
---EXPECT--
-Before
-After
+--EXPECTF--
+Parse error: syntax error, unexpected token "exit", expecting identifier in %s on line %d
diff --git a/Zend/tests/exit/die_string_cast_exception.phpt b/Zend/tests/exit/die_string_cast_exception.phpt
@@ -11,4 +11,4 @@ try {
 
 ?>
 --EXPECT--
-die(): Argument #1 ($code) must be of type string|int, stdClass given
+exit(): Argument #1 ($code) must be of type string|int, stdClass given
diff --git a/Zend/tests/exit/exit_as_function.phpt b/Zend/tests/exit/exit_as_function.phpt
@@ -19,10 +19,10 @@ foreach ($values as $value) {
 }
 
 ?>
---EXPECT--
+--EXPECTF--
 string(4) "exit"
 string(3) "die"
-object(Closure)#1 (2) {
+object(Closure)#%d (2) {
   ["function"]=>
   string(4) "exit"
   ["parameter"]=>
@@ -31,9 +31,9 @@ object(Closure)#1 (2) {
     string(10) "<optional>"
   }
 }
-object(Closure)#2 (2) {
+object(Closure)#%d (2) {
   ["function"]=>
-  string(3) "die"
+  string(4) "exit"
   ["parameter"]=>
   array(1) {
     ["$code"]=>
diff --git a/Zend/tests/exit/exit_values.phpt b/Zend/tests/exit/exit_values.phpt
@@ -132,7 +132,7 @@ TypeError: exit(): Argument #1 ($code) must be of type string|int, stdClass give
 Using NULL as value:
 Exit status is: 0
 Output is:
-Deprecated: die(): Passing null to parameter #1 ($code) of type string|int is deprecated in %s on line %d
+Deprecated: exit(): Passing null to parameter #1 ($code) of type string|int is deprecated in %s on line %d
 Using false as value:
 Exit status is: 0
 Output is:
@@ -168,16 +168,16 @@ Hello world
 Using [] as value:
 Exit status is: 0
 Output is:
-TypeError: die(): Argument #1 ($code) must be of type string|int, array given
+TypeError: exit(): Argument #1 ($code) must be of type string|int, array given
 Using STDERR as value:
 Exit status is: 0
 Output is:
-TypeError: die(): Argument #1 ($code) must be of type string|int, resource given
+TypeError: exit(): Argument #1 ($code) must be of type string|int, resource given
 Using new stdClass() as value:
 Exit status is: 0
 Output is:
-TypeError: die(): Argument #1 ($code) must be of type string|int, stdClass given
+TypeError: exit(): Argument #1 ($code) must be of type string|int, stdClass given
 As a statement:
 Exit status is: 0
 Output is:
-TypeError: die(): Argument #1 ($code) must be of type string|int, stdClass given
+TypeError: exit(): Argument #1 ($code) must be of type string|int, stdClass given
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -7764,14 +7764,10 @@ static zend_string *zend_begin_func_decl(znode *result, zend_op_array *op_array,
 			"__autoload() is no longer supported, use spl_autoload_register() instead");
 	}
 
-	if (
-		zend_string_equals_literal_ci(unqualified_name, "assert")
-		|| zend_string_equals_literal_ci(unqualified_name, "exit")
-		|| zend_string_equals_literal_ci(unqualified_name, "die")
-	) {
+	if (zend_string_equals_literal_ci(unqualified_name, "assert")) {
 		zend_error(E_COMPILE_ERROR,
-			"Defining a custom %s() function is not allowed, "
-			"as the function has special semantics", ZSTR_VAL(unqualified_name));
+			"Defining a custom assert() function is not allowed, "
+			"as the function has special semantics");
 	}
 
 	zend_register_seen_symbol(lcname, ZEND_SYMBOL_FUNCTION);
@@ -8714,13 +8710,6 @@ static void zend_compile_const_decl(zend_ast *ast) /* {{{ */
 		value_node.op_type = IS_CONST;
 		zend_const_expr_to_zval(value_zv, value_ast_ptr, /* allow_dynamic */ true);
 
-		if (UNEXPECTED(
-			zend_string_equals_literal_ci(unqualified_name, "exit")
-			|| zend_string_equals_literal_ci(unqualified_name, "die")
-		)) {
-			zend_throw_error(NULL, "Cannot define constant with name %s", ZSTR_VAL(unqualified_name));
-			return;
-		}
 		if (zend_get_special_const(ZSTR_VAL(unqualified_name), ZSTR_LEN(unqualified_name))) {
 			zend_error_noreturn(E_COMPILE_ERROR,
 				"Cannot redeclare constant '%s'", ZSTR_VAL(unqualified_name));
@@ -10016,34 +10005,6 @@ static void zend_compile_const(znode *result, zend_ast *ast) /* {{{ */
 
 	bool is_fully_qualified;
 	zend_string *orig_name = zend_ast_get_str(name_ast);
-
-	/* The fake "constants" exit and die must be converted to a function call for exit() */
-	if (UNEXPECTED(
-		zend_string_equals_literal_ci(orig_name, "exit")
-		|| zend_string_equals_literal_ci(orig_name, "die")
-	)) {
-		zval *fbc_zv = zend_hash_find(CG(function_table), ZSTR_KNOWN(ZEND_STR_EXIT));
-		ZEND_ASSERT(fbc_zv && "exit() function should always exist");
-		zend_function *fbc = Z_PTR_P(fbc_zv);
-
-		znode name_node;
-		name_node.op_type = IS_CONST;
-		ZVAL_STR(&name_node.u.constant, ZSTR_KNOWN(ZEND_STR_EXIT));
-
-		opline = zend_emit_op(NULL, ZEND_INIT_FCALL, NULL, &name_node);
-		opline->result.num = zend_alloc_cache_slot();
-
-		/* Store offset to function from symbol table in op2.extra. */
-		{
-			Bucket *fbc_bucket = (Bucket*)((uintptr_t)fbc_zv - XtOffsetOf(Bucket, val));
-			Z_EXTRA_P(CT_CONSTANT(opline->op2)) = fbc_bucket - CG(function_table)->arData;
-		}
-
-		zend_ast *args_list = zend_ast_create_list_0(ZEND_AST_ARG_LIST);
-		zend_compile_call_common(result, args_list, fbc, ast->lineno);
-		return;
-	}
-
 	zend_string *resolved_name = zend_resolve_const_name(orig_name, name_ast->attr, &is_fully_qualified);
 
 	if (zend_string_equals_literal(resolved_name, "__COMPILER_HALT_OFFSET__") || (name_ast->attr != ZEND_NAME_RELATIVE && zend_string_equals_literal(orig_name, "__COMPILER_HALT_OFFSET__"))) {
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
@@ -113,6 +113,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
 %token <ident> T_INSTANCEOF    "'instanceof'"
 %token <ident> T_NEW           "'new'"
 %token <ident> T_CLONE         "'clone'"
+%token <ident> T_EXIT          "'exit'"
 %token <ident> T_IF            "'if'"
 %token <ident> T_ELSEIF        "'elseif'"
 %token <ident> T_ELSE          "'else'"
@@ -296,7 +297,7 @@ start:
 
 reserved_non_modifiers:
 	  T_INCLUDE | T_INCLUDE_ONCE | T_EVAL | T_REQUIRE | T_REQUIRE_ONCE | T_LOGICAL_OR | T_LOGICAL_XOR | T_LOGICAL_AND
-	| T_INSTANCEOF | T_NEW | T_CLONE | T_IF | T_ELSEIF | T_ELSE | T_ENDIF | T_ECHO | T_DO | T_WHILE | T_ENDWHILE
+	| T_INSTANCEOF | T_NEW | T_CLONE | T_EXIT | T_IF | T_ELSEIF | T_ELSE | T_ENDIF | T_ECHO | T_DO | T_WHILE | T_ENDWHILE
 	| T_FOR | T_ENDFOR | T_FOREACH | T_ENDFOREACH | T_DECLARE | T_ENDDECLARE | T_AS | T_TRY | T_CATCH | T_FINALLY
 	| T_THROW | T_USE | T_INSTEADOF | T_GLOBAL | T_VAR | T_UNSET | T_ISSET | T_EMPTY | T_CONTINUE | T_GOTO
 	| T_FUNCTION | T_CONST | T_RETURN | T_PRINT | T_YIELD | T_LIST | T_SWITCH | T_ENDSWITCH | T_CASE | T_DEFAULT | T_BREAK
@@ -1239,6 +1240,11 @@ expr:
 	|	T_OBJECT_CAST expr	{ $$ = zend_ast_create_cast(IS_OBJECT, $2); }
 	|	T_BOOL_CAST expr	{ $$ = zend_ast_create_cast(_IS_BOOL, $2); }
 	|	T_UNSET_CAST expr	{ $$ = zend_ast_create_cast(IS_NULL, $2); }
+	|	T_EXIT ctor_arguments {
+			zend_ast *name = zend_ast_create_zval_from_str(ZSTR_KNOWN(ZEND_STR_EXIT));
+			name->attr = ZEND_NAME_FQ;
+			$$ = zend_ast_create(ZEND_AST_CALL, name, $2);
+		}
 	|	'@' expr			{ $$ = zend_ast_create(ZEND_AST_SILENCE, $2); }
 	|	scalar { $$ = $1; }
 	|	'`' backticks_expr '`' { $$ = zend_ast_create(ZEND_AST_SHELL_EXEC, $2); }
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
@@ -1382,6 +1382,14 @@ OPTIONAL_WHITESPACE_OR_COMMENTS ({WHITESPACE}|{MULTI_LINE_COMMENT}|{SINGLE_LINE_
 /* compute yyleng before each rule */
 <!*> := yyleng = YYCURSOR - SCNG(yy_text);
 
+<ST_IN_SCRIPTING>"exit" {
+	RETURN_TOKEN_WITH_IDENT(T_EXIT);
+}
+
+<ST_IN_SCRIPTING>"die" {
+	RETURN_TOKEN_WITH_IDENT(T_EXIT);
+}
+
 <ST_IN_SCRIPTING>"fn" {
 	RETURN_TOKEN_WITH_IDENT(T_FN);
 }
diff --git a/ext/tokenizer/tokenizer_data.c b/ext/tokenizer/tokenizer_data.c
diff --git a/ext/tokenizer/tokenizer_data.stub.php b/ext/tokenizer/tokenizer_data.stub.php
@@ -132,6 +132,11 @@
  * @cvalue T_CLONE
  */
 const T_CLONE = UNKNOWN;
+/**
+ * @var int
+ * @cvalue T_EXIT
+ */
+const T_EXIT = UNKNOWN;
 /**
  * @var int
  * @cvalue T_IF
diff --git a/ext/tokenizer/tokenizer_data_arginfo.h b/ext/tokenizer/tokenizer_data_arginfo.h
