diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 706052de6622ec83c5b586bbd0e84cbd12f31f44..a8f7148419aadd82c4e698339f4cf8375bac4a71 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,4 +1,9 @@
-2009-10-17  Andy Hutchinson <hutchinsonandy@gcc.gnu.org>
+2009-10-19  Jakub Jelinek  <jakub@redhat.com>
+
+	* cfgexpand.c (expand_debug_expr): Fail if bitpos < 0 for non-MEM
+	op0.
+
+2009-10-17  Andy Hutchinson  <hutchinsonandy@gcc.gnu.org>
 
 	PR middle-end/41738
 	* optabs.c (expand_binop): Make mode of shift count expression mode
diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c
index acd70c13869f7980982269b422dc6d93cd605039..8c7c881ea6c83d3200e2f3f39473b733cc001e81 100644
--- a/gcc/cfgexpand.c
+++ b/gcc/cfgexpand.c
@@ -2593,6 +2593,9 @@ expand_debug_expr (tree exp)
 	if (bitpos == 0 && mode == GET_MODE (op0))
 	  return op0;
 
+        if (bitpos < 0)
+          return NULL;
+
 	if ((bitpos % BITS_PER_UNIT) == 0
 	    && bitsize == GET_MODE_BITSIZE (mode1))
 	  {
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 168123f813a3267ed5321833fa1d6944919981bc..d4d46529f5c42da943ae13e233070c6a7b7b8945 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2009-10-19  Jakub Jelinek  <jakub@redhat.com>
+
+	* gcc.dg/debug/vta-3.c: New test.
+
 2009-10-17  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* gnat.dg/nested_proc.adb: Rename into...
diff --git a/gcc/testsuite/gcc.dg/debug/vta-3.c b/gcc/testsuite/gcc.dg/debug/vta-3.c
new file mode 100644
index 0000000000000000000000000000000000000000..7d014f1bc1e21663143cef76d0759f84fba8d297
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/debug/vta-3.c
@@ -0,0 +1,17 @@
+/* { dg-do compile } */
+
+int
+foo (void)
+{
+  union { char e[8]; int i; } a, b;
+  char *c, *d;
+  unsigned int i;
+  c = a.e;
+  d = &b.e[sizeof (int) - 1];
+  for (i = 0; i < sizeof (int); i++)
+    {
+      *d = *c++;
+      --d;
+    }
+  return b.i;
+}