===================================================================
@@ -6933,7 +6933,8 @@ build_op_delete_call (enum tree_code code, tree ad
rtype = cv_unqualified (rtype);
rtype = TYPE_POINTER_TO (rtype);
addr = cp_convert (rtype, oaddr, complain);
- destroying = build_functional_cast (destroying, NULL_TREE,
+ destroying = build_functional_cast (input_location,
+ destroying, NULL_TREE,
complain);
}
@@ -9997,7 +9998,8 @@ build_new_method_call_1 (tree instance, tree fns,
basetype, name))
inform (input_location, "for a function-style cast, remove the "
"redundant %<::%D%>", name);
- call = build_functional_cast (basetype, build_tree_list_vec (user_args),
+ call = build_functional_cast (input_location, basetype,
+ build_tree_list_vec (user_args),
complain);
return call;
}
===================================================================
@@ -7681,7 +7681,8 @@ extern tree build_scoped_ref (tree, tree, tree *
extern tree build_x_arrow (location_t, tree,
tsubst_flags_t);
extern tree build_m_component_ref (tree, tree, tsubst_flags_t);
-extern tree build_functional_cast (tree, tree, tsubst_flags_t);
+extern tree build_functional_cast (location_t, tree, tree,
+ tsubst_flags_t);
extern tree add_exception_specifier (tree, tree, tsubst_flags_t);
extern tree merge_exception_specifiers (tree, tree);
===================================================================
@@ -6764,7 +6764,8 @@ check_initializer (tree decl, tree init, int flags
if (CLASS_TYPE_P (type)
&& (!init || TREE_CODE (init) == TREE_LIST))
{
- init = build_functional_cast (type, init, tf_none);
+ init = build_functional_cast (input_location, type,
+ init, tf_none);
if (TREE_CODE (init) == TARGET_EXPR)
TARGET_EXPR_DIRECT_INIT_P (init) = true;
}
===================================================================
@@ -29268,8 +29268,17 @@ cp_parser_functional_cast (cp_parser* parser, tree
release_tree_vector (vec);
}
- cast = build_functional_cast (type, expression_list,
+ /* Create a location of the form:
+ float(i)
+ ^~~~~~~~
+ with caret == start at the start of the type name,
+ finishing at the closing paren. */
+ location_t combined_loc = make_location (start_loc, start_loc,
+ parser->lexer);
+ cast = build_functional_cast (combined_loc, type, expression_list,
tf_warning_or_error);
+ cast.set_location (combined_loc);
+
/* [expr.const]/1: In an integral constant expression "only type
conversions to integral or enumeration type can be used". */
if (TREE_CODE (type) == TYPE_DECL)
@@ -29280,13 +29289,6 @@ cp_parser_functional_cast (cp_parser* parser, tree
NIC_CONSTRUCTOR))
return error_mark_node;
- /* Create a location of the form:
- float(i)
- ^~~~~~~~
- with caret == start at the start of the type name,
- finishing at the closing paren. */
- location_t combined_loc = make_location (start_loc, start_loc, parser->lexer);
- cast.set_location (combined_loc);
return cast;
}
===================================================================
@@ -19017,7 +19017,7 @@ tsubst_copy_and_build (tree t,
switch (TREE_CODE (t))
{
case CAST_EXPR:
- r = build_functional_cast (type, op, complain);
+ r = build_functional_cast (input_location, type, op, complain);
break;
case REINTERPRET_CAST_EXPR:
r = build_reinterpret_cast (type, op, complain);
===================================================================
@@ -2929,7 +2929,8 @@ finish_compound_literal (tree type, tree compound_
that it came from T{} rather than T({}). */
CONSTRUCTOR_IS_DIRECT_INIT (compound_literal) = 1;
compound_literal = build_tree_list (NULL_TREE, compound_literal);
- return build_functional_cast (type, compound_literal, complain);
+ return build_functional_cast (input_location, type,
+ compound_literal, complain);
}
if (TREE_CODE (type) == ARRAY_TYPE
===================================================================
@@ -2228,7 +2228,8 @@ build_m_component_ref (tree datum, tree component,
/* Return a tree node for the expression TYPENAME '(' PARMS ')'. */
tree
-build_functional_cast (tree exp, tree parms, tsubst_flags_t complain)
+build_functional_cast (location_t loc, tree exp, tree parms,
+ tsubst_flags_t complain)
{
/* This is either a call to a constructor,
or a C cast in C++'s `functional' notation. */
@@ -2254,7 +2255,7 @@ tree
if (TREE_CODE (type) == ARRAY_TYPE)
{
if (complain & tf_error)
- error ("functional cast to array type %qT", type);
+ error_at (loc, "functional cast to array type %qT", type);
return error_mark_node;
}
@@ -2263,7 +2264,7 @@ tree
if (!CLASS_PLACEHOLDER_TEMPLATE (anode))
{
if (complain & tf_error)
- error ("invalid use of %qT", anode);
+ error_at (loc, "invalid use of %qT", anode);
return error_mark_node;
}
else if (!parms)
@@ -2276,8 +2277,8 @@ tree
if (type == error_mark_node)
{
if (complain & tf_error)
- error ("cannot deduce template arguments for %qT from %<()%>",
- anode);
+ error_at (loc, "cannot deduce template arguments "
+ "for %qT from %<()%>", anode);
return error_mark_node;
}
}
@@ -2296,7 +2297,7 @@ tree
if (TYPE_REF_P (type) && !parms)
{
if (complain & tf_error)
- error ("invalid value-initialization of reference type");
+ error_at (loc, "invalid value-initialization of reference type");
return error_mark_node;
}
===================================================================
@@ -3,10 +3,10 @@
template<int> struct A
{
- int a[auto(1)]; // { dg-error "invalid use of" }
+ int a[auto(1)]; // { dg-error "9:invalid use of" }
};
template<int> void foo()
{
- int a[auto(1)]; // { dg-error "invalid use of" }
+ int a[auto(1)]; // { dg-error "9:invalid use of" }
}
===================================================================
@@ -1,4 +1,4 @@
// PR c++/51404
// { dg-do compile { target c++11 } }
-int i = auto().x; // { dg-error "invalid use of" }
+int i = auto().x; // { dg-error "9:invalid use of" }
===================================================================
@@ -0,0 +1,2 @@
+typedef int A [1];
+A a = A(1); // { dg-error "7:functional cast to array type" }
===================================================================
@@ -8,6 +8,6 @@ template <int a1>
void f()
{
typedef int& T;
- T a = T(); // { dg-error "value-initialization of reference" }
+ T a = T(); // { dg-error "9:invalid value-initialization of reference" }
}
===================================================================
@@ -3,5 +3,6 @@ namespace N {
}
int main() {
- N::C(); // { dg-error "template|deduction" }
+ N::C(); // { dg-error "6:cannot deduce template arguments" "" { target c++17 } }
+ // { dg-error "7:missing template arguments" "" { target c++14_down } .-1 }
}
===================================================================
@@ -3,5 +3,6 @@
template <typename T> struct S {};
void f() {
- throw S (); // { dg-error "template" }
+ throw S (); // { dg-error "9:cannot deduce template arguments" "" { target c++17 } }
+ // { dg-error "11:missing template arguments" "" { target c++14_down } .-1 }
}
===================================================================
@@ -6,5 +6,6 @@ namespace N {
void f()
{
- N::S(); // { dg-error "" } invalid use of template
+ N::S(); // { dg-error "6:cannot deduce template arguments" "" { target c++17 } } invalid use of template
+ // { dg-error "7:missing template arguments" "" { target c++14_down } .-1 }
}
===================================================================
@@ -8,5 +8,6 @@ namespace foo {
}
void baz() {
- foo::bar(); // { dg-error "" } template used as expression
+ foo::bar(); // { dg-error "8:cannot deduce template arguments" "" { target c++17 } } template used as expression
+ // { dg-error "11:missing template arguments" "" { target c++14_down } .-1 }
}
===================================================================
@@ -21,10 +21,12 @@ void doit(T x) {
q2 = TestClass2<T>();
TestClass1<T> p1;
- p1 = TestClass1(); // { dg-error "" } template used as expression
+ p1 = TestClass1(); // { dg-error "8:cannot deduce template arguments" "" { target c++17 } } template used as expression
+ // { dg-error "18:missing template arguments" "" { target c++14_down } .-1 }
TestClass2<T> p2;
- p2 = TestClass2(); // { dg-error "" } template used as expression
+ p2 = TestClass2(); // { dg-error "8:cannot deduce template arguments" "" { target c++17 } } template used as expression
+ // { dg-error "18:missing template arguments" "" { target c++14_down } .-1 }
}
int main() {
===================================================================
@@ -3155,7 +3155,7 @@ plugin_build_expression_list_expr (cc1_plugin::con
case CHARS2 ('c', 'v'): // conversion with parenthesized expression list
gcc_assert (TYPE_P (type));
args = args_to_tree_list (values_in);
- result = build_functional_cast (type, args, tf_error);
+ result = build_functional_cast (input_location, type, args, tf_error);
break;
case CHARS2 ('t', 'l'): // conversion with braced expression list