Always track bailout file/lineno

diff --git a/Zend/zend.c b/Zend/zend.c
index d592065b2aa0edb532ed2c3a7fbc7cfee561e5ec..3fd618e42d5d6d37a4cf12c413dcb4235a4a332e 100644 (file)
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -464,13 +464,13 @@ void zenderror(char *error)
 
 
 BEGIN_EXTERN_C()
-ZEND_API void _zend_bailout(ZEND_FILE_LINE_D)
+ZEND_API void _zend_bailout(char *filename, uint lineno)
 {
        CLS_FETCH();
        ELS_FETCH();
 
        if (!EG(bailout_set)) {
-               zend_output_debug_string(1, "%s(%d) : Bailed out without a bailout address!" ZEND_FILE_LINE_RELAY_CC);
+               zend_output_debug_string(1, "%s(%d) : Bailed out without a bailout address!", filename, lineno);
                exit(-1);
        }
        CG(unclean_shutdown) = 1;

diff --git a/Zend/zend.h b/Zend/zend.h
index 6ff6feacb571d880fa9b5d7188ab9e4171b790e7..d43c082be030db5ff507f42f927021ab8c7bb630 100644 (file)
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -307,14 +307,10 @@ void zend_shutdown(void);
 void zend_set_utility_values(zend_utility_values *utility_values);
 
 BEGIN_EXTERN_C()
-ZEND_API void _zend_bailout(ZEND_FILE_LINE_D);
+ZEND_API void _zend_bailout(char *filename, uint lineno);
 END_EXTERN_C()
 
-#if ZEND_DEBUG
-#define zend_bailout()         _zend_bailout(ZEND_FILE_LINE_C)
-#else
-#define zend_bailout()         _zend_bailout()
-#endif
+#define zend_bailout()         _zend_bailout(__FILE__, __LINE__)
 
 #define zend_try                                                                                               \
        {                                                                                                                       \