diff options
author | Jonathan Chambers <jonathan@unity3d.com> | 2022-03-17 21:44:30 +0300 |
---|---|---|
committer | Jonathan Chambers <jonathan@unity3d.com> | 2022-03-17 21:44:30 +0300 |
commit | 1a261532a2b85525edffde426af441598c8b0f46 (patch) | |
tree | ad0175d4d630999825e82fc3e4df87b572052635 | |
parent | 771b5b5938cdbf82fa5b4295da5f3c21c92a4029 (diff) |
Fix issue due to missing upstream commit.
We are missing commit 5668de71107022a316ee967162bc16c10754b9ce in our
branch, and previous commit references variables added in this commit.
-rw-r--r-- | win32_threads.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/win32_threads.c b/win32_threads.c index c04ff765..b55de8bf 100644 --- a/win32_threads.c +++ b/win32_threads.c @@ -1573,6 +1573,7 @@ STATIC word GC_push_stack_for(GC_thread thread, DWORD me) # endif GC_ASSERT(!((word)thread->stack_base COOLER_THAN (word)tib->StackBase)); +# ifdef UNITY_MISSING_COMMIT_5668de71 if (thread->stack_base != thread->initial_stack_base /* We are in a coroutine. */ && ((word)thread->stack_base <= (word)tib->StackLimit @@ -1584,7 +1585,9 @@ STATIC word GC_push_stack_for(GC_thread thread, DWORD me) /* sp really points to the stack top but, for now, we do */ /* our best as the TIB stack limit/base cannot be used */ /* while we are inside a coroutine. */ - } else { + } else +# endif + { /* GetThreadContext() might return stale register values, */ /* so we scan the entire stack region (down to the stack */ /* limit). There is no 100% guarantee that all the */ |