Skip to content

Delete dead code related to intercept stubs #105127

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 3 commits into from
Jul 21, 2024
Merged

Delete dead code related to intercept stubs #105127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d8457cb
Delete dead code related to intercept stubs
jkotas Jul 19, 2024
5208677
Merge branch 'main' into cleanup
jkotas Jul 19, 2024
3ba1855
Merge branch 'main' into cleanup
jkotas Jul 20, 2024
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
12 changes: 0 additions & 12 deletions src/coreclr/vm/dllimport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,16 +688,6 @@ class ILStubState : public StubState
pcsDispatch->EmitCALL(METHOD__STUBHELPERS__SET_LAST_ERROR, 0, 0);
}

#if defined(TARGET_X86)
if (SF_IsForwardDelegateStub(m_dwStubFlags))
{
// the delegate may have an intercept stub attached to its sync block so we should
// prevent it from being garbage collected when the call is in progress
pcsDispatch->EmitLoadThis();
pcsDispatch->EmitCALL(METHOD__GC__KEEP_ALIVE, 1, 0);
}
#endif // defined(TARGET_X86)

#ifdef VERIFY_HEAP
if (SF_IsForwardStub(m_dwStubFlags) && g_pConfig->InteropValidatePinnedObjects())
{
Expand Down Expand Up @@ -5143,8 +5133,6 @@ namespace
// copy the stack arg byte count from the stub MD to the target MD - this number is computed
// during stub generation and is copied to all target MDs that share the stub
// (we don't set it for varargs - the number is call site specific)
// also copy the "takes parameters with copy constructors" flag which is needed to generate
// appropriate intercept stub

WORD cbStackArgSize = pStubMD->AsDynamicMethodDesc()->GetNativeStackArgSize();
if (pTargetMD->IsNDirect())
Expand Down
8 changes: 0 additions & 8 deletions src/coreclr/vm/stubmgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1258,14 +1258,6 @@ BOOL StubLinkStubManager::DoTraceStub(PCODE stubStartAddress,
LOG((LF_CORDB, LL_INFO10000,
"StubLinkStubManager::DoTraceStub: stub=%p\n", stub));

//
// If this is an intercept stub, we may be able to step
// into the intercepted stub.
//
// <TODO>!!! Note that this case should not be necessary, it's just
// here until I get all of the patch offsets & frame patch
// methods in place.</TODO>
//
TADDR pRealAddr = 0;
if (stub->IsMulticastDelegate())
{
Expand Down