Mark parse error functions as cold

diff --git a/Zend/zend.h b/Zend/zend.h
index ee8d5b03025822ac83b18141c6cebb0e3a5aad25..8062d75c76ae02672d61cd7788fb66351418a335 100644 (file)
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -289,7 +289,7 @@ ZEND_API ZEND_COLD void zend_throw_error(zend_class_entry *exception_ce, const c
 ZEND_API ZEND_COLD void zend_type_error(const char *format, ...);
 ZEND_API ZEND_COLD void zend_internal_type_error(zend_bool throw_exception, const char *format, ...);
 
-void zenderror(const char *error);
+ZEND_COLD void zenderror(const char *error);
 
 /* The following #define is used for code duality in PHP for Engine 1 & 2 */
 #define ZEND_STANDARD_CLASS_DEF_PTR zend_standard_class_def

diff --git a/Zend/zend_ini_parser.y b/Zend/zend_ini_parser.y
index 2bcebe8a03cc673a96d30b64ddd20c40715de371..e3042b80c175e6ce75f6018478c642baabfa4289 100644 (file)
--- a/Zend/zend_ini_parser.y
+++ b/Zend/zend_ini_parser.y
@@ -170,7 +170,7 @@ static void zend_ini_get_var(zval *result, zval *name)
 
 /* {{{ ini_error()
 */
-static void ini_error(const char *msg)
+static ZEND_COLD void ini_error(const char *msg)
 {
        char *error_buf;
        int error_buf_len;

diff --git a/Zend/zend_ini_scanner.c b/Zend/zend_ini_scanner.c
index 6eb1ff716ee4bee5d373ba4db0a128ab9362ac3b..e3d9d4d7d4aa606c700eb1be2d5564422fe06798 100644 (file)
--- a/Zend/zend_ini_scanner.c
+++ b/Zend/zend_ini_scanner.c
@@ -257,7 +257,7 @@ void shutdown_ini_scanner(void)
 
 /* {{{ zend_ini_scanner_get_lineno()
 */
-int zend_ini_scanner_get_lineno(void)
+ZEND_COLD int zend_ini_scanner_get_lineno(void)
 {
        return SCNG(lineno);
 }
@@ -265,7 +265,7 @@ int zend_ini_scanner_get_lineno(void)
 
 /* {{{ zend_ini_scanner_get_filename()
 */
-char *zend_ini_scanner_get_filename(void)
+ZEND_COLD char *zend_ini_scanner_get_filename(void)
 {
        return ini_filename ? ini_filename : "Unknown";
 }

diff --git a/Zend/zend_ini_scanner.h b/Zend/zend_ini_scanner.h
index 661197661cc737000a9290ffa72740b0aa8ead2a..f6fd2e79cc92a6c6a97b7d1876be1b8e230dea82 100644 (file)
--- a/Zend/zend_ini_scanner.h
+++ b/Zend/zend_ini_scanner.h
@@ -28,8 +28,8 @@
 #define ZEND_INI_SCANNER_TYPED  2 /* Typed mode. */
 
 BEGIN_EXTERN_C()
-int zend_ini_scanner_get_lineno(void);
-char *zend_ini_scanner_get_filename(void);
+ZEND_COLD int zend_ini_scanner_get_lineno(void);
+ZEND_COLD char *zend_ini_scanner_get_filename(void);
 int zend_ini_open_file_for_scanning(zend_file_handle *fh, int scanner_mode);
 int zend_ini_prepare_string_for_scanning(char *str, int scanner_mode);
 int ini_lex(zval *ini_lval);

diff --git a/Zend/zend_ini_scanner.l b/Zend/zend_ini_scanner.l
index 8cc7266ebb57a09a03652dfe3bea463705cd2270..37f70d0d1f8fe2f35b4c670550af5e3713bdb4ec 100644 (file)
--- a/Zend/zend_ini_scanner.l
+++ b/Zend/zend_ini_scanner.l
@@ -255,7 +255,7 @@ void shutdown_ini_scanner(void)
 
 /* {{{ zend_ini_scanner_get_lineno()
 */
-int zend_ini_scanner_get_lineno(void)
+ZEND_COLD int zend_ini_scanner_get_lineno(void)
 {
        return SCNG(lineno);
 }
@@ -263,7 +263,7 @@ int zend_ini_scanner_get_lineno(void)
 
 /* {{{ zend_ini_scanner_get_filename()
 */
-char *zend_ini_scanner_get_filename(void)
+ZEND_COLD char *zend_ini_scanner_get_filename(void)
 {
        return ini_filename ? ini_filename : "Unknown";
 }