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

re PR middle-end/47650 (wrong output of print_generic_decl() called from a plugin) 

2011-03-15  Richard Guenther  <rguenther@suse.de>

	PR middle-end/47650
	* tree-pretty-print.c (dump_function_declaration): Properly
	dump unprototyped and varargs function types.

	* gfortran.dg/c_f_pointer_tests_3.f90: Adjust.
	* gfortran.dg/ishft_4.f90: Likewise.
	* gfortran.dg/leadz_trailz_3.f90: Likewise.

From-SVN: r170995
This commit is contained in:
Richard Guenther 2011-03-15 13:39:28 +00:00 committed by Richard Biener
parent c7ee7b4534
commit 930672adb7
6 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
2011-03-15 Richard Guenther <rguenther@suse.de>
PR middle-end/47650
* tree-pretty-print.c (dump_function_declaration): Properly
dump unprototyped and varargs function types.
2011-03-15 Richard Guenther <rguenther@suse.de>
PR tree-optimization/13954

7
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,10 @@
2011-03-15 Richard Guenther <rguenther@suse.de>
PR middle-end/47650
* gfortran.dg/c_f_pointer_tests_3.f90: Adjust.
* gfortran.dg/ishft_4.f90: Likewise.
* gfortran.dg/leadz_trailz_3.f90: Likewise.
2011-03-15 Richard Guenther <rguenther@suse.de>
PR tree-optimization/13954

2
gcc/testsuite/gfortran.dg/c_f_pointer_tests_3.f90
View File

@ -30,6 +30,6 @@ end program test
! { dg-final { scan-tree-dump-times " fptr = .integer.kind=4. .. cptr" 1 "original" } }
!
! Check c_f_procpointer
! { dg-final { scan-tree-dump-times " fprocptr = .integer.kind=4. .\\*<.*>. .void.. cfunptr;" 1 "original" } }
! { dg-final { scan-tree-dump-times " fprocptr = .integer.kind=4. .\\*<.*>. ... cfunptr;" 1 "original" } }
!
! { dg-final { cleanup-tree-dump "original" } }

4
gcc/testsuite/gfortran.dg/ishft_4.f90
View File

@ -35,6 +35,6 @@ end program
! -- once in the function definition itself
! -- plus as many times as the function is called
!
! { dg-final { scan-tree-dump-times "foo *\\\(\\\)" 5 "original" } }
! { dg-final { scan-tree-dump-times "bar *\\\(\\\)" 5 "original" } }
! { dg-final { scan-tree-dump-times "foo *\\\(\\\)" 6 "original" } }
! { dg-final { scan-tree-dump-times "bar *\\\(\\\)" 6 "original" } }
! { dg-final { cleanup-tree-dump "original" } }

2
gcc/testsuite/gfortran.dg/leadz_trailz_3.f90
View File

@ -26,5 +26,5 @@ end program
! -- once in the function definition itself
! -- plus as many times as the function is called
!
! { dg-final { scan-tree-dump-times "foo *\\\(\\\)" 7 "original" } }
! { dg-final { scan-tree-dump-times "foo *\\\(\\\)" 8 "original" } }
! { dg-final { cleanup-tree-dump "original" } }

20
gcc/tree-pretty-print.c
View File

@ -232,23 +232,27 @@ dump_function_declaration (pretty_printer *buffer, tree node,
pp_space (buffer);
pp_character (buffer, '(');
/* Print the argument types. The last element in the list is a VOID_TYPE.
The following avoids printing the last element. */
/* Print the argument types. */
arg = TYPE_ARG_TYPES (node);
while (arg && TREE_CHAIN (arg) && arg != error_mark_node)
while (arg && arg != void_list_node && arg != error_mark_node)
{
wrote_arg = true;
dump_generic_node (buffer, TREE_VALUE (arg), spc, flags, false);
arg = TREE_CHAIN (arg);
if (TREE_CHAIN (arg) && TREE_CODE (TREE_CHAIN (arg)) == TREE_LIST)
if (wrote_arg)
{
pp_character (buffer, ',');
pp_space (buffer);
}
wrote_arg = true;
dump_generic_node (buffer, TREE_VALUE (arg), spc, flags, false);
arg = TREE_CHAIN (arg);
}
if (!wrote_arg)
/* Drop the trailing void_type_node if we had any previous argument. */
if (arg == void_list_node && !wrote_arg)
pp_string (buffer, "void");
/* Properly dump vararg function types. */
else if (!arg && wrote_arg)
pp_string (buffer, ", ...");
/* Avoid printing any arg for unprototyped functions. */
pp_character (buffer, ')');
}