diff options
| author | Jan Vorlicek <janvorli@microsoft.com> | 2019-03-13 01:07:00 +0100 |
|---|---|---|
| committer | Jan Vorlicek <janvorli@microsoft.com> | 2019-03-13 01:07:00 +0100 |
| commit | 78004e9a33422d1c2399339a3ac408f4c654d06b (patch) | |
| tree | 929289b8ba812d044c16cde4872b9953f99e654b | |
| parent | c4ca1ddb2413a354e8f49fff4680f175a02e7d8e (diff) | |
| download | coreclr-78004e9a33422d1c2399339a3ac408f4c654d06b.tar.gz coreclr-78004e9a33422d1c2399339a3ac408f4c654d06b.tar.bz2 coreclr-78004e9a33422d1c2399339a3ac408f4c654d06b.zip | |
Move ANALYZER_NORETURN after function return type.
GCC doesn't like attributes before the extern keyword.
| -rw-r--r-- | src/inc/debugmacros.h | 3 | ||||
| -rw-r--r-- | src/jit/error.h | 7 | ||||
| -rw-r--r-- | src/jit/host.h | 3 | ||||
| -rw-r--r-- | src/pal/src/include/pal/dbgmsg.h | 3 |
4 files changed, 6 insertions, 10 deletions
diff --git a/src/inc/debugmacros.h b/src/inc/debugmacros.h index 655fba5e5e..540be99c74 100644 --- 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); -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]; diff --git a/src/jit/error.h b/src/jit/error.h index 2a3b60fcde..18beb4b151 100644 --- 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. -ANALYZER_NORETURN -extern void noWayAssertBodyConditional( +extern void ANALYZER_NORETURN noWayAssertBodyConditional( #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 diff --git a/src/jit/host.h b/src/jit/host.h index 1b090a194f..436c3d1457 100644 --- 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, ...); -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)) diff --git a/src/pal/src/include/pal/dbgmsg.h b/src/pal/src/include/pal/dbgmsg.h index ad3dd540cd..d7219b2bd4 100644 --- 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) */ -ANALYZER_NORETURN -inline void AssertBreak() +inline void ANALYZER_NORETURN AssertBreak() { if(g_Dbg_asserts_enabled) { |