diff options
Diffstat (limited to 'src/vm/runtimecallablewrapper.cpp')
| -rw-r--r-- | src/vm/runtimecallablewrapper.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/vm/runtimecallablewrapper.cpp b/src/vm/runtimecallablewrapper.cpp index d12d5568f6..359b6896bc 100644 --- a/src/vm/runtimecallablewrapper.cpp +++ b/src/vm/runtimecallablewrapper.cpp @@ -42,6 +42,7 @@ class Object; #include "olevariant.h" #include "interopconverter.h" #include "constrainedexecutionregion.h" +#include "typestring.h" #ifdef FEATURE_REMOTING #include "crossdomaincalls.h" #endif @@ -1591,7 +1592,7 @@ public: if (pRCW->IsValid()) { - if (!GCHeap::GetGCHeap()->IsPromoted(OBJECTREFToObject(pRCW->GetExposedObject())) && + if (!GCHeapUtilities::GetGCHeap()->IsPromoted(OBJECTREFToObject(pRCW->GetExposedObject())) && !pRCW->IsDetached()) { // No need to use InterlockedOr here since every other place that modifies the flags @@ -1612,7 +1613,7 @@ void RCWCache::DetachWrappersWorker() NOTHROW; GC_NOTRIGGER; MODE_ANY; - PRECONDITION(GCHeap::IsGCInProgress()); // GC is in progress and the runtime is suspended + PRECONDITION(GCHeapUtilities::IsGCInProgress()); // GC is in progress and the runtime is suspended } CONTRACTL_END; @@ -2808,7 +2809,7 @@ void RCW::MinorCleanup() NOTHROW; GC_NOTRIGGER; MODE_ANY; - PRECONDITION(GCHeap::IsGCInProgress() || ( (g_fEEShutDown & ShutDown_SyncBlock) && g_fProcessDetach )); + PRECONDITION(GCHeapUtilities::IsGCInProgress() || ( (g_fEEShutDown & ShutDown_SyncBlock) && g_fProcessDetach )); } CONTRACTL_END; |