Update GC from dotnet/runtime

src/Native/Runtime/GCHelpers.cpp

@@ -211,7 +211,7 @@ COOP_PINVOKE_HELPER(Int64, RhGetAllocatedBytesForCurrentThread, ())
 {
     Thread *pThread = ThreadStore::GetCurrentThread();
     gc_alloc_context *ac = pThread->GetAllocContext();
-    Int64 currentAllocated = ac->alloc_bytes + ac->alloc_bytes_loh - (ac->alloc_limit - ac->alloc_ptr);
+    Int64 currentAllocated = ac->alloc_bytes + ac->alloc_bytes_uoh - (ac->alloc_limit - ac->alloc_ptr);
     return currentAllocated;
 }
 
@@ -336,10 +336,14 @@ static Array* AllocateUninitializedArrayImpl(Thread* pThread, EEType* pArrayEETy
         }
     }
 
+    UInt32 uFlags = GC_ALLOC_ZEROING_OPTIONAL;
+    if (size > RH_LARGE_OBJECT_SIZE)
+        uFlags |= GC_ALLOC_LARGE_OBJECT_HEAP;
+
     // Save the EEType for instrumentation purposes.
     RedhawkGCInterface::SetLastAllocEEType(pArrayEEType);
 
-    Array* pArray = (Array*)GCHeapUtilities::GetGCHeap()->Alloc(pThread->GetAllocContext(), size, GC_ALLOC_ZEROING_OPTIONAL);
+    Array* pArray = (Array*)GCHeapUtilities::GetGCHeap()->Alloc(pThread->GetAllocContext(), size, uFlags);
     if (pArray == NULL)
     {
         return NULL;

src/Native/Runtime/gcrhenv.cpp

@@ -280,16 +280,13 @@ COOP_PINVOKE_HELPER(void*, RhpGcAlloc, (EEType *pEEType, UInt32 uFlags, UIntNati
         }
     }
 
+    if (cbSize > RH_LARGE_OBJECT_SIZE)
+        uFlags |= GC_ALLOC_LARGE_OBJECT_HEAP;
+
     // Save the EEType for instrumentation purposes.
     RedhawkGCInterface::SetLastAllocEEType(pEEType);
 
-    Object * pObject;
-#ifdef FEATURE_64BIT_ALIGNMENT
-    if (uFlags & GC_ALLOC_ALIGN8)
-        pObject = GCHeapUtilities::GetGCHeap()->AllocAlign8(pThread->GetAllocContext(), cbSize, uFlags);
-    else
-#endif // FEATURE_64BIT_ALIGNMENT
-        pObject = GCHeapUtilities::GetGCHeap()->Alloc(pThread->GetAllocContext(), cbSize, uFlags);
+    Object * pObject = GCHeapUtilities::GetGCHeap()->Alloc(pThread->GetAllocContext(), cbSize, uFlags);
 
     // NOTE: we cannot call PublishObject here because the object isn't initialized!
 

src/Native/Runtime/gctoclreventsink.cpp

@@ -287,20 +287,12 @@ void GCToCLREventSink::FireGCFullNotify_V1(uint32_t genNumber, uint32_t isAlloc)
 
 void GCToCLREventSink::FireSetGCHandle(void* handleID, void* objectID, uint32_t kind, uint32_t generation)
 {
-#ifdef _WIN32
     FireEtwSetGCHandle(handleID, objectID, kind, generation, -1, GetClrInstanceId());
-#else // _WIN32
-    FireEtwSetGCHandle(handleID, objectID, kind, generation, GetClrInstanceId());
-#endif // _WIN32
 }
 
 void GCToCLREventSink::FirePrvSetGCHandle(void* handleID, void* objectID, uint32_t kind, uint32_t generation)
 {
-#ifdef _WIN32
     FireEtwPrvSetGCHandle(handleID, objectID, kind, generation, -1, GetClrInstanceId());
-#else // _WIN32
-    FireEtwPrvSetGCHandle(handleID, objectID, kind, generation, GetClrInstanceId());
-#endif // _WIN32
 }
 
 void GCToCLREventSink::FireDestroyGCHandle(void *handleID)

src/Native/configure.cmake

@@ -2,6 +2,7 @@ include(CheckFunctionExists)
 include(CheckStructHasMember)
 include(CheckCXXSourceCompiles)
 include(CheckCXXSourceRuns)
+include(CheckCXXSymbolExists)
 
 add_compile_options(-I${CMAKE_CURRENT_SOURCE_DIR}/Common)
 

src/Native/gc/env/etmdummy.h

@@ -47,7 +47,7 @@
 #define FireEtwGCMarkHandles(HeapNum, ClrInstanceID) 0
 #define FireEtwGCMarkOlderGenerationRoots(HeapNum, ClrInstanceID) 0
 #define FireEtwFinalizeObject(TypeID, ObjectID, ClrInstanceID) 0
-#define FireEtwSetGCHandle(HandleID, ObjectID, Kind, Generation, ClrInstanceID) 0
+#define FireEtwSetGCHandle(HandleID, ObjectID, Kind, Generation, DomainAddr, ClrInstanceID) 0
 #define FireEtwDestroyGCHandle(HandleID, ClrInstanceID) 0
 #define FireEtwGCSampledObjectAllocationLow(Address, TypeID, ObjectCountForTypeSample, TotalSizeForTypeSample, ClrInstanceID) 0
 #define FireEtwPinObjectAtGCTime(HandleID, ObjectID, ObjectSize, TypeName, ClrInstanceID) 0
@@ -376,7 +376,7 @@
 #define FireEtwFailFast(FailFastUserMessage, FailedEIP, OSExitCode, ClrExitCode, ClrInstanceID) 0
 #define FireEtwPrvFinalizeObject(TypeID, ObjectID, ClrInstanceID, TypeName) 0
 #define FireEtwCCWRefCountChange(HandleID, ObjectID, COMInterfacePointer, NewRefCount, AppDomainID, ClassName, NameSpace, Operation, ClrInstanceID) 0
-#define FireEtwPrvSetGCHandle(HandleID, ObjectID, Kind, Generation, ClrInstanceID) 0
+#define FireEtwPrvSetGCHandle(HandleID, ObjectID, Kind, Generation, DomainAddr, ClrInstanceId) 0
 #define FireEtwPrvDestroyGCHandle(HandleID, ClrInstanceID) 0
 #define FireEtwFusionMessageEvent(ClrInstanceID, Prepend, Message) 0
 #define FireEtwFusionErrorCodeEvent(ClrInstanceID, Category, ErrorCode) 0
@@ -398,3 +398,13 @@
 #define FireEtwBeginCreateManagedReference(ClrInstanceID) 0
 #define FireEtwEndCreateManagedReference(ClrInstanceID) 0
 #define FireEtwObjectVariantMarshallingToManaged(TypeName, Int1, ClrInstanceID) 0
+#define FireEtwGCDynamicEvent(EventName, PayloadSize, Payload, ClrInstanceId) 0
+#define FireEtwBGC1stSweepEnd(GenNumber, ClrInstanceId) 0
+#define FireEtwResolutionAttempted(ClrInstanceId, asmName, stage, assemblyLoadContextName, result, resultAsmName, resultAsmPath, errMsg) 0
+#define FireEtwResolutionAttempted(ClrInstanceId, asmName, event, alcName, result, resultAsmName, resultAsmPath, errMsg) 0
+#define FireEtwKnownPathProbed(ClrInstanceId, path, source, hr) 0
+#define FireEtwContentionStop_V1(managedContention, ClrInstanceId, elapsedTimeInNanosecond) 0
+#define FireEtwAssemblyLoadContextResolvingHandlerInvoked(ClrInstanceId, assemblyName, handlerName, alcName, resultAssemblyName, resultAssemblyPath) 0
+#define FireEtwAppDomainAssemblyResolveHandlerInvoked(ClrInstanceId, assemblyName, handlerName, resultAssemblyName, resultAssemblyPath) 0
+#define FireEtwAssemblyLoadFromResolveHandlerInvoked(ClrInstanceId, assemblyName, isTrackedAssembly, requestingAssemblyPath, requestedAssemblyPath) 0
+#define FireEtwEventSource(eventID, eventName, eventSourceName, payload) 0

src/Native/gc/env/gcenv.base.h

@@ -28,6 +28,12 @@
 #define NOINLINE __declspec(noinline)
 #endif // _MSC_VER
 
+#ifdef _MSC_VER
+#define __UNREACHABLE() __assume(0)
+#else
+#define __UNREACHABLE() __builtin_unreachable()
+#endif
+
 #ifndef SIZE_T_MAX
 #define SIZE_T_MAX ((size_t)-1)
 #endif
@@ -128,7 +134,7 @@ typedef DWORD (WINAPI *PTHREAD_START_ROUTINE)(void* lpThreadParameter);
 #define WAIT_TIMEOUT            258
 #define WAIT_FAILED             0xFFFFFFFF
 
-#if defined(_MSC_VER) 
+#if defined(_MSC_VER)
  #if defined(_ARM_)
 
   __forceinline void YieldProcessor() { }
@@ -147,25 +153,25 @@ typedef DWORD (WINAPI *PTHREAD_START_ROUTINE)(void* lpThreadParameter);
   #define MemoryBarrier() { __dmb(_ARM64_BARRIER_SY); }
 
  #elif defined(_AMD64_)
-  
+
   extern "C" void
   _mm_pause (
       void
       );
-  
+
   extern "C" void
   _mm_mfence (
       void
       );
 
   #pragma intrinsic(_mm_pause)
   #pragma intrinsic(_mm_mfence)
-  
+
   #define YieldProcessor _mm_pause
   #define MemoryBarrier _mm_mfence
 
  #elif defined(_X86_)
-  
+
   #define YieldProcessor() __asm { rep nop }
   #define MemoryBarrier() MemoryBarrierImpl()
   __forceinline void MemoryBarrierImpl()
@@ -272,7 +278,7 @@ inline uint8_t BitScanForward64(uint32_t *bitIndex, uint64_t mask)
     uint32_t hi = (mask >> 32) & 0xFFFFFFFF;
     uint32_t lo = mask & 0xFFFFFFFF;
     uint32_t fakeBitIndex = 0;
-    
+
     uint8_t result = BitScanForward(bitIndex, lo);
     if (result == 0)
     {
@@ -509,8 +515,6 @@ inline bool dbgOnly_IsSpecialEEThread()
     return false;
 }
 
-#define ClrFlsSetThreadType(type)
-
 //
 // Performance logging
 //

src/Native/gc/env/gcenv.ee.h

@@ -15,20 +15,20 @@ class GCToEEInterface
     static void SuspendEE(SUSPEND_REASON reason);
     static void RestartEE(bool bFinishedGC); //resume threads.
 
-    // 
+    //
     // The GC roots enumeration callback
     //
     static void GcScanRoots(promote_func* fn, int condemned, int max_gen, ScanContext* sc);
 
-    // 
+    //
     // Callbacks issues during GC that the execution engine can do its own bookeeping
     //
 
     // start of GC call back - single threaded
-    static void GcStartWork(int condemned, int max_gen); 
+    static void GcStartWork(int condemned, int max_gen);
 
-    //EE can perform post stack scanning action, while the 
-    // user threads are still suspended 
+    //EE can perform post stack scanning action, while the
+    // user threads are still suspended
     static void AfterGcScanRoots(int condemned, int max_gen, ScanContext* sc);
 
     // Called before BGC starts sweeping, the heap is walkable

src/Native/gc/env/gcenv.interlocked.h

@@ -48,7 +48,7 @@ class Interlocked
     template<typename T>
     static void Or(T volatile *destination, T value);
 
-    // Set a 32-bit variable to the specified value as an atomic operation. 
+    // Set a 32-bit variable to the specified value as an atomic operation.
     // Parameters:
     //  destination - value to be exchanged
     //  value       - value to set the destination to
@@ -84,7 +84,7 @@ class Interlocked
     template<typename T>
     static T ExchangeAddPtr(T volatile* addend, T value);
 
-    // Performs an atomic compare-and-exchange operation on the specified values. 
+    // Performs an atomic compare-and-exchange operation on the specified values.
     // Parameters:
     //  destination - value to be exchanged
     //  exchange    - value to set the destination to
@@ -95,7 +95,7 @@ class Interlocked
     template<typename T>
     static T CompareExchange(T volatile *destination, T exchange, T comparand);
 
-    // Performs an atomic compare-and-exchange operation on the specified pointers. 
+    // Performs an atomic compare-and-exchange operation on the specified pointers.
     // Parameters:
     //  destination - value to be exchanged
     //  exchange    - value to set the destination to

src/Native/gc/env/gcenv.interlocked.inl

@@ -57,7 +57,7 @@ __forceinline T Interlocked::Decrement(T volatile *addend)
 #endif
 }
 
