diff options
| author | Tom de Vries <tom@codesourcery.com> | 2015-06-09 15:46:30 +0000 |
|---|---|---|
| committer | Tom de Vries <vries@gcc.gnu.org> | 2015-06-09 15:46:30 +0000 |
| commit | 86b76c209b26dba6ebeacd9464cfb4df75ff9e6e (patch) | |
| tree | c1f1f3ef87b64552b369711daf25581b555fc3c8 | |
| parent | 5af874fb6518ed3e21c1e0f750fac86788fdafa3 (diff) | |
| download | gcc-86b76c209b26dba6ebeacd9464cfb4df75ff9e6e.zip gcc-86b76c209b26dba6ebeacd9464cfb4df75ff9e6e.tar.gz gcc-86b76c209b26dba6ebeacd9464cfb4df75ff9e6e.tar.bz2 | |
Handle location in expand_ifn_va_arg_1
2015-06-09 Tom de Vries <tom@codesourcery.com>
* tree-stdarg.c (expand_ifn_va_arg_1): Handle location.
* gcc.target/i386/vararg-loc.c: New test.
From-SVN: r224288
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.target/i386/vararg-loc.c | 27 | ||||
| -rw-r--r-- | gcc/tree-stdarg.c | 4 |
4 files changed, 39 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 86450b0..27b6cd2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2015-06-09 Tom de Vries <tom@codesourcery.com> + + * tree-stdarg.c (expand_ifn_va_arg_1): Handle location. + 2015-06-09 Jason Merrill <jason@redhat.com> PR bootstrap/66448 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 1443d33..64e924a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2015-06-09 Tom de Vries <tom@codesourcery.com> + + * gcc.target/i386/vararg-loc.c: New test. + 2015-06-09 Paolo Carlini <paolo.carlini@oracle.com> PR c++/65815 diff --git a/gcc/testsuite/gcc.target/i386/vararg-loc.c b/gcc/testsuite/gcc.target/i386/vararg-loc.c new file mode 100644 index 0000000..f236fe3 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/vararg-loc.c @@ -0,0 +1,27 @@ +/* { dg-do compile } */ +/* { dg-options "-g -O0" } */ + +#include <stdarg.h> + +int /* 6. */ + /* 7. */ +f (int a, ...) /* 8. */ + /* 9. */ +{ + + int sum = a; + + va_list ap; + + va_start (ap, a); + + sum += va_arg (ap, int); /* 18. */ + + sum += va_arg (ap, int); /* 20. */ + + return sum; +} + +/* { dg-final { scan-assembler-not "\\.loc 1 \[6789\] 0" } } */ +/* { dg-final { scan-assembler-times "\\.loc 1 18 0" 1 } } */ +/* { dg-final { scan-assembler-times "\\.loc 1 20 0" 1 } } */ diff --git a/gcc/tree-stdarg.c b/gcc/tree-stdarg.c index 08d10b5..65fe9f9 100644 --- a/gcc/tree-stdarg.c +++ b/gcc/tree-stdarg.c @@ -1031,6 +1031,7 @@ expand_ifn_va_arg_1 (function *fun) bool modified = false; basic_block bb; gimple_stmt_iterator i; + location_t saved_location; FOR_EACH_BB_FN (bb, fun) for (i = gsi_start_bb (bb); !gsi_end_p (i); gsi_next (&i)) @@ -1051,6 +1052,8 @@ expand_ifn_va_arg_1 (function *fun) ap = build_fold_indirect_ref (ap); push_gimplify_context (false); + saved_location = input_location; + input_location = gimple_location (stmt); /* Make it easier for the backends by protecting the valist argument from multiple evaluations. */ @@ -1081,6 +1084,7 @@ expand_ifn_va_arg_1 (function *fun) else gimplify_expr (&expr, &pre, &post, is_gimple_lvalue, fb_lvalue); + input_location = saved_location; pop_gimplify_context (NULL); gimple_seq_add_seq (&pre, post); |