diff options
| author | Sean Gillespie <sean.william.g@gmail.com> | 2016-09-08 13:06:21 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-08 13:06:21 -0700 |
| commit | 1c43df95410e57f0d40e6ee55012ef65bdac2487 (patch) | |
| tree | b57fda7959af77de7c77353e5a5dd70a77f7d0dd /src/debug/daccess/dacdbiimpl.cpp | |
| parent | 65c2ff78e0e88f5052751747f6686084caab3d4c (diff) | |
| parent | 6519911fbccbec049f9592484f69c213b4b78264 (diff) | |
| download | coreclr-1c43df95410e57f0d40e6ee55012ef65bdac2487.tar.gz coreclr-1c43df95410e57f0d40e6ee55012ef65bdac2487.tar.bz2 coreclr-1c43df95410e57f0d40e6ee55012ef65bdac2487.zip | |
Merge pull request #6764 from swgillespie/gc-interface-3
Move the GC behind an interface and use that interface in the VM
Diffstat (limited to 'src/debug/daccess/dacdbiimpl.cpp')
| -rw-r--r-- | src/debug/daccess/dacdbiimpl.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/debug/daccess/dacdbiimpl.cpp b/src/debug/daccess/dacdbiimpl.cpp index 9b17f4cd46..cb9c0310cc 100644 --- a/src/debug/daccess/dacdbiimpl.cpp +++ b/src/debug/daccess/dacdbiimpl.cpp @@ -6517,7 +6517,7 @@ HRESULT DacHeapWalker::Init(CORDB_ADDRESS start, CORDB_ADDRESS end) if (thread == NULL) continue; - alloc_context *ctx = thread->GetAllocContext(); + gc_alloc_context *ctx = thread->GetAllocContext(); if (ctx == NULL) continue; @@ -6533,7 +6533,7 @@ HRESULT DacHeapWalker::Init(CORDB_ADDRESS start, CORDB_ADDRESS end) } #ifdef FEATURE_SVR_GC - HRESULT hr = GCHeap::IsServerHeap() ? InitHeapDataSvr(mHeaps, mHeapCount) : InitHeapDataWks(mHeaps, mHeapCount); + HRESULT hr = GCHeapUtilities::IsServerHeap() ? InitHeapDataSvr(mHeaps, mHeapCount) : InitHeapDataWks(mHeaps, mHeapCount); #else HRESULT hr = InitHeapDataWks(mHeaps, mHeapCount); #endif @@ -6777,7 +6777,7 @@ HRESULT DacDbiInterfaceImpl::GetHeapSegments(OUT DacDbiArrayList<COR_SEGMENT> *p HeapData *heaps = 0; #ifdef FEATURE_SVR_GC - HRESULT hr = GCHeap::IsServerHeap() ? DacHeapWalker::InitHeapDataSvr(heaps, heapCount) : DacHeapWalker::InitHeapDataWks(heaps, heapCount); + HRESULT hr = GCHeapUtilities::IsServerHeap() ? DacHeapWalker::InitHeapDataSvr(heaps, heapCount) : DacHeapWalker::InitHeapDataWks(heaps, heapCount); #else HRESULT hr = DacHeapWalker::InitHeapDataWks(heaps, heapCount); #endif @@ -7171,7 +7171,7 @@ void DacDbiInterfaceImpl::GetGCHeapInformation(COR_HEAPINFO * pHeapInfo) pHeapInfo->areGCStructuresValid = GCScan::GetGcRuntimeStructuresValid(); #ifdef FEATURE_SVR_GC - if (GCHeap::IsServerHeap()) + if (GCHeapUtilities::IsServerHeap()) { pHeapInfo->gcType = CorDebugServerGC; pHeapInfo->numHeaps = DacGetNumHeaps(); |