Try to only remove comdata if the global is a declaration

aschwaighofer · aschwaighofer · commit e6d070dfd828 · 2023-06-14T10:49:50.000-07:00
diff --git a/lib/IRGen/GenDecl.cpp b/lib/IRGen/GenDecl.cpp
@@ -5190,7 +5190,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
`@@ -5190,7 +5190,8 @@ IRGenModule::getAddrOfTypeMetadata(CanType concreteType,`
`5190`	`5190`	`}`
`5191`	`5191`
`5192`	`5192`	`if (auto *GV = dyn_cast<llvm::GlobalVariable>(addr.getValue()))`
`5193`		`- GV->setComdat(nullptr);`
	`5193`	`+ if (GV->isDeclaration())`
	`5194`	`+ GV->setComdat(nullptr);`
`5194`	`5195`
`5195`	`5196`	`// FIXME: MC breaks when emitting alias references on some platforms`
`5196`	`5197`	`// (rdar://problem/22450593 ). Work around this by referring to the aliasee`