Skip to content

Add QCALL_CONTRACT_NO_GC_TRANSITION #36294

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
AaronRobinsonMSFT merged 1 commit into from
May 12, 2020
Merged

Add QCALL_CONTRACT_NO_GC_TRANSITION #36294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 2 additions & 4 deletions src/coreclr/src/vm/interoplibinterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1385,8 +1385,7 @@ void ComWrappersNative::MarkWrapperAsComActivated(_In_ IUnknown* wrapperMaybe)

void QCALLTYPE GlobalComWrappersForMarshalling::SetGlobalInstanceRegisteredForMarshalling()
{
// QCALL contracts are not used here because the managed declaration
// uses the SuppressGCTransition attribute
QCALL_CONTRACT_NO_GC_TRANSITION;

_ASSERTE(!g_IsGlobalComWrappersRegisteredForMarshalling);
g_IsGlobalComWrappersRegisteredForMarshalling = true;
Expand Down Expand Up @@ -1455,8 +1454,7 @@ bool GlobalComWrappersForMarshalling::TryGetOrCreateObjectForComInstance(

void QCALLTYPE GlobalComWrappersForTrackerSupport::SetGlobalInstanceRegisteredForTrackerSupport()
{
// QCALL contracts are not used here because the managed declaration
// uses the SuppressGCTransition attribute
QCALL_CONTRACT_NO_GC_TRANSITION;

_ASSERTE(!g_IsGlobalComWrappersRegisteredForTrackerSupport);
g_IsGlobalComWrappersRegisteredForTrackerSupport = true;
Expand Down
6 changes: 6 additions & 0 deletions src/coreclr/src/vm/qcall.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,13 @@
GC_TRIGGERS; \
MODE_PREEMPTIVE; \

#define QCALL_CHECK_NO_GC_TRANSITION \
THROWS; \
GC_TRIGGERS; \
MODE_COOPERATIVE; \

#define QCALL_CONTRACT CONTRACTL { QCALL_CHECK; } CONTRACTL_END;
#define QCALL_CONTRACT_NO_GC_TRANSITION CONTRACTL { QCALL_CHECK_NO_GC_TRANSITION; } CONTRACTL_END;

//
// Scope class for QCall helper methods and types
Expand Down