-// Set a 32-bit variable to the specified value as an atomic operation. 
+// Set a 32-bit variable to the specified value as an atomic operation.
 // Parameters:
 //  destination - value to be exchanged
 //  value       - value to set the destination to
@@ -76,7 +76,7 @@ __forceinline T Interlocked::Exchange(T volatile *destination, T value)
 #endif
 }
 
-// Performs an atomic compare-and-exchange operation on the specified values. 
+// Performs an atomic compare-and-exchange operation on the specified values.
 // Parameters:
 //  destination - value to be exchanged
 //  exchange    - value to set the destinaton to
@@ -217,7 +217,7 @@ __forceinline T Interlocked::ExchangePointer(T volatile * destination, std::null
 #endif
 }
 
-// Performs an atomic compare-and-exchange operation on the specified pointers. 
+// Performs an atomic compare-and-exchange operation on the specified pointers.
 // Parameters:
 //  destination - value to be exchanged
 //  exchange    - value to set the destinaton to

src/Native/gc/env/gcenv.object.h

@@ -87,9 +87,9 @@ class MethodTable
 
     bool HasComponentSize()
     {
-        // Note that we can't just check m_componentSize != 0 here. The VM 
-        // may still construct a method table that does not have a component 
-        // size, according to this method, but still has a number in the low 
+        // Note that we can't just check m_componentSize != 0 here. The VM
+        // may still construct a method table that does not have a component
+        // size, according to this method, but still has a number in the low
         // 16 bits of the method table flags parameter.
         //
         // The solution here is to do what the VM does and check the
@@ -130,7 +130,7 @@ class Object
 
 public:
     ObjHeader * GetHeader()
-    { 
+    {
         return ((ObjHeader *)this) - 1;
     }
 

src/Native/gc/env/gcenv.os.h

@@ -300,7 +300,7 @@ class GCToOSInterface
     //  true if it has succeeded, false if it has failed
     static bool VirtualDecommit(void *address, size_t size);
 
-    // Reset virtual memory range. Indicates that data in the memory range specified by address and size is no 
+    // Reset virtual memory range. Indicates that data in the memory range specified by address and size is no
     // longer of interest, but it should not be decommitted.
     // Parameters:
     //  address - starting virtual address
@@ -368,7 +368,7 @@ class GCToOSInterface
     // Get numeric id of the current thread if possible on the
     // current platform. It is indended for logging purposes only.
     // Return:
-    //  Numeric id of the current thread or 0 if the 
+    //  Numeric id of the current thread or 0 if the
     static uint64_t GetCurrentThreadIdForLogging();
 
     // Get id of the current process
@@ -431,10 +431,10 @@ class GCToOSInterface
     //  non zero if it has succeeded, 0 if it has failed
     //  *is_restricted is set to true if asked and running in restricted.
     // Remarks:
-    //  If a process runs with a restricted memory limit, it returns the limit. If there's no limit 
+    //  If a process runs with a restricted memory limit, it returns the limit. If there's no limit
     //  specified, it returns amount of actual physical memory.
     //
-    // PERF TODO: Requires more work to not treat the restricted case to be special. 
+    // PERF TODO: Requires more work to not treat the restricted case to be special.
     // To be removed before 3.0 ships.
     static uint64_t GetPhysicalMemoryLimit(bool* is_restricted=NULL);
 

src/Native/gc/env/gcenv.unix.inl

@@ -11,9 +11,11 @@ extern uint32_t g_pageSizeUnixInl;
 
 #define OS_PAGE_SIZE GCToOSInterface::GetPageSize()
 
+#ifndef DACCESS_COMPILE
 __forceinline size_t GCToOSInterface::GetPageSize()
 {
     return g_pageSizeUnixInl;
 }
+#endif // DACCESS_COMPILE
 
 #endif // __GCENV_UNIX_INL__