Try to only remove comdata if the global is a declaration

aschwaighofer · aschwaighofer · commit 3727381b8b33 · 2023-05-24T15:09:10.000-07:00
diff --git a/lib/IRGen/GenDecl.cpp b/lib/IRGen/GenDecl.cpp
@@ -5131,7 +5131,8 @@ IRGenModule::getAddrOfTypeMetadata(CanType concreteType,
   }
 
   if (auto *GV = dyn_cast<llvm::GlobalVariable>(addr.getValue()))
-    GV->setComdat(nullptr);
+    if (GV->isDeclaration())
+      GV->setComdat(nullptr);
 
   // FIXME: MC breaks when emitting alias references on some platforms
   // (rdar://problem/22450593 ). Work around this by referring to the aliasee

Original file line number	Diff line number	Diff line change
`@@ -5131,7 +5131,8 @@ IRGenModule::getAddrOfTypeMetadata(CanType concreteType,`
`5131`	`5131`	`}`
`5132`	`5132`
`5133`	`5133`	`if (auto *GV = dyn_cast<llvm::GlobalVariable>(addr.getValue()))`
`5134`		`- GV->setComdat(nullptr);`
	`5134`	`+ if (GV->isDeclaration())`
	`5135`	`+ GV->setComdat(nullptr);`
`5135`	`5136`
`5136`	`5137`	`// FIXME: MC breaks when emitting alias references on some platforms`
`5137`	`5138`	`// (rdar://problem/22450593 ). Work around this by referring to the aliasee`