From: Jan Hubicka <jh@suse.cz>
Date: Wed, 10 Sep 2008 11:37:18 +0000 (+0200)
Subject: value-prof.c (gimple_ic): Fix tuplification bug.
X-Git-Tag: releases/gcc-4.4.0~2519
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=99e395c716b65987be6f026628bc2122990b5347;p=thirdparty%2Fgcc.git

value-prof.c (gimple_ic): Fix tuplification bug.

	* value-prof.c (gimple_ic): Fix tuplification bug.
	* sched-deps.c (sched_insns_conditions_mutex_p): Silence unitialized var
	warning.

From-SVN: r140228
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8c231a2b2e59..e6ede43f21a7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-10  Jan Hubicka  <jh@suse.cz>
+
+	* value-prof.c (gimple_ic): Fix tuplification bug.
+	* sched-deps.c (sched_insns_conditions_mutex_p): Silence unitialized var
+	warning.
+
 2008-09-10  Jakub Jelinek  <jakub@redhat.com>
 
 	PR tree-optimization/37353
diff --git a/gcc/sched-deps.c b/gcc/sched-deps.c
index b7aa6b4d9ebb..784f84ff63dd 100644
--- a/gcc/sched-deps.c
+++ b/gcc/sched-deps.c
@@ -527,7 +527,7 @@ bool
 sched_insns_conditions_mutex_p (const_rtx insn1, const_rtx insn2)
 {
   rtx cond1, cond2;
-  bool rev1, rev2;
+  bool rev1 = false, rev2 = false;
 
   /* df doesn't handle conditional lifetimes entirely correctly;
      calls mess up the conditional lifetimes.  */
diff --git a/gcc/value-prof.c b/gcc/value-prof.c
index fac124ffddf5..1900faa5299c 100644
--- a/gcc/value-prof.c
+++ b/gcc/value-prof.c
@@ -1117,8 +1117,7 @@ gimple_ic (gimple stmt, gimple call, struct cgraph_node *direct_call,
   bb1end = stmt3;
 
   stmt1 = gimple_copy (stmt);
-  gimple_call_set_fn (stmt,
-		      build_addr (direct_call->decl, current_function_decl));
+  gimple_call_set_fndecl (stmt1, direct_call->decl);
   gsi_insert_before (&gsi, stmt1, GSI_SAME_STMT);
   bb2end = stmt1;
   bb3end = stmt;