Hi Tom! On Wed, 30 Sep 2015 11:46:56 +0200, Tom de Vries <tom_devr...@mentor.com> wrote: > On 30/09/15 11:25, Thomas Schwinge wrote: > > Don't we also want to commit the following change, which was part of your > > trunk r227103 (883f001d2c3672e0674bec71f36a2052734a72cf) commit (and now > > shows up as a delta between trunk and gomp-4_0-branch)? > > > > --- gcc/tree-cfg.c > > +++ gcc/tree-cfg.c > > @@ -6424,9 +6424,6 @@ replace_ssa_name (tree name, hash_map<tree, tree> > > *vars_map, > > replace_by_duplicate_decl (&decl, vars_map, to_context); > > new_name = make_ssa_name_fn (DECL_STRUCT_FUNCTION (to_context), > > decl, SSA_NAME_DEF_STMT (name)); > > - if (SSA_NAME_IS_DEFAULT_DEF (name)) > > - set_ssa_default_def (DECL_STRUCT_FUNCTION (to_context), > > - decl, new_name); > > } > > else > > new_name = copy_ssa_name_fn (DECL_STRUCT_FUNCTION (to_context), > > Indeed, that bit is part of the patch "Don't create superfluous parm in > expand_omp_taskreg", but was dropped in the merge (probably because it > conflicted with the "Fix release_dangling_ssa_names" patch that I just > reverted).
Aha, so my fault after all. ;-)
> So we need to apply it.
Committed to gomp-4_0-branch in r228285:
commit 4d7d168dc9aab3fa1ebf55bb3cb94d7b0477d639
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed Sep 30 10:03:37 2015 +0000
More gcc/tree-cfg.c:replace_ssa_name cleanup
gcc/
* tree-cfg.c (replace_ssa_name): Revert obsolete changes.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@228285
138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/ChangeLog.gomp | 4 ++++
gcc/tree-cfg.c | 3 ---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git gcc/ChangeLog.gomp gcc/ChangeLog.gomp
index 06440bf..c4033e0 100644
--- gcc/ChangeLog.gomp
+++ gcc/ChangeLog.gomp
@@ -1,3 +1,7 @@
+2015-09-30 Thomas Schwinge <tho...@codesourcery.com>
+
+ * tree-cfg.c (replace_ssa_name): Revert obsolete changes.
+
2015-09-30 Tom de Vries <t...@codesourcery.com>
* omp-low.c (release_dangling_ssa_names): Remove.
diff --git gcc/tree-cfg.c gcc/tree-cfg.c
index a3c3b20..500fc43 100644
--- gcc/tree-cfg.c
+++ gcc/tree-cfg.c
@@ -6424,9 +6424,6 @@ replace_ssa_name (tree name, hash_map<tree, tree>
*vars_map,
replace_by_duplicate_decl (&decl, vars_map, to_context);
new_name = make_ssa_name_fn (DECL_STRUCT_FUNCTION (to_context),
decl, SSA_NAME_DEF_STMT (name));
- if (SSA_NAME_IS_DEFAULT_DEF (name))
- set_ssa_default_def (DECL_STRUCT_FUNCTION (to_context),
- decl, new_name);
}
else
new_name = copy_ssa_name_fn (DECL_STRUCT_FUNCTION (to_context),
Grüße,
Thomas
signature.asc
Description: PGP signature
