diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index eaec5222775e..9a13f49ef13f 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2014-02-28  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/58610
+	* cp-tree.h (DECL_DELETED_FN): Use LANG_DECL_FN_CHECK.
+	* call.c (print_z_candidate): Remove STRIP_TEMPLATE use.
+	* lambda.c (maybe_add_lambda_conv_op): Likewise.
+
 2014-02-27  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	PR c++/60253
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 53b97d9db947..b58c072dfbc5 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -3237,7 +3237,7 @@ print_z_candidate (location_t loc, const char *msgstr,
     inform (cloc, "%s%T <conversion>", msg, candidate->fn);
   else if (candidate->viable == -1)
     inform (cloc, "%s%#D <near match>", msg, candidate->fn);
-  else if (DECL_DELETED_FN (STRIP_TEMPLATE (candidate->fn)))
+  else if (DECL_DELETED_FN (candidate->fn))
     inform (cloc, "%s%#D <deleted>", msg, candidate->fn);
   else
     inform (cloc, "%s%#D", msg, candidate->fn);
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index 3db18f3eaecd..8ec7d6aea1d9 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -3222,7 +3222,7 @@ more_aggr_init_expr_args_p (const aggr_init_expr_arg_iterator *iter)
 
 /* Nonzero if DECL was declared with '= delete'.  */
 #define DECL_DELETED_FN(DECL) \
-  (DECL_LANG_SPECIFIC (FUNCTION_DECL_CHECK (DECL))->u.base.threadprivate_or_deleted_p)
+  (LANG_DECL_FN_CHECK (DECL)->min.base.threadprivate_or_deleted_p)
 
 /* Nonzero if DECL was declared with '= default' (maybe implicitly).  */
 #define DECL_DEFAULTED_FN(DECL) \
diff --git a/gcc/cp/lambda.c b/gcc/cp/lambda.c
index 277dec6d2b9d..0b8b46a8144d 100644
--- a/gcc/cp/lambda.c
+++ b/gcc/cp/lambda.c
@@ -975,7 +975,7 @@ maybe_add_lambda_conv_op (tree type)
      the conversion op is used.  */
   if (varargs_function_p (callop))
     {
-      DECL_DELETED_FN (STRIP_TEMPLATE (fn)) = 1;
+      DECL_DELETED_FN (fn) = 1;
       return;
     }
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c8a7fb4f094e..3011092bc2eb 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-28  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/58610
+	* g++.dg/cpp0x/constexpr-ice11.C: New.
+
 2014-02-28  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	PR c++/60314
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-ice11.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-ice11.C
new file mode 100644
index 000000000000..3e32bf6407b6
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-ice11.C
@@ -0,0 +1,9 @@
+// PR c++/58610
+// { dg-do compile { target c++11 } }
+
+struct A
+{
+  template<typename> A();
+};
+
+constexpr A a;  // { dg-error "literal|matching" }