procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR c++/59821 (__builtin_LINE and __builtin_FILE for new'd objects is wrong)

Browse source 
PR c++/59821
	* tree.c (bot_manip): Update the location of builtin_LINE and
	builtin_FILE calls.

From-SVN: r206686
This commit is contained in:
Jason Merrill 2014-01-16 14:55:12 -05:00 • committed by Jason Merrill
parent 42ed6cde4b
commit cfb1582ce3
4 changed files with 41 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gcc/cp/ChangeLog
View file

@ -1,3 +1,9 @@
2014-01-16 Jason Merrill <jason@redhat.com>
PR c++/59821
* tree.c (bot_manip): Update the location of builtin_LINE and
builtin_FILE calls.
2014-01-14 Jason Merrill <jason@redhat.com>
PR c++/59659

15
gcc/cp/tree.c
View file

@ -2306,7 +2306,20 @@ bot_manip (tree* tp, int* walk_subtrees, void* data)
/* Make a copy of this node. */
t = copy_tree_r (tp, walk_subtrees, NULL);
if (TREE_CODE (*tp) == CALL_EXPR)
set_flags_from_callee (*tp);
{
set_flags_from_callee (*tp);
/* builtin_LINE and builtin_FILE get the location where the default
argument is expanded, not where the call was written. */
tree callee = get_callee_fndecl (*tp);
if (callee && DECL_BUILT_IN (callee))
switch (DECL_FUNCTION_CODE (callee))
{
case BUILT_IN_FILE:
case BUILT_IN_LINE:
SET_EXPR_LOCATION (*tp, input_location);
}
}
return t;
}

4
gcc/doc/extend.texi
View file

@ -8726,6 +8726,8 @@ means that the compiler can assume for @code{x}, set to @code{arg}, that
@deftypefn {Built-in Function} int __builtin_LINE ()
This function is the equivalent to the preprocessor @code{__LINE__}
macro and returns the line number of the invocation of the built-in.
In a C++ default argument for a function @var{F}, it gets the line number of
the call to @var{F}.
@end deftypefn
@deftypefn {Built-in Function} {const char *} __builtin_FUNCTION ()
@ -8736,6 +8738,8 @@ macro and returns the function name the invocation of the built-in is in.
@deftypefn {Built-in Function} {const char *} __builtin_FILE ()
This function is the equivalent to the preprocessor @code{__FILE__}
macro and returns the file name the invocation of the built-in is in.
In a C++ default argument for a function @var{F}, it gets the file name of
the call to @var{F}.
@end deftypefn
@deftypefn {Built-in Function} void __builtin___clear_cache (char *@var{begin}, char *@var{end})

17
gcc/testsuite/g++.dg/ext/builtin-line1.C Normal file
View file

@ -0,0 +1,17 @@
// __builtin_LINE gets the location where the default argument is expanded.
// { dg-do run }
#include <cassert>
struct Foo
{
int line;
Foo( int line = __builtin_LINE() )
: line( line )
{}
};
int main()
{
assert (Foo().line == __LINE__);
assert ((new Foo)->line == __LINE__);
}