diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cfgexpand.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/vla-1.c | 25 | ||||
| -rw-r--r-- | gcc/tree-inline.c | 3 |
5 files changed, 41 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8966da1..8add29b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2018-07-09 Tom de Vries <tdevries@suse.de> + + * cfgexpand.c (expand_debug_source_expr): Handle VAR_DECL. + * tree-inline.c (remap_ssa_name): Handle default def ssa_name mapping + onto VAR_DECL with abstract origin. + 2018-07-07 Jim Wilson <jimw@sifive.com> * config/riscv/riscv.c (TARGET_CUSTOM_FUNCTION_DESCRIPTORS): New. diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c index 9b91279..d6e3c38 100644 --- a/gcc/cfgexpand.c +++ b/gcc/cfgexpand.c @@ -5141,6 +5141,10 @@ expand_debug_source_expr (tree exp) switch (TREE_CODE (exp)) { + case VAR_DECL: + if (DECL_ABSTRACT_ORIGIN (exp)) + return expand_debug_source_expr (DECL_ABSTRACT_ORIGIN (exp)); + break; case PARM_DECL: { mode = DECL_MODE (exp); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 04d705d..988fac1 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2018-07-09 Tom de Vries <tdevries@suse.de> + + * gcc.dg/vla-1.c: New test. + 2018-07-07 Tom de Vries <tdevries@suse.de> * gcc.misc-tests/options.exp (check_for_all_options): Clean up dump diff --git a/gcc/testsuite/gcc.dg/vla-1.c b/gcc/testsuite/gcc.dg/vla-1.c new file mode 100644 index 0000000..56437ae --- /dev/null +++ b/gcc/testsuite/gcc.dg/vla-1.c @@ -0,0 +1,25 @@ +/* { dg-do compile } */ +/* { dg-options "-g -O3 -fdump-tree-optimized -fvar-tracking-assignments -fno-selective-scheduling -fno-selective-scheduling2" } */ + +int __attribute__((noinline)) +f1 (int i) +{ + char a[i + 1]; + char b[i + 2]; + b[1] = 3; + a[0] = 5; + return a[0] + b[1]; +} + +int +main () +{ + volatile int j; + int x = 5; + j = f1 (x); + return 0; +} + +/* One debug source bind is generated for the parameter, and two to describe the + sizes of a and b. */ +/* { dg-final { scan-tree-dump-times " s=> i" 3 "optimized" } } */ diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c index 427ef95..45aba81 100644 --- a/gcc/tree-inline.c +++ b/gcc/tree-inline.c @@ -208,7 +208,8 @@ remap_ssa_name (tree name, copy_body_data *id) n = id->decl_map->get (val); if (n != NULL) val = *n; - if (TREE_CODE (val) != PARM_DECL) + if (TREE_CODE (val) != PARM_DECL + && !(VAR_P (val) && DECL_ABSTRACT_ORIGIN (val))) { processing_debug_stmt = -1; return name; |