diff options
| author | Sean Gillespie <sean.william.g@gmail.com> | 2016-09-09 09:32:24 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-09 09:32:24 -0700 |
| commit | bd2b72b3516b36a10d5e51fd255df1f2efbb665c (patch) | |
| tree | 99bc5e25d06f4d84a32f7ccd789de5166834fe52 | |
| parent | 23c166d03a673e515131c2bb8777de308c0637ce (diff) | |
| parent | c4d22a210bc28923906b205b219e8bf5c8e58926 (diff) | |
| download | coreclr-bd2b72b3516b36a10d5e51fd255df1f2efbb665c.tar.gz coreclr-bd2b72b3516b36a10d5e51fd255df1f2efbb665c.tar.bz2 coreclr-bd2b72b3516b36a10d5e51fd255df1f2efbb665c.zip | |
Merge pull request #7121 from swgillespie/request-build-break
Only reference IGCHeap::gcHeapType when FEATURE_SVR_GC is defined
| -rw-r--r-- | src/debug/daccess/request.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/debug/daccess/request.cpp b/src/debug/daccess/request.cpp index 9de09e7f85..e38befafa7 100644 --- a/src/debug/daccess/request.cpp +++ b/src/debug/daccess/request.cpp @@ -2960,8 +2960,13 @@ ClrDataAccess::GetGCHeapData(struct DacpGcHeapData *gcheapData) SOSDacEnter(); + // for server GC-capable builds only, we need to check and see if IGCHeap::gcHeapType + // is GC_HEAP_INVALID, in which case we fail. + // IGCHeap::gcHeapType doesn't exist on non-server-GC capable builds.' +#ifdef FEATURE_SVR_GC size_t gcHeapValue = 0; ULONG32 returned = 0; + TADDR gcHeapTypeLocation = m_globalBase + g_dacGlobals.IGCHeap__gcHeapType; // @todo Microsoft: we should probably be capturing the HRESULT from ReadVirtual. We could @@ -2986,6 +2991,7 @@ ClrDataAccess::GetGCHeapData(struct DacpGcHeapData *gcheapData) hr = E_FAIL; goto cleanup; } +#endif // Now we can get other important information about the heap gcheapData->g_max_generation = GCHeapUtilities::GetMaxGeneration(); @@ -3005,8 +3011,10 @@ ClrDataAccess::GetGCHeapData(struct DacpGcHeapData *gcheapData) gcheapData->HeapCount = 1; } +#ifdef FEATURE_SVR_GC cleanup: ; +#endif SOSDacLeave(); return hr; |