aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/tree-inline.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 543f3e4..99f5198 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-28 Richard Guenther <rguenther@suse.de>
+
+ * tree-inline.c (tree_function_versioning): Set BLOCK_SUPERCONTEXT
+ of the copied scope tree.
+
2011-02-28 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* doc/extend.texi (Function Attributes): Avoid deeply (and
diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index de30cfd..fd8edb4 100644
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -5156,6 +5156,7 @@ tree_function_versioning (tree old_decl, tree new_decl,
args_to_skip, &vars);
DECL_INITIAL (new_decl) = remap_blocks (DECL_INITIAL (id.src_fn), &id);
+ BLOCK_SUPERCONTEXT (DECL_INITIAL (new_decl)) = new_decl;
declare_inline_vars (DECL_INITIAL (new_decl), vars);