OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

decl.c (grokvardecl): Add location_t parameter and use it in build_lang_decl_loc and build_decl calls.

Browse Source 
/cp
2018-12-11  Paolo Carlini  <paolo.carlini@oracle.com>

	* decl.c (grokvardecl): Add location_t parameter and use it
	in build_lang_decl_loc and build_decl calls.
	(grokdeclarator): Move up loc declaration and use it in the
	grokvardecl call too.

/testsuite
2018-12-11  Paolo Carlini  <paolo.carlini@oracle.com>

	* g++.dg/pr53037-4.C: Test the first two locations too.

From-SVN: r267029
This commit is contained in:
Paolo Carlini 2018-12-11 17:47:56 +00:00
parent f214a6415a
commit 6b9ef867ec
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gcc/cp/decl.c
View File

@ -68,7 +68,7 @@ static int decl_jump_unsafe (tree);
static void require_complete_types_for_parms (tree); static void require_complete_types_for_parms (tree);
static tree grok_reference_init (tree, tree, tree, int); static tree grok_reference_init (tree, tree, tree, int);
static tree grokvardecl (tree, tree, tree, const cp_decl_specifier_seq *, static tree grokvardecl (tree, tree, tree, const cp_decl_specifier_seq *,
int, int, int, bool, int, tree); int, int, int, bool, int, tree, location_t);
static void check_static_variable_definition (tree, tree); static void check_static_variable_definition (tree, tree);
static void record_unknown_type (tree, const char *); static void record_unknown_type (tree, const char *);
static tree builtin_function_1 (tree, tree, bool); static tree builtin_function_1 (tree, tree, bool);
@ -9282,7 +9282,8 @@ grokvardecl (tree type,
int inlinep, int inlinep,
bool conceptp, bool conceptp,
int template_count, int template_count,
tree scope) tree scope,
location_t location)
{ {
tree decl; tree decl;
tree explicit_scope; tree explicit_scope;
@ -9318,9 +9319,9 @@ grokvardecl (tree type,
/* Similarly for explicit specializations. */ /* Similarly for explicit specializations. */
|| (orig_declarator || (orig_declarator
&& TREE_CODE (orig_declarator) == TEMPLATE_ID_EXPR))) && TREE_CODE (orig_declarator) == TEMPLATE_ID_EXPR)))
decl = build_lang_decl (VAR_DECL, name, type); decl = build_lang_decl_loc (location, VAR_DECL, name, type);
else else
decl = build_decl (input_location, VAR_DECL, name, type); decl = build_decl (location, VAR_DECL, name, type);
if (explicit_scope && TREE_CODE (explicit_scope) == NAMESPACE_DECL) if (explicit_scope && TREE_CODE (explicit_scope) == NAMESPACE_DECL)
set_decl_namespace (decl, explicit_scope, 0); set_decl_namespace (decl, explicit_scope, 0);
@ -12200,6 +12201,7 @@ grokdeclarator (const cp_declarator *declarator,
{ {
tree decl = NULL_TREE; tree decl = NULL_TREE;
location_t loc = declarator ? declarator->id_loc : input_location;
if (decl_context == PARM) if (decl_context == PARM)
{ {
@ -12216,13 +12218,13 @@ grokdeclarator (const cp_declarator *declarator,
if (!staticp && !friendp && TREE_CODE (type) != METHOD_TYPE) if (!staticp && !friendp && TREE_CODE (type) != METHOD_TYPE)
if (tree auto_node = type_uses_auto (type)) if (tree auto_node = type_uses_auto (type))
{ {
location_t loc = declspecs->locations[ds_type_spec]; location_t tloc = declspecs->locations[ds_type_spec];
if (CLASS_PLACEHOLDER_TEMPLATE (auto_node)) if (CLASS_PLACEHOLDER_TEMPLATE (auto_node))
error_at (loc, "invalid use of template-name %qE without an " error_at (tloc, "invalid use of template-name %qE without an "
"argument list", "argument list",
CLASS_PLACEHOLDER_TEMPLATE (auto_node)); CLASS_PLACEHOLDER_TEMPLATE (auto_node));
else else
error_at (loc, "non-static data member declared with " error_at (tloc, "non-static data member declared with "
"placeholder %qT", auto_node); "placeholder %qT", auto_node);
type = error_mark_node; type = error_mark_node;
} }
@ -12487,7 +12489,6 @@ grokdeclarator (const cp_declarator *declarator,
if (decl == NULL_TREE) if (decl == NULL_TREE)
{ {
location_t loc = declarator ? declarator->id_loc : input_location;
if (staticp) if (staticp)
{ {
/* C++ allows static class members. All other work /* C++ allows static class members. All other work
@ -12704,7 +12705,8 @@ grokdeclarator (const cp_declarator *declarator,
inlinep, inlinep,
concept_p, concept_p,
template_count, template_count,
ctype ? ctype : in_namespace); ctype ? ctype : in_namespace,
loc);
if (decl == NULL_TREE) if (decl == NULL_TREE)
return error_mark_node; return error_mark_node;