diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b33155de021..4cde87ade84 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-09  Mike Stump  <mrs@apple.com>
+
+	* c-typeck.c (c_begin_vm_scope): Fix file_scope processing.
+
 2006-06-09  David Daney  <ddaney@avtrex.com>
 
 	* doc/install.texi: Add binutils version recommendation for mips-*-*.
diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c
index 7898d9954e3..c2f62231412 100644
--- a/gcc/c-typeck.c
+++ b/gcc/c-typeck.c
@@ -7550,6 +7550,11 @@ c_begin_vm_scope (unsigned int scope)
   struct c_label_list *glist;
 
   gcc_assert (scope > 0);
+
+  /* At file_scope, we don't have to do any processing.  */
+  if (label_context_stack_vm == NULL)
+    return;
+
   if (c_switch_stack && !c_switch_stack->blocked_vm)
     c_switch_stack->blocked_vm = scope;
   for (glist = label_context_stack_vm->labels_used;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 04f2d73d61b..58def48a2d2 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-09  Mike Stump  <mrs@apple.com>
+
+	* gcc.dg/vla-7.c: Add.
+
 2006-06-10  Paul Thomas  <pault@gcc.gnu.org>
 
 	PR fortran/24558
diff --git a/gcc/testsuite/gcc.dg/vla-7.c b/gcc/testsuite/gcc.dg/vla-7.c
new file mode 100644
index 00000000000..e8c8cd455c6
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/vla-7.c
@@ -0,0 +1,3 @@
+/* { dg-options "-std=c99" } */
+
+int (*foo)(int (*a)[*]);