diff mbox

[C++] PR 65340

Message ID 55085FB7.8090303@oracle.com
State New
Headers show

Commit Message

Paolo Carlini March 17, 2015, 5:09 p.m. UTC 
Hi,

this minor [5 Regression], an ICE on invalid, seems just matter of 
passing the tsubst_flags_t argument from build_over_call to mark_used 
and then guarding require_deduced_type in the latter. Tested x86_64-linux.

Thanks,
Paolo.

/////////////////////////
2015-03-17  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/65340
	* call.c (build_over_call): Pass the tsubst_flags_t argument to
	mark_used.
	* decl2.c (mark_used): Guard the require_deduced_type call with
	complain & tf_error.

2015-03-17  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/65340
	* g++.dg/cpp1y/pr65340.C: New.

Comments

Jason Merrill March 18, 2015, 12:11 a.m. UTC | #1 
On 03/17/2015 01:09 PM, Paolo Carlini wrote:
> -  require_deduced_type (decl);
> +  if (complain & tf_error)
> +    require_deduced_type (decl);

I think we want to return false if there's a problem here so that we 
don't just silently accept this in SFINAE context.  So probably we want 
to replace the call with an inlined form like earlier in mark_used.

Are there other places that still need to pass complain to mark_used?

Jason
diff mbox

Patch

Index: cp/call.c
===================================================================
--- cp/call.c	(revision 221476)
+++ cp/call.c	(working copy)
@@ -7486,7 +7486,7 @@  build_over_call (struct z_candidate *cand, int fla
     }
 
   if (!already_used
-      && !mark_used (fn))
+      && !mark_used (fn, complain))
     return error_mark_node;
 
   if (DECL_VINDEX (fn) && (flags & LOOKUP_NONVIRTUAL) == 0
Index: cp/decl2.c
===================================================================
--- cp/decl2.c	(revision 221476)
+++ cp/decl2.c	(working copy)
@@ -5037,7 +5037,8 @@  mark_used (tree decl, tsubst_flags_t complain)
       && uses_template_parms (DECL_TI_ARGS (decl)))
     return true;
 
-  require_deduced_type (decl);
+  if (complain & tf_error)
+    require_deduced_type (decl);
 
   /* If we don't need a value, then we don't need to synthesize DECL.  */
   if (cp_unevaluated_operand != 0)
Index: testsuite/g++.dg/cpp1y/pr65340.C
===================================================================
--- testsuite/g++.dg/cpp1y/pr65340.C	(revision 0)
+++ testsuite/g++.dg/cpp1y/pr65340.C	(working copy)
@@ -0,0 +1,19 @@ 
+// PR c++/65340
+// { dg-do compile { target c++14 } }
+
+template <typename Type> Type constant;
+namespace reflect {
+namespace functors {
+  struct recurse { auto operator()(, ); }; // { dg-error "expected" }
+}
+  auto &recurse = constant < functors :: recurse > ;
+}
+namespace functors {
+struct traverse {
+  template <typename Algo, typename Value>
+  auto operator()(Algo, Value) -> decltype(reflect
+                                           :: recurse(0, 0));
+};
+}
+auto &traverse = constant < functors :: traverse > ;
+operator()()->decltype(traverse(0, 0)) // { dg-error "use of|expected" }