From c10c1ff8e3237689212606c9aa5153beec8a1778 Mon Sep 17 00:00:00 2001 From: Sean Gillespie Date: Fri, 6 Jan 2017 16:21:11 -0800 Subject: [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 --- src/vm/amd64/jitinterfaceamd64.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/vm/amd64') 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; -- cgit v1.2.3