Move ANALYZER_NORETURN after function return type.

GCC doesn't like attributes before the extern keyword.

diff --git a/src/inc/debugmacros.h b/src/inc/debugmacros.h
index 655fba5..540be99 100644 (file)
--- a/src/inc/debugmacros.h
+++ b/src/inc/debugmacros.h
@@ -30,8 +30,7 @@ bool GetStackTraceAtContext(SString & s, struct _CONTEXT * pContext);
 void _cdecl DbgWriteEx(LPCTSTR szFmt, ...);
 bool _DbgBreakCheck(LPCSTR szFile, int iLine, LPCSTR szExpr, BOOL fConstrained = FALSE);
 
 void _cdecl DbgWriteEx(LPCTSTR szFmt, ...);
 bool _DbgBreakCheck(LPCSTR szFile, int iLine, LPCSTR szExpr, BOOL fConstrained = FALSE);
 

-ANALYZER_NORETURN
-extern VOID DbgAssertDialog(const char *szFile, int iLine, const char *szExpr);
+extern VOID ANALYZER_NORETURN DbgAssertDialog(const char *szFile, int iLine, const char *szExpr);

 
 #define TRACE_BUFF_SIZE (cchMaxAssertStackLevelStringLen * cfrMaxAssertStackLevels + cchMaxAssertExprLen + 1)
 extern char g_szExprWithStack[TRACE_BUFF_SIZE];
 
 #define TRACE_BUFF_SIZE (cchMaxAssertStackLevelStringLen * cfrMaxAssertStackLevels + cchMaxAssertExprLen + 1)
 extern char g_szExprWithStack[TRACE_BUFF_SIZE];

diff --git a/src/jit/error.h b/src/jit/error.h
index 2a3b60f..18beb4b 100644 (file)
--- a/src/jit/error.h
+++ b/src/jit/error.h
@@ -73,14 +73,13 @@ extern void DECLSPEC_NORETURN noWayAssertBody(const char* cond, const char* file
 // Conditionally invoke the noway assert body. The conditional predicate is evaluated using a method on the tlsCompiler.
 // If a noway_assert is hit, we ask the Compiler whether to raise an exception (i.e., conditionally raise exception.)
 // To have backward compatibility between v4.5 and v4.0, in min-opts we take a shot at codegen rather than rethrow.
 // Conditionally invoke the noway assert body. The conditional predicate is evaluated using a method on the tlsCompiler.
 // If a noway_assert is hit, we ask the Compiler whether to raise an exception (i.e., conditionally raise exception.)
 // To have backward compatibility between v4.5 and v4.0, in min-opts we take a shot at codegen rather than rethrow.

-ANALYZER_NORETURN
-extern void noWayAssertBodyConditional(
+extern void ANALYZER_NORETURN noWayAssertBodyConditional(

 #ifdef FEATURE_TRACELOGGING
     const char* file, unsigned line
 #endif
     );
 #ifdef FEATURE_TRACELOGGING
     const char* file, unsigned line
 #endif
     );

-ANALYZER_NORETURN
-extern void noWayAssertBodyConditional(const char* cond, const char* file, unsigned line);
+
+extern void ANALYZER_NORETURN noWayAssertBodyConditional(const char* cond, const char* file, unsigned line);

 
 // Define MEASURE_NOWAY to 1 to enable code to count and rank individual noway_assert calls by occurrence.
 // These asserts would be dynamically executed, but not necessarily fail. The provides some insight into
 
 // Define MEASURE_NOWAY to 1 to enable code to count and rank individual noway_assert calls by occurrence.
 // These asserts would be dynamically executed, but not necessarily fail. The provides some insight into

diff --git a/src/jit/host.h b/src/jit/host.h
index 1b090a1..436c3d1 100644 (file)
--- a/src/jit/host.h
+++ b/src/jit/host.h
@@ -35,8 +35,7 @@ void gcDump_logf(const char* fmt, ...);
 
 void logf(unsigned level, const char* fmt, ...);
 
 
 void logf(unsigned level, const char* fmt, ...);
 

-ANALYZER_NORETURN
-extern "C" void __cdecl assertAbort(const char* why, const char* file, unsigned line);
+extern "C" void ANALYZER_NORETURN __cdecl assertAbort(const char* why, const char* file, unsigned line);

 
 #undef assert
 #define assert(p) (void)((p) || (assertAbort(#p, __FILE__, __LINE__), 0))
 
 #undef assert
 #define assert(p) (void)((p) || (assertAbort(#p, __FILE__, __LINE__), 0))

diff --git a/src/pal/src/include/pal/dbgmsg.h b/src/pal/src/include/pal/dbgmsg.h
index ad3dd54..d7219b2 100644 (file)
--- a/src/pal/src/include/pal/dbgmsg.h
+++ b/src/pal/src/include/pal/dbgmsg.h
@@ -355,8 +355,7 @@ bool DBG_ShouldCheckStackAlignment();
 
 #else /* defined(_DEBUG) */
 
 
 #else /* defined(_DEBUG) */
 

-ANALYZER_NORETURN
-inline void AssertBreak()
+inline void ANALYZER_NORETURN AssertBreak()

 {
     if(g_Dbg_asserts_enabled)
     {
 {
     if(g_Dbg_asserts_enabled)
     {