Skip to content

Commit dd18187

Browse files
committed
No longer make assertAbort __cdecl
1 parent fd380ca commit dd18187

File tree

5 files changed

+5
-34
lines changed

5 files changed

+5
-34
lines changed

src/coreclr/gcinfo/arraylist.cpp

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,7 @@
77

88
#if defined(_DEBUG)
99

10-
#if !defined(_MSC_VER)
11-
#if !defined(__cdecl)
12-
#if defined(__i386__)
13-
#define __cdecl __attribute__((cdecl))
14-
#else
15-
#define __cdecl
16-
#endif
17-
#endif
18-
#endif
19-
20-
extern "C" void __cdecl assertAbort(const char* why, const char* file, unsigned line);
10+
extern "C" void assertAbort(const char* why, const char* file, unsigned line);
2111

2212
#define _ASSERTE(expr) if (!(expr)) { \
2313
assertAbort(#expr, __FILE__, __LINE__); \

src/coreclr/gcinfo/gcinfoencoder.cpp

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,8 @@
1212
#undef _ASSERTE
1313

1414
#if defined(_DEBUG)
15-
#if !defined(_MSC_VER)
16-
#if !defined(__cdecl)
17-
#if defined(__i386__)
18-
#define __cdecl __attribute__((cdecl))
19-
#else
20-
#define __cdecl
21-
#endif
22-
#endif
23-
#endif
2415

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

2718
#define _ASSERTE(expr) if (!(expr)) { \
2819
assertAbort(#expr, __FILE__, __LINE__); \

src/coreclr/interpreter/compiler.cpp

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3449,17 +3449,7 @@ void InterpCompiler::PrintCompiledIns(const int32_t *ip, const int32_t *start)
34493449
printf("\n");
34503450
}
34513451

3452-
#if !defined(_MSC_VER)
3453-
#if !defined(__cdecl)
3454-
#if defined(__i386__)
3455-
#define __cdecl __attribute__((cdecl))
3456-
#else
3457-
#define __cdecl
3458-
#endif
3459-
#endif
3460-
#endif
3461-
3462-
extern "C" void __cdecl assertAbort(const char* why, const char* file, unsigned line)
3452+
extern "C" void assertAbort(const char* why, const char* file, unsigned line)
34633453
{
34643454
if (gInterpJitInfoTls) {
34653455
if (!gInterpJitInfoTls->doAssert(file, line, why))

src/coreclr/jit/error.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ LogEnv::LogEnv(ICorJitInfo* aCompHnd)
258258
}
259259

260260
/*****************************************************************************/
261-
extern "C" void __cdecl assertAbort(const char* why, const char* file, unsigned line)
261+
extern "C" void assertAbort(const char* why, const char* file, unsigned line)
262262
{
263263
const char* msg = why;
264264
LogEnv* env = JitTls::GetLogEnv();

src/coreclr/jit/host.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ void gcDump_logf(const char* fmt, ...);
3636

3737
void logf(unsigned level, const char* fmt, ...);
3838

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

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

0 commit comments

Comments
 (0)