diff options
| author | Sean Gillespie <sean@swgillespie.me> | 2017-01-06 16:21:11 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-06 16:21:11 -0800 |
| commit | c10c1ff8e3237689212606c9aa5153beec8a1778 (patch) | |
| tree | 53041ba883979389d5eb22b43ce33df4312d5a68 /src/vm/amd64 | |
| parent | 548aec353e72117f875d6c08ffe52e2a43f01ad4 (diff) | |
| download | coreclr-c10c1ff8e3237689212606c9aa5153beec8a1778.tar.gz coreclr-c10c1ff8e3237689212606c9aa5153beec8a1778.tar.bz2 coreclr-c10c1ff8e3237689212606c9aa5153beec8a1778.zip | |
[Local GC] Move Software Write Watch's write barrier updates to GCToEEInterface::StompWriteBarrier (#8605)
* Move Software Write Watch's write barrier updates to use the new
GCToEEInterface::StompWriteBarrier to stomp the EE's write barrier.
* Address code review feedback, move SetCardsAfterBulkCopy to EE side of the interface
Diffstat (limited to 'src/vm/amd64')
| -rw-r--r-- | src/vm/amd64/jitinterfaceamd64.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/vm/amd64/jitinterfaceamd64.cpp b/src/vm/amd64/jitinterfaceamd64.cpp index d5dec8e6e8..53d8f74f1b 100644 --- a/src/vm/amd64/jitinterfaceamd64.cpp +++ b/src/vm/amd64/jitinterfaceamd64.cpp @@ -16,7 +16,6 @@ #include "eeconfig.h" #include "excep.h" #include "threadsuspend.h" -#include "../../gc/softwarewritewatch.h" extern uint8_t* g_ephemeral_low; extern uint8_t* g_ephemeral_high; @@ -532,9 +531,9 @@ void WriteBarrierManager::UpdateWriteWatchAndCardTableLocations(bool isRuntimeSu #ifdef FEATURE_SVR_GC case WRITE_BARRIER_WRITE_WATCH_SVR64: #endif // FEATURE_SVR_GC - if (*(UINT64*)m_pWriteWatchTableImmediate != (size_t)SoftwareWriteWatch::GetTable()) + if (*(UINT64*)m_pWriteWatchTableImmediate != (size_t)g_sw_ww_table) { - *(UINT64*)m_pWriteWatchTableImmediate = (size_t)SoftwareWriteWatch::GetTable(); + *(UINT64*)m_pWriteWatchTableImmediate = (size_t)g_sw_ww_table; fFlushCache = true; } break; |