Tweak -Warray-bounds diagnostics based on feedback from Chandler.

llvm-svn: 125649
diff --git a/clang/test/Sema/array-bounds.c b/clang/test/Sema/array-bounds.c
index b540885..0ae53d3 100644
--- a/clang/test/Sema/array-bounds.c
+++ b/clang/test/Sema/array-bounds.c
@@ -1,16 +1,16 @@
 // RUN: %clang_cc1 -verify %s
 
 int foo() {
-  int x[2];
-  int y[2];
+  int x[2]; // expected-note 4 {{Array 'x' declared here}}
+  int y[2]; // expected-note 2 {{Array 'y' declared here}}
   int *p = &y[2]; // no-warning
   (void) sizeof(x[2]); // no-warning
-  y[2] = 2; // expected-warning{{array index excedes last array element}}
-  return x[2] +  // expected-warning{{array index excedes last array element}}
-         y[-1] + // expected-warning{{array index precedes first array element}}
-         x[sizeof(x)] +  // expected-warning{{array index excedes last array element}}
-         x[sizeof(x) / sizeof(x[0])] +  // expected-warning{{array index excedes last array element}}
+  y[2] = 2; // expected-warning{{array index of '2' indexes past the end of an array (that contains 2 elements)}}
+  return x[2] +  // expected-warning{{array index of '2' indexes past the end of an array (that contains 2 elements)}}
+         y[-1] + // expected-warning{{array index of '-1' indexes before the beginning of the array}}
+         x[sizeof(x)] +  // expected-warning{{array index of '8' indexes past the end of an array (that contains 2 elements)}}
+         x[sizeof(x) / sizeof(x[0])] +  // expected-warning{{array index of '2' indexes past the end of an array (that contains 2 elements)}}
          x[sizeof(x) / sizeof(x[0]) - 1] + // no-warning
-         x[sizeof(x[2])]; // expected-warning{{array index excedes last array element}}
+         x[sizeof(x[2])]; // expected-warning{{array index of '4' indexes past the end of an array (that contains 2 elements)}}
 }