diff --git a/src/librustc/ty/mod.rs b/src/librustc/ty/mod.rs
index 45005fd543d1b6fe9ea9605ffce78e69adfeea97..218be48da24d50be130c675fcb3ba3d31b5847a8 100644
--- a/src/librustc/ty/mod.rs
+++ b/src/librustc/ty/mod.rs
@@ -819,13 +819,15 @@ pub fn types(&self) -> impl DoubleEndedIterator<Item = &TypeParameterDef> {
         })
     }
 
-    pub fn has_type_parameters(&self, tcx: TyCtxt<'a, 'gcx, 'tcx>) -> bool {
-        if self.types().count() != 0 {
+    pub fn requires_monomorphization(&self, tcx: TyCtxt<'a, 'gcx, 'tcx>) -> bool {
+        if self.params.iter().any(|p| {
+            if let GenericParam::Type(_) = p { true } else { false }
+        }) {
             return true;
         }
         if let Some(parent_def_id) = self.parent {
             let parent = tcx.generics_of(parent_def_id);
-            parent.has_type_parameters(tcx)
+            parent.requires_monomorphization(tcx)
         } else {
             false
         }
diff --git a/src/librustc_metadata/encoder.rs b/src/librustc_metadata/encoder.rs
index 9ebffa4c744e151577a993f1f72eb8a3a632bf7f..3de90abd9663f84213e90addb6ccd7292e228a9b 100644
--- a/src/librustc_metadata/encoder.rs
+++ b/src/librustc_metadata/encoder.rs
@@ -929,7 +929,7 @@ fn encode_info_for_impl_item(&mut self, def_id: DefId) -> Entry<'tcx> {
                 hir::ImplItemKind::Const(..) => true,
                 hir::ImplItemKind::Method(ref sig, _) => {
                     let generics = self.tcx.generics_of(def_id);
-                    let needs_inline = (generics.has_type_parameters(self.tcx) ||
+                    let needs_inline = (generics.requires_monomorphization(self.tcx) ||
                                         tcx.trans_fn_attrs(def_id).requests_inline()) &&
                                         !self.metadata_output_only();
                     let is_const_fn = sig.constness == hir::Constness::Const;
diff --git a/src/librustc_mir/monomorphize/collector.rs b/src/librustc_mir/monomorphize/collector.rs
index 8646df02e5108c803389131540205c105d15a129..2bc4e651dd35797c25a020252e7801deb9228b21 100644
--- a/src/librustc_mir/monomorphize/collector.rs
+++ b/src/librustc_mir/monomorphize/collector.rs
@@ -1076,7 +1076,7 @@ fn push_extra_entry_roots(&mut self) {
 
 fn item_has_type_parameters<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, def_id: DefId) -> bool {
     let generics = tcx.generics_of(def_id);
-    generics.has_type_parameters(tcx)
+    generics.requires_monomorphization(tcx)
 }
 
 fn create_mono_items_for_default_impls<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
diff --git a/src/librustc_mir/transform/const_prop.rs b/src/librustc_mir/transform/const_prop.rs
index 111783fff7e45d6932b142babe3d0340745cd54e..80603959ec202fdd0542d64941bedd7c2ff94a0b 100644
--- a/src/librustc_mir/transform/const_prop.rs
+++ b/src/librustc_mir/transform/const_prop.rs
@@ -184,7 +184,7 @@ fn eval_constant(&mut self, c: &Constant<'tcx>) -> Option<Const<'tcx>> {
             // evaluate the promoted and replace the constant with the evaluated result
             Literal::Promoted { index } => {
                 let generics = self.tcx.generics_of(self.source.def_id);
-                if generics.has_type_parameters(self.tcx) {
+                if generics.requires_monomorphization(self.tcx) {
                     // FIXME: can't handle code with generics
                     return None;
                 }
@@ -295,7 +295,7 @@ fn const_prop(
                     self.source.def_id
                 };
                 let generics = self.tcx.generics_of(def_id);
-                if generics.has_type_parameters(self.tcx) {
+                if generics.requires_monomorphization(self.tcx) {
                     // FIXME: can't handle code with generics
                     return None;
                 }
@@ -317,7 +317,7 @@ fn const_prop(
                     self.source.def_id
                 };
                 let generics = self.tcx.generics_of(def_id);
-                if generics.has_type_parameters(self.tcx) {
+                if generics.requires_monomorphization(self.tcx) {
                     // FIXME: can't handle code with generics
                     return None;
                 }
diff --git a/src/librustc_trans/back/symbol_export.rs b/src/librustc_trans/back/symbol_export.rs
index c4a2d1798019d9e400638f1b2ab5036287077f71..d77855220691d31113a8ef018b636552baf1e02e 100644
--- a/src/librustc_trans/back/symbol_export.rs
+++ b/src/librustc_trans/back/symbol_export.rs
@@ -117,7 +117,7 @@ fn reachable_non_generics_provider<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
                 }) => {
                     let def_id = tcx.hir.local_def_id(node_id);
                     let generics = tcx.generics_of(def_id);
-                    if !generics.has_type_parameters(tcx) &&
+                    if !generics.requires_monomorphization(tcx) &&
                         // Functions marked with #[inline] are only ever translated
                         // with "internal" linkage and are never exported.
                         !Instance::mono(tcx, def_id).def.requires_local(tcx) {