aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/lto-cgraph.c2
-rw-r--r--gcc/lto/ChangeLog4
-rw-r--r--gcc/lto/lto.c10
4 files changed, 9 insertions, 11 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 63e100b..8fad225 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-20 Jan Hubicka <jh@suse.cz>
+
+ * lto-cgraph.c (input_symtab): Do not set cgraph state.
+
2013-06-20 Joern Rennecke <joern.rennecke@embecosm.com>
PR rtl-optimization/57425
diff --git a/gcc/lto-cgraph.c b/gcc/lto-cgraph.c
index 2122f70..6c9a028 100644
--- a/gcc/lto-cgraph.c
+++ b/gcc/lto-cgraph.c
@@ -1451,8 +1451,6 @@ input_symtab (void)
unsigned int j = 0;
struct cgraph_node *node;
- cgraph_state = CGRAPH_STATE_IPA_SSA;
-
while ((file_data = file_data_vec[j++]))
{
const char *data;
diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index 2723678..c2cbeed 100644
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-20 Jan Hubicka <jh@suse.cz>
+
+ * lto.c (read_cgraph_and_symbols): Set cgraph state.
+
2013-06-19 Jan Hubicka <jh@suse.cz>
* lto-partition.c (add_references_to_partition): Use
diff --git a/gcc/lto/lto.c b/gcc/lto/lto.c
index 7ddb84d..c0f9328 100644
--- a/gcc/lto/lto.c
+++ b/gcc/lto/lto.c
@@ -3362,7 +3362,6 @@ read_cgraph_and_symbols (unsigned nfiles, const char **fnames)
{
unsigned int i, last_file_ix;
FILE *resolution;
- struct cgraph_node *node;
int count = 0;
struct lto_file_decl_data **decl_data;
void **res;
@@ -3544,14 +3543,7 @@ read_cgraph_and_symbols (unsigned nfiles, const char **fnames)
}
lto_symtab_merge_symbols ();
ggc_collect ();
-
- /* FIXME: ipa_transforms_to_apply holds list of passes that have optimization
- summaries computed and needs to apply changes. At the moment WHOPR only
- supports inlining, so we can push it here by hand. In future we need to stream
- this field into ltrans compilation. */
- if (flag_ltrans)
- FOR_EACH_DEFINED_FUNCTION (node)
- node->ipa_transforms_to_apply.safe_push ((ipa_opt_pass)&pass_ipa_inline);
+ cgraph_state = CGRAPH_STATE_IPA_SSA;
timevar_pop (TV_IPA_LTO_CGRAPH_MERGE);