aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlya Enkovich <ilya.enkovich@intel.com>2015-04-03 08:39:29 +0000
committerIlya Enkovich <ienkovich@gcc.gnu.org>2015-04-03 08:39:29 +0000
commita3d72251cc7791c95e1913c7e0fe44336028f1cd (patch)
treea3fca17736c9ec1e36d8c341f8d6564476b047e0
parentfb383fd288cdbc795df47ebe7c9d2837f03ee80c (diff)
downloadgcc-a3d72251cc7791c95e1913c7e0fe44336028f1cd.zip
gcc-a3d72251cc7791c95e1913c7e0fe44336028f1cd.tar.gz
gcc-a3d72251cc7791c95e1913c7e0fe44336028f1cd.tar.bz2
lto-cgraph.c (input_cgraph_1): Always link instrumented assembler name with original one.
* lto-cgraph.c (input_cgraph_1): Always link instrumented assembler name with original one. From-SVN: r221850
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/lto-cgraph.c5
2 files changed, 7 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 59dbeec..a11ec1c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-02 Ilya Enkovich <ilya.enkovich@intel.com>
+
+ * lto-cgraph.c (input_cgraph_1): Always link instrumented
+ assembler name with original one.
+
2015-04-02 Uros Bizjak <ubizjak@gmail.com>
* config/i386/i386.c (ix86_register_priority): Use AX_REG.
diff --git a/gcc/lto-cgraph.c b/gcc/lto-cgraph.c
index fa18d36..ac50e4b 100644
--- a/gcc/lto-cgraph.c
+++ b/gcc/lto-cgraph.c
@@ -1617,9 +1617,8 @@ input_cgraph_1 (struct lto_file_decl_data *file_data,
}
/* Restore decl names reference. */
- if (IDENTIFIER_TRANSPARENT_ALIAS (DECL_ASSEMBLER_NAME (cnode->decl))
- && !TREE_CHAIN (DECL_ASSEMBLER_NAME (cnode->decl)))
- TREE_CHAIN (DECL_ASSEMBLER_NAME (cnode->decl))
+ IDENTIFIER_TRANSPARENT_ALIAS (DECL_ASSEMBLER_NAME (cnode->decl)) = 1;
+ TREE_CHAIN (DECL_ASSEMBLER_NAME (cnode->decl))
= DECL_ASSEMBLER_NAME (cnode->orig_decl);
}
}