diff options
author | Sean Gillespie <sean@swgillespie.me> | 2017-03-21 22:00:12 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-21 22:00:12 -0700 |
commit | d5906ff3e0d0f864c1432f1f39d586ca3d79fbb6 (patch) | |
tree | 64bfe5037981c973e0db27fd8635971c06e8a24c /src/vm/syncblk.cpp | |
parent | f4b58a22dfe6336e90d587ef3457af2070a09afc (diff) | |
download | coreclr-d5906ff3e0d0f864c1432f1f39d586ca3d79fbb6.tar.gz coreclr-d5906ff3e0d0f864c1432f1f39d586ca3d79fbb6.tar.bz2 coreclr-d5906ff3e0d0f864c1432f1f39d586ca3d79fbb6.zip |
[Local GC] Forbid inclusion of gcscan.h from VM and DAC directories (#10332)
* Forbid inclusion of gcscan.h from VM and DAC directories
* Address code review feedback - hoist IsGCHeapInitialized check to an assert, since the heap should definitely be initialized if we are validating objects that ostensibly came from it
Diffstat (limited to 'src/vm/syncblk.cpp')
-rw-r--r-- | src/vm/syncblk.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/vm/syncblk.cpp b/src/vm/syncblk.cpp index b8a818c107..78e455a580 100644 --- a/src/vm/syncblk.cpp +++ b/src/vm/syncblk.cpp @@ -30,7 +30,6 @@ #include "corhost.h" #include "comdelegate.h" #include "finalizerthread.h" -#include "gcscan.h" #ifdef FEATURE_COMINTEROP #include "runtimecallablewrapper.h" @@ -2518,7 +2517,7 @@ BOOL ObjHeader::Validate (BOOL bVerifySyncBlkIndex) //rest of the DWORD is SyncBlk Index if (!(bits & BIT_SBLK_IS_HASHCODE)) { - if (bVerifySyncBlkIndex && GCScan::GetGcRuntimeStructuresValid ()) + if (bVerifySyncBlkIndex && GCHeapUtilities::GetGCHeap()->RuntimeStructuresValid ()) { DWORD sbIndex = bits & MASK_SYNCBLOCKINDEX; ASSERT_AND_CHECK(SyncTableEntry::GetSyncTableEntry()[sbIndex].m_Object == obj); |