diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 037870627f92..491853e81667 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2018-04-26  Jason Merrill  <jason@redhat.com>
+
+	PR c++/85545 - ICE with noexcept PMF conversion.
+	* cvt.c (cp_fold_convert): Handle PMF CONSTRUCTORs directly.
+
 2018-04-25  Nathan Sidwell  <nathan@acm.org>
 
 	PR c++/85437
diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c
index 9b53fa3067d9..a3735a1cffe0 100644
--- a/gcc/cp/cvt.c
+++ b/gcc/cp/cvt.c
@@ -601,7 +601,9 @@ cp_fold_convert (tree type, tree expr)
   tree conv;
   if (TREE_TYPE (expr) == type)
     conv = expr;
-  else if (TREE_CODE (expr) == PTRMEM_CST)
+  else if (TREE_CODE (expr) == PTRMEM_CST
+	   || (TREE_CODE (expr) == CONSTRUCTOR
+	       && TYPE_PTRMEMFUNC_P (type)))
     {
       /* Avoid wrapping a PTRMEM_CST in NOP_EXPR.  */
       conv = copy_node (expr);
diff --git a/gcc/testsuite/g++.dg/cpp1z/noexcept-type20.C b/gcc/testsuite/g++.dg/cpp1z/noexcept-type20.C
new file mode 100644
index 000000000000..a6033f71a4f2
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1z/noexcept-type20.C
@@ -0,0 +1,14 @@
+// PR c++/85545
+// { dg-do compile { target c++11 } }
+
+struct A
+{
+  void foo() noexcept;
+};
+
+template<typename T> void bar(T);
+
+void baz()
+{
+  bar(static_cast<void(A::*)()>(&A::foo));
+}