Skip to content

Commit 9df50dd

Browse files
committed
[druntime: Little merge-fixes for core.thread.fiber.base]
1 parent e39ccf7 commit 9df50dd

File tree

1 file changed

+9
-1
lines changed
  • runtime/druntime/src/core/thread/fiber

1 file changed

+9
-1
lines changed

runtime/druntime/src/core/thread/fiber/base.d

+9-1
Original file line numberDiff line numberDiff line change
@@ -682,6 +682,11 @@ private:
682682

683683
// Set first time switchIn called to indicate this Fiber's Thread
684684
ThreadBase m_curThread;
685+
686+
version (SjLj_Exceptions)
687+
{
688+
SjLjFuncContext* m_sjljExStackTop;
689+
}
685690
}
686691
Throwable m_unhandled;
687692
State m_state;
@@ -1137,7 +1142,10 @@ unittest
11371142
fibs[idx].call();
11381143
cont |= fibs[idx].state != Fiber.State.TERM;
11391144
}
1140-
locks[idx] = false;
1145+
version (LDC)
1146+
locks[idx].atomicStore(false);
1147+
else
1148+
locks[idx] = false;
11411149
}
11421150
else
11431151
{

0 commit comments

Comments
 (0)