Merge pull request #40260 from compnerd/ub-all-the-things

shahmishal · web-flow · commit 52eb0466a248 · 2021-11-19T11:57:57.000-08:00
Concurrency: fix UB in DefaultActor initialization
diff --git a/stdlib/public/Concurrency/Actor.cpp b/stdlib/public/Concurrency/Actor.cpp
@@ -698,7 +698,7 @@ class DefaultActorImpl : public HeapObject {
   void initialize(bool isDistributedRemote = false) {
     auto flags = Flags();
     flags.setIsDistributedRemote(isDistributedRemote);
-    new (&CurrentState) std::atomic<State>(State{JobRef(), flags});
+    new (&CurrentState) swift::atomic<State>(State{JobRef(), flags});
     JobStorageHeapObject.metadata = nullptr;
   }
 
diff --git a/test/Distributed/Runtime/distributed_actor_dynamic_remote_func.swift b/test/Distributed/Runtime/distributed_actor_dynamic_remote_func.swift
@@ -7,9 +7,6 @@
 // UNSUPPORTED: use_os_stdlib
 // UNSUPPORTED: back_deployment_runtime
 
-// FIXME(distributed): remote functions dont seem to work on windows?
-// XFAIL: OS=windows-msvc
-
 import _Distributed
 
 distributed actor LocalWorker {
diff --git a/test/Distributed/Runtime/distributed_actor_isRemote.swift b/test/Distributed/Runtime/distributed_actor_isRemote.swift
@@ -8,9 +8,6 @@
 // UNSUPPORTED: use_os_stdlib
 // UNSUPPORTED: back_deployment_runtime
 
-// FIXME(distributed): remote functions dont seem to work on windows?
-// XFAIL: OS=windows-msvc
-
 import _Distributed
 
 @available(SwiftStdlib 5.6, *)

Original file line number	Diff line number	Diff line change
`@@ -698,7 +698,7 @@ class DefaultActorImpl : public HeapObject {`
`698`	`698`	`void initialize(bool isDistributedRemote = false) {`
`699`	`699`	`auto flags = Flags();`
`700`	`700`	`flags.setIsDistributedRemote(isDistributedRemote);`
`701`		`- new (&CurrentState) std::atomic<State>(State{JobRef(), flags});`
	`701`	`+ new (&CurrentState) swift::atomic<State>(State{JobRef(), flags});`
`702`	`702`	`JobStorageHeapObject.metadata = nullptr;`
`703`	`703`	`}`
`704`	`704`