Merge GDB 7.5.1

gdb/testsuite/gdb.base/watchpoint.c

 #include <stdio.h>
 #include <unistd.h>
 /*
  *      Since using watchpoints can be very slow, we have to take some pains to
  *      ensure that we don't run too long with them enabled or we run the risk
  *      of having the test timeout.  To help avoid this, we insert some marker
  *      functions in the execution stream so we can set breakpoints at known
  *      locations, without worrying about invalidating line numbers by changing
  *      this file.  We use null bodied functions are markers since gdb does
  *      not support breakpoints at labeled text points at this time.
@@ skipping 24 matching lines @@
 {
   int val;
 };
 struct foo struct1, struct2, *ptr1, *ptr2;
 
 int doread = 0;
 
 char *global_ptr;
 char **global_ptr_ptr;
 
+struct foo2
+{
+  int val[2];
+};
+struct foo2 foo2;
+
+struct foo4
+{
+  int val[4];
+};
+struct foo4 foo4;
+
 void marker1 ()
 {
 }
 
 void marker2 ()
 {
 }
 
 void marker4 ()
 {
 }
 
 void marker5 ()
 {
 }
 
 void marker6 ()
 {
 }
 
 #ifdef PROTOTYPES
 void recurser (int  x)
 #else
 void recurser (x) int  x;
 #endif
 {
-  int  local_x;
+  int  local_x = 0;
 
   if (x > 0)
     recurser (x-1);
   local_x = x;
 }
 
 void
 func2 ()
 {
-  int  local_a;
+  int  local_a = 0;
   static int  static_b;
 
+  /* func2 breakpoint here */
   ival5++;
   local_a = ival5;
   static_b = local_a;
 }
 
 void
 func3 ()
 {
   int x;
   int y;
@@ skipping 36 matching lines @@
 func5 ()
 {
   int val = 0, val2 = 23;
   int *x = &val;
 
   /* func5 breakpoint here */
   x = &val2;
   val = 27;
 }
 
+void
+func6 (void)
+{
+  /* func6 breakpoint here */
+  foo2.val[1] = 0;
+  foo2.val[1] = 11;
+}
+
+void
+func7 (void)
+{
+  /* func7 breakpoint here */
+  foo4.val[3] = 0;
+  foo4.val[3] = 33;
+}
+
 int main ()
 {
-#ifdef usestubs
-  set_debug_traps();
-  breakpoint();
-#endif
   struct1.val = 1;
   struct2.val = 2;
   ptr1 = &struct1;
   ptr2 = &struct2;
   marker1 ();
   func1 ();
   for (count = 0; count < 4; count++) {
     ival1 = count;
     ival3 = count; ival4 = count;
   }
@@ skipping 45 matching lines @@
   /* This invocation is used for watches of a static
      (non-stack-based) local variable. */
   func2 ();
 
   /* This invocation is used for watches of a local variable
      when recursion happens.
      */
   marker6 ();
   recurser (2);
 
+  /* This invocation is used for watches of a local variable with explicitly
+     specified scope when recursion happens.
+     */
+  marker6 ();
+  recurser (2);
+
   marker6 ();
 
   func3 ();
 
   func4 ();
 
   func5 ();
 
+  func6 ();
+
+  func7 ();
+
   return 0;
 }