diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d2e3ba539a78981ee64dda9a9a6f7b55a3e4b13d..8ef121a9dcf6270f397de7a1e4012137d22af2ae 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,4 +1,8 @@
-2010-07-02  Jan Hubicka  <jh@suse.cz>
+2010-07-03  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gimplify.c (mostly_copy_tree_r): Deal with BIND_EXPR.
+
+2010-07-03  Jan Hubicka  <jh@suse.cz>
 
 	* config/i386/i386.c (override_options): Revert accidental commit.
 
diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index a9c93ac972d0e17e997f69f462fb88904540950f..9eb8fa70d3e7924adf725735e421bcd6c737cab2 100644
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -868,9 +868,9 @@ mostly_copy_tree_r (tree *tp, int *walk_subtrees, void *data)
   tree t = *tp;
   enum tree_code code = TREE_CODE (t);
 
-  /* Do not copy SAVE_EXPR or TARGET_EXPR nodes themselves, but copy
-     their subtrees if we can make sure to do it only once.  */
-  if (code == SAVE_EXPR || code == TARGET_EXPR)
+  /* Do not copy SAVE_EXPR, TARGET_EXPR or BIND_EXPR nodes themselves, but
+     copy their subtrees if we can make sure to do it only once.  */
+  if (code == SAVE_EXPR || code == TARGET_EXPR || code == BIND_EXPR)
     {
       if (data && !pointer_set_insert ((struct pointer_set_t *)data, t))
 	;
@@ -895,10 +895,7 @@ mostly_copy_tree_r (tree *tp, int *walk_subtrees, void *data)
 
   /* Leave the bulk of the work to copy_tree_r itself.  */
   else
-    {
-      gcc_assert (code != BIND_EXPR);
-      copy_tree_r (tp, walk_subtrees, NULL);
-    }
+    copy_tree_r (tp, walk_subtrees, NULL);
 
   return NULL_TREE;
 }
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index fb71e59a560cda25ea060b05e98046f7fca5671b..d64f5054b31fcce80fd794dec966877a2f0508c1 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-03  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/cond_expr1.adb: New test.
+
 2010-07-03  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* gnat.dg/modular3.adb: New test.
diff --git a/gcc/testsuite/gnat.dg/cond_expr1.adb b/gcc/testsuite/gnat.dg/cond_expr1.adb
new file mode 100644
index 0000000000000000000000000000000000000000..e1a87a36ab533c32e0169520f43386b16224cbef
--- /dev/null
+++ b/gcc/testsuite/gnat.dg/cond_expr1.adb
@@ -0,0 +1,7 @@
+-- { dg-do compile }
+-- { dg-options "-gnat12" }
+
+function Cond_Expr1 (Dir : in String) return String is
+begin
+   return (if Dir (Dir'Last) = '\' then Dir else Dir & '\');
+end;