Skip to content

Clean up redundant defines and warning suppressions in coreclr/vm/common.h #130928

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AaronRobinsonMSFT wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Clean up redundant defines and warning suppressions in coreclr/vm/common.h #130928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e482f3
Clean up redundant defines and warning suppressions in coreclr/vm/com…
AaronRobinsonMSFT Jul 16, 2026
17338c6
Apply suggestions from code review
AaronRobinsonMSFT Jul 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/coreclr/debug/daccess/stdafx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
// and there's no reason why DAC should be forbidden from using it.
#define DO_NOT_DISABLE_RAND

#define USE_COM_CONTEXT_DEF

#include <stddef.h>
#include <stdint.h>
#include <windows.h>
Expand Down
2 changes: 0 additions & 2 deletions src/coreclr/debug/ee/stdafx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
//
//*****************************************************************************

#define USE_COM_CONTEXT_DEF

#include <stdint.h>
#include <wchar.h>
#include <stdio.h>
Expand Down
1 change: 0 additions & 1 deletion src/coreclr/md/ceefilegen/stdafx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
// Common include file for utility code.
//*****************************************************************************

#define _CRT_DEPENDENCY_ //this code depends on the crt file functions
#include <crtwrap.h>
#include <string.h>
#include <limits.h>
Expand Down
2 changes: 0 additions & 2 deletions src/coreclr/unwinder/stdafx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
// and there's no reason why DAC should be forbidden from using it.
#define DO_NOT_DISABLE_RAND

#define USE_COM_CONTEXT_DEF

#include <common.h>

#include <debugger.h>
Expand Down
35 changes: 0 additions & 35 deletions src/coreclr/vm/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,45 +14,10 @@
#define COMMON_TURNED_FPO_ON 1
#endif

#define USE_COM_CONTEXT_DEF

#if defined(_DEBUG)
#define DEBUG_REGDISPLAY
#endif

#ifdef _MSC_VER

// These don't seem useful, so turning them off is no big deal
#pragma warning(disable:4201) // nameless struct/union
#pragma warning(disable:4512) // can't generate assignment constructor
#pragma warning(disable:4211) // nonstandard extension used (char name[0] in structs)
#pragma warning(disable:4268) // 'const' static/global data initialized with compiler generated default constructor fills the object with zeros
#pragma warning(disable:4238) // nonstandard extension used : class rvalue used as lvalue
#pragma warning(disable:4291) // no matching operator delete found
#pragma warning(disable:4345) // behavior change: an object of POD type constructed with an initializer of the form () will be default-initialized

// Depending on the code base, you may want to not disable these
#pragma warning(disable:4245) // assigning signed / unsigned
#pragma warning(disable:4127) // conditional expression is constant
#pragma warning(disable:4100) // unreferenced formal parameter

#pragma warning(1:4189) // local variable initialized but not used

#ifndef DEBUG
#pragma warning(disable:4505) // unreferenced local function has been removed
#pragma warning(disable:4313) // 'format specifier' in format string conflicts with argument %d of type 'type'
#endif // !DEBUG

// CONSIDER put these back in
#pragma warning(disable:4063) // bad switch value for enum (only in Disasm.cpp)
#pragma warning(disable:4710) // function not inlined
#pragma warning(disable:4527) // user-defined destructor required
#pragma warning(disable:4513) // destructor could not be generated
#endif // _MSC_VER

#define _CRT_DEPENDENCY_ //this code depends on the crt file functions


#include <stdint.h>
#include <stddef.h>
Comment on lines 17 to 22

@jkotas jkotas Jul 17, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

#include <winwrap.h>
Expand Down
3 changes: 2 additions & 1 deletion src/coreclr/vm/gchelpers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1252,7 +1252,8 @@ OBJECTREF AllocateObject(MethodTable *pMT
if (pMT == g_pBaseCOMObject)
COMPlusThrow(kInvalidComObjectException, IDS_EE_NO_BACKING_CLASS_FACTORY);

oref = OBJECTREF_TO_UNCHECKED_OBJECTREF(AllocateComObject_ForManaged(pMT));
OBJECTREF obj = AllocateComObject_ForManaged(pMT);
oref = OBJECTREF_TO_UNCHECKED_OBJECTREF(obj);
}
#endif // FEATURE_COMINTEROP_UNMANAGED_ACTIVATION
#else // FEATURE_COMINTEROP
Expand Down
8 changes: 6 additions & 2 deletions src/coreclr/vm/olevariant.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2513,9 +2513,13 @@ BASEARRAYREF OleVariant::ExtractWrappedObjectsFromArray(BASEARRAYREF *pArray)
for (; pSrc < pSrcEnd; pSrc++, pDest++)
{
if (*pSrc != NULL)
memcpyNoGCRefs(pDest, &(*pSrc)->GetWrappedObject(), sizeof(DECIMAL));
{
*pDest = (*pSrc)->GetWrappedObject();
}
else
memset(pDest, 0, sizeof(DECIMAL));
{
*pDest = DECIMAL{};
}
}
}
else if (hndWrapperType == TypeHandle(CoreLibBinder::GetClass(CLASS__BSTR_WRAPPER)))
Expand Down
Loading