c++: conversion location

It seems more useful for a conversion to have the location of the source
expression rather than the enclosing expression, such as a call that might
convert multiple arguments in different ways.

As a result, in srcloc17.C the recorded location of 'e' when
copy-initialized became that of the initializer rather than the variable,
since the semantic was to convert the initializer (at its location) and then
initialize the variable from the resulting prvalue.  If we instead
direct-initialize the variable, the location of the constructor call is that
of the variable.

gcc/cp/ChangeLog:

	* call.cc (convert_like_internal) [ck_user]: Use iloc_sentinel.

gcc/testsuite/ChangeLog:

	* g++.dg/cpp2a/srcloc17.C: Adjust initialization.
This commit is contained in:
Jason Merrill 2024-09-15 16:02:13 +02:00
parent 2af87d98e6
commit 5ef73ba1cc
2 changed files with 5 additions and 1 deletions

View File

@ -8669,6 +8669,10 @@ convert_like_internal (conversion *convs, tree expr, tree fn, int argnum,
rvalue, but we know it's read. */
mark_exp_read (expr);
/* Give the conversion call the location of EXPR rather than the
location of the context that caused the conversion. */
iloc_sentinel ils (loc);
/* Pass LOOKUP_NO_CONVERSION so rvalue/base handling knows not to allow
any more UDCs. */
expr = build_over_call (cand, LOOKUP_NORMAL|LOOKUP_NO_CONVERSION,

View File

@ -90,7 +90,7 @@ bar ()
return false;
}
S<N> e = __LINE__;
S<N> e (__LINE__);
// ^ column 8
S<N> f = 1.0;
if (cmp (e.loc.file_name (), file1))