PR c++/50157

	* call.c (convert_like_real): Exit early if bad and !tf_error.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@178081 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 390a798..92363ff 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-25  Jason Merrill  <jason@redhat.com>
+
+       PR c++/50157
+       * call.c (convert_like_real): Exit early if bad and !tf_error.
+
 2011-08-23  Jason Merrill  <jason@redhat.com>
 
        * typeck2.c (build_functional_cast): Don't try to avoid calling

diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index e5f65b3..d911b3a 100644 (file)
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -5642,6 +5642,9 @@ convert_like_real (conversion *convs, tree expr, tree fn, int argnum,
   diagnostic_t diag_kind;
   int flags;
 
+  if (convs->bad_p && !(complain & tf_error))
+    return error_mark_node;
+
   if (convs->bad_p
       && convs->kind != ck_user
       && convs->kind != ck_list
@@ -5688,15 +5691,12 @@ convert_like_real (conversion *convs, tree expr, tree fn, int argnum,
          else if (t->kind == ck_identity)
            break;
        }
-      if (complain & tf_error)
-       {
-         permerror (input_location, "invalid conversion from %qT to %qT", TREE_TYPE (expr), totype);
-         if (fn)
-           permerror (DECL_SOURCE_LOCATION (fn),
-                      "  initializing argument %P of %qD", argnum, fn);
-       }
-      else
-       return error_mark_node;
+
+      permerror (input_location, "invalid conversion from %qT to %qT",
+                TREE_TYPE (expr), totype);
+      if (fn)
+       permerror (DECL_SOURCE_LOCATION (fn),
+                  "  initializing argument %P of %qD", argnum, fn);
 
       return cp_convert (totype, expr);
     }

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c904def..c646612 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-25  Jason Merrill  <jason@redhat.com>
+
+       PR c++/50157
+       * g++.dg/cpp0x/sfinae27.C: New.
+
 2011-08-25  Tobias Burnus  <burnus@net-b.de>
 
        * gfortran.dg/coarray_lib_token_4.f90: New.

diff --git a/gcc/testsuite/g++.dg/cpp0x/sfinae27.C b/gcc/testsuite/g++.dg/cpp0x/sfinae27.C
new file mode 100644 (file)
index 0000000..93327ba
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/sfinae27.C
@@ -0,0 +1,20 @@
+// PR c++/50157
+// { dg-options -std=c++0x }
+
+template<class T>
+T val();
+
+template<class T, class Arg, class =
+  decltype(::new T(val<Arg>()))
+>
+auto test(int) -> char;
+
+template<class, class>
+auto test(...) -> char (&)[2];
+
+struct P {
+  explicit operator bool(); // (#13)
+};
+
+typedef decltype(test<bool, P>(0)) type; // OK
+typedef decltype(test<float, P>(0)) type2; // Error (#17)