summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2015-08-26 18:29:42 +0300
committerDmitry Stogov <dmitry@zend.com>2015-08-26 18:29:42 +0300
commite549ebdb231208fbf1990fa3565efabc2de4d7e0 (patch)
tree8d3ee3d3f01d754a2c2cbb235036311e9f2bde7f
parent942747cc3ec4d63a5aaaf96f0fffcbb9fedfa192 (diff)
downloadphp-git-e549ebdb231208fbf1990fa3565efabc2de4d7e0.tar.gz
Mark parse error functions as cold
-rw-r--r--Zend/zend.h2
-rw-r--r--Zend/zend_ini_parser.y2
-rw-r--r--Zend/zend_ini_scanner.c4
-rw-r--r--Zend/zend_ini_scanner.h4
-rw-r--r--Zend/zend_ini_scanner.l4
5 files changed, 8 insertions, 8 deletions
diff --git a/Zend/zend.h b/Zend/zend.h
index ee8d5b0302..8062d75c76 100644
--- 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 2bcebe8a03..e3042b80c1 100644
--- 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 6eb1ff716e..e3d9d4d7d4 100644
--- 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 661197661c..f6fd2e79cc 100644
--- 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 8cc7266ebb..37f70d0d1f 100644
--- 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";
}