diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fb424bdad8f4..4abab8585ee0 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-25  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* tree-inline.c (copy_bb): Use GSI_CONTINUE_LINKING when inserting new
+	statements because of the return slot optimization.
+
 2010-09-25  Anatoly Sokolov  <aesok@post.ru>
 
 	* config/avr/avr.h (CLASS_LIKELY_SPILLED_P): Remove.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6a65c793d11b..d9853727d4fe 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-25  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/return2.ad[sb]: New test.
+	* gnat.dg/return2_pkg.ads: New helper.
+
 2010-09-25  Daniel Kraft  <d@domob.eu>
 
 	PR fortran/45776
diff --git a/gcc/testsuite/gnat.dg/return2.adb b/gcc/testsuite/gnat.dg/return2.adb
new file mode 100644
index 000000000000..65b7bf045aca
--- /dev/null
+++ b/gcc/testsuite/gnat.dg/return2.adb
@@ -0,0 +1,33 @@
+-- { dg-do compile }
+-- { dg-options "-O" }
+
+with Return2_Pkg; use Return2_Pkg;
+
+package body Return2 is
+
+  function Value_Internal (Image : String) return Result_Internal_T is
+  begin
+    return (Member => False);
+  end;
+
+  type Result_T is array (1 .. 2) of Result_Internal_T;
+
+  function Value (Img : String) return T is
+    My_F : constant String := F;
+    Result : Result_T;
+    Value : T;
+  begin
+    for I in Result'Range loop
+      if G (My_F, I) /= "" then
+        Result (I) := Value_Internal (G (My_F, I));
+        if Result (I).Member then
+          Value (Result (I).Data) := True;
+        else
+          raise Program_Error;
+        end if;
+      end if;
+    end loop;
+    return Value;
+  end;
+
+end Return2;
diff --git a/gcc/testsuite/gnat.dg/return2.ads b/gcc/testsuite/gnat.dg/return2.ads
new file mode 100644
index 000000000000..3e29910d2c79
--- /dev/null
+++ b/gcc/testsuite/gnat.dg/return2.ads
@@ -0,0 +1,18 @@
+package Return2 is
+
+  type Kind_T is (One, Two);
+
+  type T is array (Kind_T) of Boolean;
+
+  type Result_Internal_T (Member : Boolean := False) is record
+    case Member is
+      when True =>
+        Data : Kind_T := Kind_T'First;
+      when False =>
+        null;
+    end case;
+  end record;
+
+  function Value (Img : String) return T;
+
+end Return2;
diff --git a/gcc/testsuite/gnat.dg/return2_pkg.ads b/gcc/testsuite/gnat.dg/return2_pkg.ads
new file mode 100644
index 000000000000..f5738654a6d5
--- /dev/null
+++ b/gcc/testsuite/gnat.dg/return2_pkg.ads
@@ -0,0 +1,7 @@
+package Return2_Pkg is
+
+  function F return String;
+
+  function G (Line : String; Index : Positive) return String;
+
+end Return2_Pkg;
diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index 8a53d5ed2b0c..b0627be0d3db 100644
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -1558,7 +1558,8 @@ copy_bb (copy_body_data *id, basic_block bb, int frequency_scale,
 	  tree new_rhs;
 	  new_rhs = force_gimple_operand_gsi (&seq_gsi,
 					      gimple_assign_rhs1 (stmt),
-					      true, NULL, false, GSI_NEW_STMT);
+					      true, NULL, false,
+					      GSI_CONTINUE_LINKING);
 	  gimple_assign_set_rhs1 (stmt, new_rhs);
 	  id->regimplify = false;
 	}