trans: Set COMDAT section for weak symbols so that Windows can handle them.

2 files changed, 10 insertions, 1 deletions

diff --git a/src/librustc_trans/closure.rs b/src/librustc_trans/closure.rs
index bf9cde9a441..b992ba362a9 100644
--- a/src/librustc_trans/closure.rs
+++ b/src/librustc_trans/closure.rs
@@ -212,6 +212,7 @@ pub fn trans_closure_expr<'a, 'tcx>(dest: Dest<'a, 'tcx>,
 
     let llfn = get_or_create_closure_declaration(ccx, closure_def_id, closure_substs);
     llvm::SetLinkage(llfn, llvm::WeakODRLinkage);
+    llvm::SetUniqueComdat(ccx.llmod(), llfn);
 
     // Get the type of this closure. Use the current `param_substs` as
     // the closure substitutions. This makes sense because the closure
diff --git a/src/librustc_trans/trans_item.rs b/src/librustc_trans/trans_item.rs
index 2fc90b821fe..b9700f2cacf 100644
--- a/src/librustc_trans/trans_item.rs
+++ b/src/librustc_trans/trans_item.rs
@@ -190,9 +190,13 @@ impl<'a, 'tcx> TransItem<'tcx> {
             }) => {
                 let lldecl = declare::declare_fn(ccx, symbol_name, mono_ty);
                 llvm::SetLinkage(lldecl, linkage);
-                attributes::from_fn_attrs(ccx, attrs, lldecl);
                 base::set_link_section(ccx, lldecl, attrs);
+                if linkage == llvm::LinkOnceODRLinkage ||
+                   linkage == llvm::WeakODRLinkage {
+                    llvm::SetUniqueComdat(ccx.llmod(), lldecl);
+                }
 
+                attributes::from_fn_attrs(ccx, attrs, lldecl);
                 ccx.instances().borrow_mut().insert(instance, lldecl);
             }
             _ => bug!("Invalid item for TransItem::Fn: `{:?}`", map_node)
@@ -223,6 +227,10 @@ impl<'a, 'tcx> TransItem<'tcx> {
         assert!(declare::get_defined_value(ccx, symbol_name).is_none());
         let llfn = declare::declare_cfn(ccx, symbol_name, llfnty);
         llvm::SetLinkage(llfn, linkage);
+        if linkage == llvm::LinkOnceODRLinkage ||
+           linkage == llvm::WeakODRLinkage {
+            llvm::SetUniqueComdat(ccx.llmod(), llfn);
+        }
         attributes::set_frame_pointer_elimination(ccx, llfn);
         ccx.drop_glues().borrow_mut().insert(dg, (llfn, fn_ty));
     }