more DEBUGGING

Author: aschwaighofer

include/swift/IRGen/Linking.h

@@ -1630,12 +1630,23 @@ class ApplyIRLinkage {
 
     // COMDATs cannot be applied to declarations.  If we have a definition,
     // apply the COMDAT.
-    if (definition)
+    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()));
+            GV->dump();
+          }
+        }
+      } else if (GV->getName().equals("$sSo18CFDateFormatterRefaMf")){
+        llvm::dbgs() << "Not setting comdat in " << M->getName() << "\n";
+        GV->dump();
+      }
+    }
   }
 };
 

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()) {
@@ -5040,7 +5037,8 @@ IRGenModule::getAddrOfTypeMetadata(CanType concreteType,
                                    SymbolReferenceKind refKind,
                                    TypeMetadataCanonicality canonicality) {
   assert(!isa<UnboundGenericType>(concreteType));
-
+  if (concreteType->getString() == "") {
+  }
   auto nominal = concreteType->getAnyNominal();
 
   bool foreign = nominal && requiresForeignTypeMetadata(nominal);
@@ -5133,8 +5131,25 @@ IRGenModule::getAddrOfTypeMetadata(CanType concreteType,
     typeOfValue = defaultVarTy;
   }
 
-  if (auto *GV = dyn_cast<llvm::GlobalVariable>(addr.getValue()))
+  if (auto *GV = dyn_cast<llvm::GlobalVariable>(addr.getValue())) {
+
+    if (addr.getValue()->getName().equals("$sSo18CFDateFormatterRefaMf")) {
+      llvm::dbgs() << "Potentially removing COMDAT isDeclaration:" << GV->isDeclaration() << "\n";
+      addr.getValue()->dump();
+    }
     GV->setComdat(nullptr);
+    if (addr.getValue()->getName().equals("$sSo18CFDateFormatterRefaMf")) {
+      addr.getValue()->dump();
+      llvm::dbgs() << "concreteType: " << concreteType->getString() << "\n";
+    }
+  } else {
+    if (addr.getValue()->getName().equals("$sSo18CFDateFormatterRefaMf")) {
+      llvm::dbgs() << "Not removing COMDAT \n";
+      addr.getValue()->dump();
+      llvm::dbgs() << "concreteType: " << concreteType->getString() << "\n";
+    }
+  }
+
 
   // FIXME: MC breaks when emitting alias references on some platforms
   // (rdar://problem/22450593 ). Work around this by referring to the aliasee