Refactor handling of non-SOH generations (dotnet#1688)

* refactoring * ploh-->uoh * fix Linux build PR feedback * some PR feedback * more PR feedback more PR feedback * more PR feedback * address comments in UpdatePreGCCounters * removed a confusing comment * stress fix in background sweep * use `saved_sweep_ephemeral_seg` in background sweep. * fixed `GCPerHeapHistory_V3` event. * re-implemented dotnet/runtime#2103 on top of refactoring (it was hard to merge)
MichalStrehovsky · Mar 31, 2020 · 42903d7 · 42903d7
1 parent 38697e9
commit 42903d7
Show file tree

Hide file tree

Showing 10 changed files with 1,503 additions and 1,750 deletions.
diff --git a/src/Native/Runtime/GCHelpers.cpp b/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;
 }
 

diff --git a/src/Native/gc/env/gcenv.base.h b/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