more DEBUGGING

Author: aschwaighofer

include/swift/IRGen/Linking.h

@@ -1632,10 +1632,18 @@ class ApplyIRLinkage {
     // apply the COMDAT.
     if (definition)
       if (IRL.Linkage == llvm::GlobalValue::LinkOnceODRLinkage ||
-          IRL.Linkage == llvm::GlobalValue::WeakODRLinkage)
-        if (Triple.supportsCOMDAT())
-          if (llvm::GlobalObject *GO = dyn_cast<llvm::GlobalObject>(GV))
+          IRL.Linkage == llvm::GlobalValue::WeakODRLinkage) {
+        if (Triple.supportsCOMDAT()) {
+          if (llvm::GlobalObject *GO = dyn_cast<llvm::GlobalObject>(GV)) {
+            if (GV->getName().equals("$sSo18CFDateFormatterRefaMf")) {
+              llvm::dbgs() << "Setting comdat in" << M->getName() << "\n";
+            }
             GO->setComdat(M->getOrInsertComdat(GV->getName()));
+          }
+        }
+      } else if (GV->getName().equals("$sSo18CFDateFormatterRefaMf")){
+        llvm::dbgs() << "Not setting comdat in " << M->getName() << "\n";
+      }
   }
 };
 

lib/IRGen/GenDecl.cpp

@@ -2705,9 +2705,6 @@ Address IRGenModule::getAddrOfSILGlobalVariable(SILGlobalVariable *var,
       gvar->setInitializer(llvm::Constant::getNullValue(storageTypeWithContainer));
     else
       gvar->setComdat(nullptr);
-    if (gvar->getName().equals("$sSo18CFDateFormatterRefaMf")) {
-      gvar->dump();
-    }
   }
   llvm::Constant *addr = gvar;
   if (var->isInitializedObject() && !canMakeStaticObjectsReadOnly()) {
@@ -5135,6 +5132,10 @@ IRGenModule::getAddrOfTypeMetadata(CanType concreteType,
 
   if (auto *GV = dyn_cast<llvm::GlobalVariable>(addr.getValue()))
     GV->setComdat(nullptr);
+  if (addr.getValue()->getName().equals("$sSo18CFDateFormatterRefaMf")) {
+    addr.getValue()->dump();
+  }
+
 
   // FIXME: MC breaks when emitting alias references on some platforms
   // (rdar://problem/22450593 ). Work around this by referring to the aliasee