diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a3fc7746a0b..1f04e284c67 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-04  Simon Baldwin  <simonb@google.com>
+
+	* decl.c (grokdeclarator): Readability change.  Moved case labels
+	into direct switch statement scope.
+
 2007-06-04  Paolo Carlini  <pcarlini@suse.de>
 
 	* call.c (convert_like_real): Remove pointless code.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 407e5db8d65..2f65f1c1053 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -7224,19 +7224,19 @@ grokdeclarator (const cp_declarator *declarator,
 		gcc_unreachable ();
 	      }
 	    break;
-
-	  case cdk_array:
-	  case cdk_pointer:
-	  case cdk_reference:
-	  case cdk_ptrmem:
-	    break;
-
-	  case cdk_error:
-	    return error_mark_node;
-
-	  default:
-	    gcc_unreachable ();
 	  }
+
+	case cdk_array:
+	case cdk_pointer:
+	case cdk_reference:
+	case cdk_ptrmem:
+	  break;
+
+	case cdk_error:
+	  return error_mark_node;
+
+	default:
+	  gcc_unreachable ();
 	}
       if (id_declarator->kind == cdk_id)
 	break;