diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a356e97fbfb8cb76fef8f8eca75575d35e25ad38..46ac2c8242c8ef2e44720eeeda6a18ec073a7215 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-26  Jeff Law  <law@redhat.com>
+
+	* tree-ssa-threadedge.c (cond_arg_set_in_bb): Use last stmt.
+
 2012-10-26  Gunther Nikl  <gnikl@users.sourceforge.net>
 
 	* common/config/m68k/m68k-common.c (m68k_handle_option): Set
diff --git a/gcc/tree-ssa-threadedge.c b/gcc/tree-ssa-threadedge.c
index 6249e2f54c6fb7dd80007cec60ffd68ca49f80d1..ddaa7d12f19c946eef3f6d199c7e99333ac007da 100644
--- a/gcc/tree-ssa-threadedge.c
+++ b/gcc/tree-ssa-threadedge.c
@@ -584,7 +584,7 @@ cond_arg_set_in_bb (edge e, basic_block bb)
 {
   ssa_op_iter iter;
   use_operand_p use_p;
-  gimple last = gsi_stmt (gsi_last_bb (e->dest));
+  gimple last = last_stmt (e->dest);
 
   /* E->dest does not have to end with a control transferring
      instruction.  This can occurr when we try to extend a jump