diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2016-02-24 23:53:11 -0800 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2016-02-24 23:53:11 -0800 |
| commit | a1775a988af161a8268d7269c432246aad486a93 (patch) | |
| tree | b6de836f028e50626cb9f8e207ee16e15f6cb9a4 /src/vm/proftoeeinterfaceimpl.cpp | |
| parent | e1fd6dc6d5adf7c4107e60fdb8a6bcb5fc57069f (diff) | |
| download | coreclr-a1775a988af161a8268d7269c432246aad486a93.tar.gz coreclr-a1775a988af161a8268d7269c432246aad486a93.tar.bz2 coreclr-a1775a988af161a8268d7269c432246aad486a93.zip | |
Fixes for GC update
Diffstat (limited to 'src/vm/proftoeeinterfaceimpl.cpp')
| -rw-r--r-- | src/vm/proftoeeinterfaceimpl.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/vm/proftoeeinterfaceimpl.cpp b/src/vm/proftoeeinterfaceimpl.cpp index fe091de5d6..f4810b3f95 100644 --- a/src/vm/proftoeeinterfaceimpl.cpp +++ b/src/vm/proftoeeinterfaceimpl.cpp @@ -1251,14 +1251,15 @@ BOOL AllocByClassHelper(Object * pBO, void * pv) // which does the real work. // // Arguments: -// o - Object reference encountered +// pObj - Object reference encountered +/// ppRoot - Address that references ppObject (can be interior pointer) // pSC - ProfilingScanContext * containing the root kind and GCReferencesData used // by RootReference2 // dwFlags - Properties of the root as GC_CALL* constants (this function converts // to COR_PRF_GC_ROOT_FLAGS. // -void ScanRootsHelper(Object** ppObject, ScanContext *pSC, uint32_t dwFlags) +void ScanRootsHelper(Object* pObj, Object ** ppRoot, ScanContext *pSC, uint32_t dwFlags) { CONTRACTL { @@ -1305,7 +1306,7 @@ void ScanRootsHelper(Object** ppObject, ScanContext *pSC, uint32_t dwFlags) { // Let the profiling code know about this root reference g_profControlBlock.pProfInterface-> - RootReference2((BYTE *)*ppObject, pPSC->dwEtwRootKind, (EtwGCRootFlags)dwEtwRootFlags, (BYTE *)rootID, &((pPSC)->pHeapId)); + RootReference2((BYTE *)pObj, pPSC->dwEtwRootKind, (EtwGCRootFlags)dwEtwRootFlags, (BYTE *)rootID, &((pPSC)->pHeapId)); } #endif @@ -1318,7 +1319,7 @@ void ScanRootsHelper(Object** ppObject, ScanContext *pSC, uint32_t dwFlags) { ETW::GCLog::RootReference( NULL, // handle is NULL, cuz this is a non-HANDLE root - *ppObject, // object being rooted + pObj, // object being rooted NULL, // pSecondaryNodeForDependentHandle is NULL, cuz this isn't a dependent handle FALSE, // is dependent handle pPSC, |