com php-src: Merge branch 'PHP-7.4': Zend/zend.c Zend/zend.h ext/opcache/ZendAccelerator.c
| From: | Nikita Popov | Date: | Tue, 26 Mar 2019 14:48:02 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.4': Zend/zend.c Zend/zend.h ext/opcache/ZendAccelerator.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-105348@lists.php.net to get a copy of this message | ||
Commit: d49371fbd489b6767acf09afa7903e0a0558b5b4
Author: Nikita Popov <nikita.ppv@gmail.com> Tue, 26 Mar 2019 15:48:02 +0100
Parents: ece7fe60f5a476662a7a04d5a69c46975388cade 0122f395c7dc5afb9feb3e2dcd11bb90e7433948
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d49371fbd489b6767acf09afa7903e0a0558b5b4
Log:
Merge branch 'PHP-7.4'
Changed paths:
MM Zend/zend.c
MM Zend/zend.h
MM ext/opcache/ZendAccelerator.c
Diff:
diff --cc Zend/zend.c
index 7c81e9f,721a097..a37fa90
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@@ -1239,20 -1239,13 +1239,13 @@@ ZEND_API zval *zend_get_configuration_d
} \
} while (0)
- #if !defined(HAVE_NORETURN) || defined(HAVE_NORETURN_ALIAS)
- ZEND_API ZEND_COLD void zend_error(int type, const char *format, ...) /* {{{ */
- #else
- static ZEND_COLD void zend_error_va_list(int type, const char *format, va_list args)
- #endif
+ static ZEND_COLD void zend_error_va_list(
+ int type, const char *error_filename, uint32_t error_lineno,
+ const char *format, va_list args)
{
- #if !defined(HAVE_NORETURN) || defined(HAVE_NORETURN_ALIAS)
- va_list args;
- #endif
va_list usr_copy;
- zval params[5];
+ zval params[4];
zval retval;
- const char *error_filename;
- uint32_t error_lineno = 0;
zval orig_user_error_handler;
zend_bool in_compilation;
zend_class_entry *saved_class_entry;
diff --cc Zend/zend.h
index 294e2a6,70c3d82...3b8dfb2
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@@ -303,9 -293,14 +293,13 @@@ extern ZEND_API int (*zend_post_startup
extern ZEND_API void (*zend_post_shutdown_cb)(void);
ZEND_API ZEND_COLD void zend_error(int type, const char *format, ...)
ZEND_ATTRIBUTE_FORMAT(printf, 2, 3);
+ ZEND_API ZEND_COLD ZEND_NORETURN void zend_error_noreturn(int type, const char *format, ...)
ZEND_ATTRIBUTE_FORMAT(printf, 2, 3);
+ /* If filename is NULL the default filename is used. */
+ ZEND_API ZEND_COLD void zend_error_at(int type, const char *filename, uint32_t lineno, const char
*format, ....) ZEND_ATTRIBUTE_FORMAT(printf, 4, 5);
+
ZEND_API ZEND_COLD void zend_throw_error(zend_class_entry *exception_ce, const char *format, ...)
ZEND_ATTRIBUTE_FORMAT(printf, 2, 3);
ZEND_API ZEND_COLD void zend_type_error(const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 1,
2);
-ZEND_API ZEND_COLD void zend_internal_type_error(zend_bool throw_exception, const char *format,
...) ZEND_ATTRIBUTE_FORMAT(printf, 2, 3);
-ZEND_API ZEND_COLD void zend_internal_argument_count_error(zend_bool throw_exception, const char
*format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 2, 3);
+ZEND_API ZEND_COLD void zend_argument_count_error(const char *format, ...)
ZEND_ATTRIBUTE_FORMAT(printf, 1, 2);
ZEND_COLD void zenderror(const char *error);