Skip to content

Use unsized delete when we calculate size dynamically in a custom new overload #119112

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

Merged
merged 5 commits into from
Aug 27, 2025
Merged

Use unsized delete when we calculate size dynamically in a custom new overload #119112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4401a8f
Use unsized delete when we calculate size dynamically in a custom new…
jkoritzinsky Aug 26, 2025
beabb93
Fix visibility, defining un-sized delete. Define in MethodData base c…
jkoritzinsky Aug 26, 2025
190ec83
Don't replace unsized delete
jkoritzinsky Aug 27, 2025
1d73c8d
Apply suggestions from code review
jkoritzinsky Aug 27, 2025
918a00f
Apply suggestions from code review
jkoritzinsky Aug 27, 2025
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
5 changes: 5 additions & 0 deletions src/coreclr/vm/crossloaderallocatorhash.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,11 @@ class CrossLoaderAllocatorHash
static void* operator new(size_t baseSize, CountWrapper capacity);

public:
static void operator delete(void* ptr)
{
::operator delete(ptr);
}

static KeyValueStore *Create(TCount capacity, const TKey &key);

TCount GetCapacity() const { return _capacity; }
Expand Down
10 changes: 10 additions & 0 deletions src/coreclr/vm/methodtable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3122,6 +3122,10 @@ public :
static void HolderRelease(MethodData *pEntry)
{ WRAPPER_NO_CONTRACT; if (pEntry != NULL) pEntry->Release(); }

static void operator delete(void* ptr)
{
::operator delete(ptr);
}
protected:
ULONG m_cRef;
MethodTable *const m_pImplMT;
Expand Down Expand Up @@ -3357,6 +3361,12 @@ public :
_ASSERTE(size <= GetObjectSize(targetMT.pMT, computeOptions));
return ::operator new(GetObjectSize(targetMT.pMT, computeOptions));
}

static void operator delete(void* ptr)
{
::operator delete(ptr);
}

static void* operator new(size_t size) = delete;
}; // class MethodDataObject

Expand Down
7 changes: 6 additions & 1 deletion src/coreclr/vm/virtualcallstub.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ class VirtualCallStubManager : public StubManager
static BOOL isStubStatic(PCODE addr)
{
WRAPPER_NO_CONTRACT;

#ifdef FEATURE_CACHED_INTERFACE_DISPATCH
if (isCachedInterfaceDispatchStub(addr))
return TRUE;
Expand Down Expand Up @@ -1550,6 +1550,11 @@ class FastTable
{
return ::operator new(baseSize + (numCallStubs + CALL_STUB_FIRST_INDEX) * sizeof(size_t));
}
public:
static void operator delete(void* ptr)
{
::operator delete(ptr);
}
};
#ifdef _MSC_VER
#pragma warning(pop)
Expand Down