diff options
| author | Sean Gillespie <sean.william.g@gmail.com> | 2016-09-08 13:06:21 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-08 13:06:21 -0700 |
| commit | 1c43df95410e57f0d40e6ee55012ef65bdac2487 (patch) | |
| tree | b57fda7959af77de7c77353e5a5dd70a77f7d0dd /src/vm/arm | |
| parent | 65c2ff78e0e88f5052751747f6686084caab3d4c (diff) | |
| parent | 6519911fbccbec049f9592484f69c213b4b78264 (diff) | |
| download | coreclr-1c43df95410e57f0d40e6ee55012ef65bdac2487.tar.gz coreclr-1c43df95410e57f0d40e6ee55012ef65bdac2487.tar.bz2 coreclr-1c43df95410e57f0d40e6ee55012ef65bdac2487.zip | |
Merge pull request #6764 from swgillespie/gc-interface-3
Move the GC behind an interface and use that interface in the VM
Diffstat (limited to 'src/vm/arm')
| -rw-r--r-- | src/vm/arm/asmconstants.h | 4 | ||||
| -rw-r--r-- | src/vm/arm/stubs.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/vm/arm/asmconstants.h b/src/vm/arm/asmconstants.h index 47ebb2d24d..93af04734e 100644 --- a/src/vm/arm/asmconstants.h +++ b/src/vm/arm/asmconstants.h @@ -225,10 +225,10 @@ ASMCONSTANTS_C_ASSERT(UnmanagedToManagedFrame__m_pvDatum == offsetof(UnmanagedTo #ifndef CROSSGEN_COMPILE #define Thread__m_alloc_context__alloc_limit 0x44 -ASMCONSTANTS_C_ASSERT(Thread__m_alloc_context__alloc_limit == offsetof(Thread, m_alloc_context) + offsetof(alloc_context, alloc_limit)); +ASMCONSTANTS_C_ASSERT(Thread__m_alloc_context__alloc_limit == offsetof(Thread, m_alloc_context) + offsetof(gc_alloc_context, alloc_limit)); #define Thread__m_alloc_context__alloc_ptr 0x40 -ASMCONSTANTS_C_ASSERT(Thread__m_alloc_context__alloc_ptr == offsetof(Thread, m_alloc_context) + offsetof(alloc_context, alloc_ptr)); +ASMCONSTANTS_C_ASSERT(Thread__m_alloc_context__alloc_ptr == offsetof(Thread, m_alloc_context) + offsetof(gc_alloc_context, alloc_ptr)); #endif // CROSSGEN_COMPILE #define Thread__m_fPreemptiveGCDisabled 0x08 diff --git a/src/vm/arm/stubs.cpp b/src/vm/arm/stubs.cpp index 0b069da47e..1309695f73 100644 --- a/src/vm/arm/stubs.cpp +++ b/src/vm/arm/stubs.cpp @@ -2650,7 +2650,7 @@ void InitJITHelpers1() )) { - _ASSERTE(GCHeap::UseAllocationContexts()); + _ASSERTE(GCHeapUtilities::UseAllocationContexts()); // If the TLS for Thread is low enough use the super-fast helpers if (gThreadTLSIndex < TLS_MINIMUM_AVAILABLE) { |