Fix rebasing conflicts.

Author: michaelwoerister

src/librustc/ty/maps/mod.rs

@@ -302,8 +302,6 @@ define_maps! { <'tcx>
     // Does not include external symbols that don't have a corresponding DefId,
     // like the compiler-generated `main` function and so on.
     [] fn reachable_non_generics: ReachableNonGenerics(CrateNum) -> Rc<DefIdSet>,
-
-    // This
     [] fn is_reachable_non_generic: IsReachableNonGeneric(DefId) -> bool,
 
 

src/librustc_mir/monomorphize/partitioning.rs

@@ -385,7 +385,7 @@ fn place_root_translation_items<'a, 'tcx, I>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
                         (Linkage::External, visibility)
                     }
                     MonoItem::Static(def_id) => {
-                        let visibility = if tcx.is_exported_symbol(def_id) {
+                        let visibility = if tcx.is_reachable_non_generic(def_id) {
                             can_be_internalized = false;
                             default_visibility(def_id)
                         } else {