diff options
| author | dotnet-bot <dotnet-bot@microsoft.com> | 2016-09-08 17:24:16 -0700 |
|---|---|---|
| committer | dotnet-bot <dotnet-bot@microsoft.com> | 2016-09-08 17:24:16 -0700 |
| commit | 1d90f2cbb3e52323e14354e6873c90b20fb63081 (patch) | |
| tree | 74b35247a8778f1453c5523ddf08dff0a4d328a6 /src/vm | |
| parent | 01b87afda3e9b9f21af51c334eb7fb5854070c4d (diff) | |
| download | coreclr-1d90f2cbb3e52323e14354e6873c90b20fb63081.tar.gz coreclr-1d90f2cbb3e52323e14354e6873c90b20fb63081.tar.bz2 coreclr-1d90f2cbb3e52323e14354e6873c90b20fb63081.zip | |
Fix a build break introduced by GH#6764
[tfs-changeset: 1626397]
Diffstat (limited to 'src/vm')
| -rw-r--r-- | src/vm/dac/dacwks.targets | 1 | ||||
| -rw-r--r-- | src/vm/gchost.cpp | 4 | ||||
| -rw-r--r-- | src/vm/mdaassistants.cpp | 2 | ||||
| -rw-r--r-- | src/vm/threads.cpp | 2 | ||||
| -rw-r--r-- | src/vm/wks/wks.targets | 1 |
5 files changed, 6 insertions, 4 deletions
diff --git a/src/vm/dac/dacwks.targets b/src/vm/dac/dacwks.targets index 82ab5439d5..6f6b9279a2 100644 --- a/src/vm/dac/dacwks.targets +++ b/src/vm/dac/dacwks.targets @@ -40,6 +40,7 @@ <CppCompile Include="$(ClrSrcDirectory)\vm\fptrstubs.cpp" /> <CppCompile Include="$(ClrSrcDirectory)\vm\frames.cpp" /> <CppCompile Include="$(ClrSrcDirectory)\vm\GCDecode.cpp" /> + <CppCompile Include="$(ClrSrcDirectory)\vm\gcheaputilities.cpp" /> <CppCompile Include="$(ClrSrcDirectory)\vm\genericdict.cpp" /> <CppCompile Include="$(ClrSrcDirectory)\vm\generics.cpp" /> <CppCompile Include="$(ClrSrcDirectory)\vm\hash.cpp" /> diff --git a/src/vm/gchost.cpp b/src/vm/gchost.cpp index f20b438a0b..b51f2459fd 100644 --- a/src/vm/gchost.cpp +++ b/src/vm/gchost.cpp @@ -48,7 +48,7 @@ HRESULT CorGCHost::_SetGCSegmentSize(SIZE_T SegmentSize) HRESULT hr = S_OK; // Sanity check the value, it must be a power of two and big enough. - if (!GCHeapUtilities::IsValidSegmentSize(SegmentSize)) + if (!GCHeapUtilities::GetGCHeap()->IsValidSegmentSize(SegmentSize)) { hr = E_INVALIDARG; } @@ -74,7 +74,7 @@ HRESULT CorGCHost::_SetGCMaxGen0Size(SIZE_T MaxGen0Size) HRESULT hr = S_OK; // Sanity check the value is at least large enough. - if (!GCHeapUtilities::IsValidGen0MaxSize(MaxGen0Size)) + if (!GCHeapUtilities::GetGCHeap()->IsValidGen0MaxSize(MaxGen0Size)) { hr = E_INVALIDARG; } diff --git a/src/vm/mdaassistants.cpp b/src/vm/mdaassistants.cpp index e0e747bbaf..e52e8ff8ec 100644 --- a/src/vm/mdaassistants.cpp +++ b/src/vm/mdaassistants.cpp @@ -868,7 +868,7 @@ LPVOID MdaInvalidOverlappedToPinvoke::CheckOverlappedPointer(UINT index, LPVOID { GCX_COOP(); - GCHeap *pHeap = GCHeapUtilities::GetGCHeap(); + IGCHeap *pHeap = GCHeapUtilities::GetGCHeap(); fHeapPointer = pHeap->IsHeapPointer(pOverlapped); } diff --git a/src/vm/threads.cpp b/src/vm/threads.cpp index 54cd03ed89..b52d7dc101 100644 --- a/src/vm/threads.cpp +++ b/src/vm/threads.cpp @@ -11616,7 +11616,7 @@ HRESULT Thread::GetMemStats (COR_GC_THREAD_STATS *pStats) CONTRACTL_END; // Get the allocation context which contains this counter in it. - alloc_context *p = &m_alloc_context; + gc_alloc_context *p = &m_alloc_context; pStats->PerThreadAllocation = p->alloc_bytes + p->alloc_bytes_loh; if (GetHasPromotedBytes()) pStats->Flags = COR_GC_THREAD_HAS_PROMOTED_BYTES; diff --git a/src/vm/wks/wks.targets b/src/vm/wks/wks.targets index 04562365f6..0df66fe558 100644 --- a/src/vm/wks/wks.targets +++ b/src/vm/wks/wks.targets @@ -107,6 +107,7 @@ <CppCompile Include="$(VmSourcesDir)\gcenv.os.cpp" /> <CppCompile Include="$(VmSourcesDir)\gchelpers.cpp" /> <CppCompile Include="$(VmSourcesDir)\gchost.cpp" /> + <CppCompile Include="$(VmSourcesDir)\gcheaputilities.cpp" /> <CppCompile Include="$(VmSourcesDir)\genericdict.cpp" /> <CppCompile Include="$(VmSourcesDir)\generics.cpp" /> <CppCompile Include="$(VmSourcesDir)\genmeth.cpp" /> |