Hi,
On 05/16/2012 05:41 PM, Jason Merrill wrote:
On 05/16/2012 06:54 AM, Paolo Carlini wrote:
isn't the diagnostic machinery able to cope with UNKNOWN_LOCATION? By
default should be interpreted as input_location, no?
That would make sense to me; I don't know if it works that way now,
though.
So, in the meanwhile we learned that it doesn't.
I also carried out a simple practical experiment where I hacked my on
going work 53371 and changed its "error (" to an "error_at
(UNKNOWN_LOCATION, " and this is the change: this:
53371.C: In function ‘int main()’:
53371.C:11:15: error: cannot catch exceptions by rvalue reference
} catch (int&&) { }
^
(the caret is below the first &, good enough, I guess) becomes:
In function ‘int main()’:
cc1plus: error: cannot catch exceptions by rvalue reference
totally broken. Thus, it remains to decide whether we want to guard
against this with something local to the build_x_* functions, like my
LOC_OR_HERE trick, or with something like the patchlet p1 which I'm
attaching below. Just let me know.
@@ -11968,7 +11968,8 @@ tsubst_qualified_id (tree qualified_id, tree
args,
if (dependent_scope_p (scope))
{
if (is_template)
- expr = build_min_nt (TEMPLATE_ID_EXPR, expr, template_args);
+ expr = build_min_nt_loc (UNKNOWN_LOCATION, TEMPLATE_ID_EXPR,
+ expr, template_args);
Here we should be able to retain the location from the
TEMPLATE_ID_EXPR we took apart earlier.
Ok. Something like p2 below?
We are getting close... ;)
Thanks,
Paolo.
//////////////////////////
Index: diagnostic.c
===================================================================
--- diagnostic.c (revision 187588)
+++ diagnostic.c (working copy)
@@ -508,6 +508,13 @@ diagnostic_report_diagnostic (diagnostic_context *
diagnostic_t orig_diag_kind = diagnostic->kind;
const char *saved_format_spec;
+ /* Tolerate UNKNOWN_LOCATION and turn it to input_location. */
+ if (location == UNKNOWN_LOCATION)
+ {
+ diagnostic->location = input_location;
+ location = input_location;
+ }
+
/* Give preference to being able to inhibit warnings, before they
get reclassified to something else. */
if ((diagnostic->kind == DK_WARNING || diagnostic->kind == DK_PEDWARN)
Index: pt.c
===================================================================
--- pt.c (revision 187588)
+++ pt.c (working copy)
@@ -11932,6 +11932,7 @@ tsubst_qualified_id (tree qualified_id, tree args,
tree name;
bool is_template;
tree template_args;
+ location_t loc = UNKNOWN_LOCATION;
gcc_assert (TREE_CODE (qualified_id) == SCOPE_REF);
@@ -11940,6 +11941,7 @@ tsubst_qualified_id (tree qualified_id, tree args,
if (TREE_CODE (name) == TEMPLATE_ID_EXPR)
{
is_template = true;
+ loc = EXPR_LOCATION (name);
template_args = TREE_OPERAND (name, 1);
if (template_args)
template_args = tsubst_template_args (template_args, args,
@@ -11968,7 +11970,7 @@ tsubst_qualified_id (tree qualified_id, tree args,
if (dependent_scope_p (scope))
{
if (is_template)
- expr = build_min_nt (TEMPLATE_ID_EXPR, expr, template_args);
+ expr = build_min_nt_loc (loc, TEMPLATE_ID_EXPR, expr, template_args);
return build_qualified_name (NULL_TREE, scope, expr,
QUALIFIED_NAME_IS_TEMPLATE (qualified_id));
}
