Commit 73075e06 by Paolo Carlini Committed by Paolo Carlini

decl.c (grok_reference_init): Improve error location.

/cp
2019-01-08  Paolo Carlini  <paolo.carlini@oracle.com>

	* decl.c (grok_reference_init): Improve error location.
	(grokdeclarator): Likewise, improve two locations.

/testsuite
2019-01-08  Paolo Carlini  <paolo.carlini@oracle.com>

	* g++.dg/diagnostic/constexpr2.C: New.
	* g++.dg/diagnostic/ref3.C: Likewise.

From-SVN: r267756
parent 0ac6a741
2019-01-08 Paolo Carlini <paolo.carlini@oracle.com>
* decl.c (grok_reference_init): Improve error location.
(grokdeclarator): Likewise, improve two locations.
2019-01-08 Marek Polacek <polacek@redhat.com> 2019-01-08 Marek Polacek <polacek@redhat.com>
PR c++/88538 - braced-init-list in template-argument-list. PR c++/88538 - braced-init-list in template-argument-list.
......
...@@ -5357,7 +5357,8 @@ grok_reference_init (tree decl, tree type, tree init, int flags) ...@@ -5357,7 +5357,8 @@ grok_reference_init (tree decl, tree type, tree init, int flags)
if ((DECL_LANG_SPECIFIC (decl) == 0 if ((DECL_LANG_SPECIFIC (decl) == 0
|| DECL_IN_AGGR_P (decl) == 0) || DECL_IN_AGGR_P (decl) == 0)
&& ! DECL_THIS_EXTERN (decl)) && ! DECL_THIS_EXTERN (decl))
error ("%qD declared as reference but not initialized", decl); error_at (DECL_SOURCE_LOCATION (decl),
"%qD declared as reference but not initialized", decl);
return NULL_TREE; return NULL_TREE;
} }
...@@ -12517,8 +12518,9 @@ grokdeclarator (const cp_declarator *declarator, ...@@ -12517,8 +12518,9 @@ grokdeclarator (const cp_declarator *declarator,
unqualified_id); unqualified_id);
else if (constexpr_p && !initialized) else if (constexpr_p && !initialized)
{ {
error ("%<constexpr%> static data member %qD must have an " error_at (DECL_SOURCE_LOCATION (decl),
"initializer", decl); "%<constexpr%> static data member %qD must "
"have an initializer", decl);
constexpr_p = false; constexpr_p = false;
} }
...@@ -12756,8 +12758,9 @@ grokdeclarator (const cp_declarator *declarator, ...@@ -12756,8 +12758,9 @@ grokdeclarator (const cp_declarator *declarator,
} }
else if (constexpr_p && DECL_EXTERNAL (decl)) else if (constexpr_p && DECL_EXTERNAL (decl))
{ {
error ("declaration of %<constexpr%> variable %qD " error_at (DECL_SOURCE_LOCATION (decl),
"is not a definition", decl); "declaration of %<constexpr%> variable %qD "
"is not a definition", decl);
constexpr_p = false; constexpr_p = false;
} }
......
2019-01-08 Paolo Carlini <paolo.carlini@oracle.com>
* g++.dg/diagnostic/constexpr2.C: New.
* g++.dg/diagnostic/ref3.C: Likewise.
2019-01-08 Marek Polacek <polacek@redhat.com> 2019-01-08 Marek Polacek <polacek@redhat.com>
PR c++/88538 - braced-init-list in template-argument-list. PR c++/88538 - braced-init-list in template-argument-list.
......
// { dg-do compile { target c++11 } }
extern constexpr int i __attribute__((unused)); // { dg-error "22:declaration of .constexpr. variable .i." }
struct S
{
constexpr static int i __attribute__((unused)); // { dg-error "24:.constexpr. static data member .i." }
};
int& i __attribute__((unused)); // { dg-error "6:.i. declared as reference" }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment