Merge GDB 7.5.1

gdb/testsuite/gdb.cp/cpexprs.cc

 /* This testcase is part of GDB, the GNU debugger.
 
    Copyright 2008-2012 Free Software Foundation, Inc.
 
    Contributed by Red Hat, originally written by Keith Seitz.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
@@ skipping 290 matching lines @@
   void a_function (void) const // derived::a_function
   { 
     this->base1::a_function ();
     this->base2::a_function ();
   }
 
   protected:
   int foo_;
 };
 
+class CV { public:
+  static const int i;
+  typedef int t;
+  void m(t);
+  void m(t) const;
+  void m(t) volatile;
+  void m(t) const volatile;
+};
+const int CV::i = 42;
+#ifdef __GNUC__
+# define ATTRIBUTE_USED __attribute__((used))
+#else
+# define ATTRIBUTE_USED
+#endif
+ATTRIBUTE_USED void CV::m(CV::t) {}
+ATTRIBUTE_USED void CV::m(CV::t) const {}
+ATTRIBUTE_USED void CV::m(CV::t) volatile {}
+ATTRIBUTE_USED void CV::m(CV::t) const volatile {}
+int CV_f (int x)
+{
+  return x + 1;
+}
+
 int
 test_function (int argc, char* argv[]) // test_function
 { // test_function
   derived d;
   void (derived::*pfunc) (void) const = &derived::a_function;
   (d.*pfunc) ();
 
   base a (1), b (3), c (8);
   (void) a.overload ();
   (void) a.overload (static_cast<int> (0));
@@ skipping 100 matching lines @@
   policyd5 pd5 (int_tclass);
   pd5.function ();
 
   base1 b1 (3);
 
   r = a;
   char* str = a;
   fluff* flp = a;
   fluff** flpp = a;
 
+  CV_f(CV::i);
+
   return 0;
 }
 
 int
 main (int argc, char* argv[])
 {
   int i;
 
   /* Call the test function repeatedly, enough times for all our tests
      without running forever if something goes wrong.  */
   for (i = 0; i < 1000; i++)
     test_function (argc, argv);
 
   return 0;
 }