Merge pull request swiftlang#25777 from compnerd/threaded-irgen

IRGen: fix multithreaded COMDAT handling for PE/COFF
daeken · Jun 27, 2019 · b5ae6a4 · b5ae6a4
2 parents 85c4447 + 053425a
commit b5ae6a4
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/lib/IRGen/GenDecl.cpp b/lib/IRGen/GenDecl.cpp
@@ -3629,6 +3629,8 @@ ConstantReference IRGenModule::getAddrOfTypeMetadata(CanType concreteType,
 
   auto addr = getAddrOfLLVMVariable(*entity, ConstantInit(), DbgTy, refKind,
                                     defaultVarTy);
+  if (auto *GV = dyn_cast<llvm::GlobalVariable>(addr.getValue()))
+    GV->setComdat(nullptr);
 
   // FIXME: MC breaks when emitting alias references on some platforms
   // (rdar://problem/22450593 ). Work around this by referring to the aliasee