diff --git a/src/coreclr/inc/corhlpr.cpp b/src/coreclr/inc/corhlpr.cpp index f9559cec6a701..1a58e987153a3 100644 --- a/src/coreclr/inc/corhlpr.cpp +++ b/src/coreclr/inc/corhlpr.cpp @@ -48,7 +48,7 @@ void __stdcall DecoderInit(void *pThis, COR_ILMETHOD *header) #ifdef HOST_64BIT if((((size_t) header) & 3) == 0) // header is aligned #else - _ASSERTE((((size_t) header) & 3) == 0); // header is aligned + assert((((size_t) header) & 3) == 0); // header is aligned #endif { *((COR_ILMETHOD_FAT *)decoder) = header->Fat; @@ -129,18 +129,18 @@ unsigned __stdcall IlmethodEmit(unsigned size, COR_ILMETHOD_FAT* header, } else { // Fat format - _ASSERTE((((size_t) outBuff) & 3) == 0); // header is dword aligned + assert((((size_t) outBuff) & 3) == 0); // header is dword aligned COR_ILMETHOD_FAT* fatHeader = (COR_ILMETHOD_FAT*) outBuff; outBuff += sizeof(COR_ILMETHOD_FAT); *fatHeader = *header; fatHeader->SetFlags(fatHeader->GetFlags() | CorILMethod_FatFormat); - _ASSERTE((fatHeader->GetFlags() & CorILMethod_FormatMask) == CorILMethod_FatFormat); + assert((fatHeader->GetFlags() & CorILMethod_FormatMask) == CorILMethod_FatFormat); if (moreSections) fatHeader->SetFlags(fatHeader->GetFlags() | CorILMethod_MoreSects); fatHeader->SetSize(sizeof(COR_ILMETHOD_FAT) / 4); } #ifndef SOS_INCLUDE - _ASSERTE(&origBuff[size] == outBuff); + assert(&origBuff[size] == outBuff); #endif // !SOS_INCLUDE return(size); } @@ -211,7 +211,7 @@ unsigned __stdcall SectEH_Emit(unsigned size, unsigned ehCount, if (size == 0) return(0); - _ASSERTE((((size_t) outBuff) & 3) == 0); // header is dword aligned + assert((((size_t) outBuff) & 3) == 0); // header is dword aligned BYTE* origBuff = outBuff; if (ehCount <= 0) return 0; @@ -234,11 +234,11 @@ unsigned __stdcall SectEH_Emit(unsigned size, unsigned ehCount, fatClause->GetHandlerLength() > 0xFF) { break; // fall through and generate as FAT } - _ASSERTE((fatClause->GetFlags() & ~0xFFFF) == 0); - _ASSERTE((fatClause->GetTryOffset() & ~0xFFFF) == 0); - _ASSERTE((fatClause->GetTryLength() & ~0xFF) == 0); - _ASSERTE((fatClause->GetHandlerOffset() & ~0xFFFF) == 0); - _ASSERTE((fatClause->GetHandlerLength() & ~0xFF) == 0); + assert((fatClause->GetFlags() & ~0xFFFF) == 0); + assert((fatClause->GetTryOffset() & ~0xFFFF) == 0); + assert((fatClause->GetTryLength() & ~0xFF) == 0); + assert((fatClause->GetHandlerOffset() & ~0xFFFF) == 0); + assert((fatClause->GetHandlerLength() & ~0xFF) == 0); COR_ILMETHOD_SECT_EH_CLAUSE_SMALL* smallClause = (COR_ILMETHOD_SECT_EH_CLAUSE_SMALL*)&EHSect->Clauses[i]; smallClause->SetFlags((CorExceptionFlag) fatClause->GetFlags()); @@ -259,7 +259,7 @@ unsigned __stdcall SectEH_Emit(unsigned size, unsigned ehCount, EHSect->DataSize = (BYTE) EHSect->Size(ehCount); #endif // !SOS_INCLUDE EHSect->Reserved = 0; - _ASSERTE(EHSect->DataSize == EHSect->Size(ehCount)); // make sure didn't overflow + assert(EHSect->DataSize == EHSect->Size(ehCount)); // make sure didn't overflow outBuff = (BYTE*) &EHSect->Clauses[ehCount]; // Set the offsets for the exception type tokens. if (ehTypeOffsets) @@ -268,7 +268,7 @@ unsigned __stdcall SectEH_Emit(unsigned size, unsigned ehCount, COR_ILMETHOD_SECT_EH_CLAUSE_SMALL* smallClause = (COR_ILMETHOD_SECT_EH_CLAUSE_SMALL*)&EHSect->Clauses[i]; if (smallClause->GetFlags() == COR_ILEXCEPTION_CLAUSE_NONE) { - _ASSERTE(! IsNilToken(smallClause->GetClassToken())); + assert(! IsNilToken(smallClause->GetClassToken())); ehTypeOffsets[i] = (ULONG)((BYTE *)&smallClause->ClassToken - origBuff); } } @@ -285,7 +285,7 @@ unsigned __stdcall SectEH_Emit(unsigned size, unsigned ehCount, EHSect->SetDataSize(EHSect->Size(ehCount)); memcpy(EHSect->Clauses, clauses, ehCount * sizeof(COR_ILMETHOD_SECT_EH_CLAUSE_FAT)); outBuff = (BYTE*) &EHSect->Clauses[ehCount]; - _ASSERTE(&origBuff[size] == outBuff); + assert(&origBuff[size] == outBuff); // Set the offsets for the exception type tokens. if (ehTypeOffsets) { @@ -293,7 +293,7 @@ unsigned __stdcall SectEH_Emit(unsigned size, unsigned ehCount, COR_ILMETHOD_SECT_EH_CLAUSE_FAT* fatClause = (COR_ILMETHOD_SECT_EH_CLAUSE_FAT*)&EHSect->Clauses[i]; if (fatClause->GetFlags() == COR_ILEXCEPTION_CLAUSE_NONE) { - _ASSERTE(! IsNilToken(fatClause->GetClassToken())); + assert(! IsNilToken(fatClause->GetClassToken())); ehTypeOffsets[i] = (ULONG)((BYTE *)&fatClause->ClassToken - origBuff); } } diff --git a/src/coreclr/inc/corhlpr.h b/src/coreclr/inc/corhlpr.h index a4021921dd6eb..0e6ed3bed35cf 100644 --- a/src/coreclr/inc/corhlpr.h +++ b/src/coreclr/inc/corhlpr.h @@ -17,6 +17,7 @@ #define CORHLPR_TURNED_FPO_ON 1 #endif +#include #include "cor.h" #include "corhdr.h" #include "corerror.h" @@ -82,10 +83,6 @@ do { hr = (EXPR); if(FAILED(hr)) { goto LABEL; } } while (0) #endif -#ifndef _ASSERTE -#define _ASSERTE(expr) -#endif - #if !BIGENDIAN #define VAL16(x) x #define VAL32(x) x @@ -259,7 +256,7 @@ typedef struct tagCOR_ILMETHOD_SECT_EH_CLAUSE_SMALL : public IMAGE_COR_ILMETHOD_ return VAL16(TryOffset); } void SetTryOffset(DWORD Offset) { - _ASSERTE((Offset & ~0xffff) == 0); + assert((Offset & ~0xffff) == 0); TryOffset = VAL16(Offset); } @@ -267,7 +264,7 @@ typedef struct tagCOR_ILMETHOD_SECT_EH_CLAUSE_SMALL : public IMAGE_COR_ILMETHOD_ return TryLength; } void SetTryLength(DWORD Length) { - _ASSERTE((Length & ~0xff) == 0); + assert((Length & ~0xff) == 0); TryLength = Length; } @@ -275,7 +272,7 @@ typedef struct tagCOR_ILMETHOD_SECT_EH_CLAUSE_SMALL : public IMAGE_COR_ILMETHOD_ return VAL16(HandlerOffset); } void SetHandlerOffset(DWORD Offset) { - _ASSERTE((Offset & ~0xffff) == 0); + assert((Offset & ~0xffff) == 0); HandlerOffset = VAL16(Offset); } @@ -283,7 +280,7 @@ typedef struct tagCOR_ILMETHOD_SECT_EH_CLAUSE_SMALL : public IMAGE_COR_ILMETHOD_ return HandlerLength; } void SetHandlerLength(DWORD Length) { - _ASSERTE((Length & ~0xff) == 0); + assert((Length & ~0xff) == 0); HandlerLength = Length; } diff --git a/src/coreclr/pal/inc/pal_assert.h b/src/coreclr/pal/inc/pal_assert.h index 2953473343ec2..87af991d9abbc 100644 --- a/src/coreclr/pal/inc/pal_assert.h +++ b/src/coreclr/pal/inc/pal_assert.h @@ -31,10 +31,11 @@ extern "C" { #endif // __cplusplus +#ifndef _ASSERTE #if defined(_DEBUG) #define _ASSERTE(e) do { \ if (!(e)) { \ - fprintf (stderr, \ + PAL_fprintf (PAL_get_stderr(PAL_get_caller), \ "ASSERT FAILED\n" \ "\tExpression: %s\n" \ "\tLocation: line %d in %s\n" \ @@ -48,6 +49,7 @@ extern "C" { #else // !DEBUG #define _ASSERTE(e) ((void)0) #endif +#endif // _ASSERTE #ifndef assert #define assert(e) _ASSERTE(e) diff --git a/src/tests/profiler/native/rejitprofiler/ilrewriter.cpp b/src/tests/profiler/native/rejitprofiler/ilrewriter.cpp index 4659c6054ed35..371bac8f125a1 100644 --- a/src/tests/profiler/native/rejitprofiler/ilrewriter.cpp +++ b/src/tests/profiler/native/rejitprofiler/ilrewriter.cpp @@ -1,6 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +#define _ASSERTE(e) ((void)0) + #include #include #include "ilrewriter.h"