Merge GDB 7.5.1

gdb/cp-abi.c

 /* Generic code for supporting multiple C++ ABI's
 
    Copyright (C) 2001-2003, 2005-2012 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    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 93 matching lines @@
     return NULL;
   return (*current_cp_abi.virtual_fn_field) (arg1p, f, j,
                                              type, offset);
 }
 
 struct type *
 value_rtti_type (struct value *v, int *full,
                  int *top, int *using_enc)
 {
   struct type *ret = NULL;
-  struct gdb_exception e;
+  volatile struct gdb_exception e;
 
   if ((current_cp_abi.rtti_type) == NULL)
     return NULL;
   TRY_CATCH (e, RETURN_MASK_ERROR)
     {
       ret = (*current_cp_abi.rtti_type) (v, full, top, using_enc);
     }
   if (e.reason < 0)
     return NULL;
   return ret;
@@ skipping 37 matching lines @@
 
 struct value *
 cplus_method_ptr_to_value (struct value **this_p,
                            struct value *method_ptr)
 {
   if (current_cp_abi.method_ptr_to_value == NULL)
     error (_("GDB does not support pointers to methods on this target"));
   return (*current_cp_abi.method_ptr_to_value) (this_p, method_ptr);
 }
 
+/* See cp-abi.h.  */
+
+void
+cplus_print_vtable (struct value *value)
+{
+  if (current_cp_abi.print_vtable == NULL)
+    error (_("GDB cannot print the vtable on this target"));
+  return (*current_cp_abi.print_vtable) (value);
+}
+
 int
 cp_pass_by_reference (struct type *type)
 {
   if ((current_cp_abi.pass_by_reference) == NULL)
     return 0;
   return (*current_cp_abi.pass_by_reference) (type);
 }
 
 /* Set the current C++ ABI to SHORT_NAME.  */
 
@@ skipping 147 matching lines @@
 
   add_cmd ("cp-abi", class_obscure, set_cp_abi_cmd, _("\
 Set the ABI used for inspecting C++ objects.\n\
 \"set cp-abi\" with no arguments will list the available ABIs."),
            &setlist);
 
   add_cmd ("cp-abi", class_obscure, show_cp_abi_cmd,
            _("Show the ABI used for inspecting C++ objects."),
            &showlist);
 }