From a93882509367797fa653af48106595077fab6d4b Mon Sep 17 00:00:00 2001
From: paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 31 Oct 2013 10:11:49 +0000
Subject: [PATCH] /cp 2013-10-30  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/58581
	* call.c (build_over_call): Check return value of mark_used.

/testsuite
2013-10-30  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/58581
	* g++.dg/cpp0x/deleted1.C: New.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@204249 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/cp/ChangeLog                      | 5 +++++
 gcc/cp/call.c                         | 5 +++--
 gcc/testsuite/ChangeLog               | 5 +++++
 gcc/testsuite/g++.dg/cpp0x/deleted1.C | 6 ++++++
 4 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/deleted1.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index ba55d805f9e..04dd2649711 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-30  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/58581
+	* call.c (build_over_call): Check return value of mark_used.
+
 2013-10-30  Jason Merrill  <jason@redhat.com>
 
 	* semantics.c (finish_compound_literal): Don't create a static variable
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 5663010f31e..961ee2c2278 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -7112,8 +7112,9 @@ build_over_call (struct z_candidate *cand, int flags, tsubst_flags_t complain)
 	mark_versions_used (fn);
     }
 
-  if (!already_used)
-    mark_used (fn);
+  if (!already_used
+      && !mark_used (fn))
+    return error_mark_node;
 
   if (DECL_VINDEX (fn) && (flags & LOOKUP_NONVIRTUAL) == 0
       /* Don't mess with virtual lookup in fold_non_dependent_expr; virtual
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4c722e7faa1..6819ed0df97 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-30  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/58581
+	* g++.dg/cpp0x/deleted1.C: New.
+
 2013-10-31  Zhenqiang Chen  <zhenqiang.chen@linaro.org>
 
 	* gcc.target/arm/lp1243022.c: New test.
diff --git a/gcc/testsuite/g++.dg/cpp0x/deleted1.C b/gcc/testsuite/g++.dg/cpp0x/deleted1.C
new file mode 100644
index 00000000000..0a632bfb30b
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/deleted1.C
@@ -0,0 +1,6 @@
+// PR c++/58581
+// { dg-do compile { target c++11 } }
+
+template<typename T> int foo(T) noexcept(T()) = delete;
+
+int i = foo(0);       // { dg-error "deleted" }
-- 
2.11.4.GIT