From: Tom Tromey <tromey@redhat.com>
Date: Wed, 21 Nov 2012 18:07:17 +0000 (+0000)
Subject: 	* gdbtypes.h (struct cplus_struct_type) <localtype_ptr>: Remove
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cfcad218b1aac54ce8a17794031feba20910a403;p=binutils-gdb.git

	* gdbtypes.h (struct cplus_struct_type) <localtype_ptr>: Remove
	field.
	(TYPE_LOCALTYPE_PTR, TYPE_LOCALTYPE_FILE, TYPE_LOCALTYPE_LINE):
	Remove.
	* c-typeprint.c (c_type_print_base): Update.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7f0d3e2c949..f567d47f1fb 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2012-11-21  Tom Tromey  <tromey@redhat.com>
+
+	* gdbtypes.h (struct cplus_struct_type) <localtype_ptr>: Remove
+	field.
+	(TYPE_LOCALTYPE_PTR, TYPE_LOCALTYPE_FILE, TYPE_LOCALTYPE_LINE):
+	Remove.
+	* c-typeprint.c (c_type_print_base): Update.
+
 2012-11-21  Yao Qi  <yao@codesourcery.com>
 
 	PR tdep/7438
diff --git a/gdb/c-typeprint.c b/gdb/c-typeprint.c
index c6f8bb23c6b..161b3fe4b3a 100644
--- a/gdb/c-typeprint.c
+++ b/gdb/c-typeprint.c
@@ -1308,12 +1308,6 @@ c_type_print_base (struct type *type, struct ui_file *stream,
 	      }
 
 	    fprintfi_filtered (level, stream, "}");
-
-	    if (TYPE_LOCALTYPE_PTR (type) && show >= 0)
-	      fprintfi_filtered (level,
-				 stream, _(" (Local at %s:%d)\n"),
-				 TYPE_LOCALTYPE_FILE (type),
-				 TYPE_LOCALTYPE_LINE (type));
 	  }
 
 	do_cleanups (local_cleanups);
diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
index d5a7cf5f19a..b23df9ae42f 100644
--- a/gdb/gdbtypes.h
+++ b/gdb/gdbtypes.h
@@ -853,15 +853,6 @@ struct cplus_struct_type
       }
      *fn_fieldlists;
 
-    /* Pointer to information about enclosing scope, if this is a
-       local type.  If it is not a local type, this is NULL. */
-    struct local_type_info
-      {
-	char *file;
-	int line;
-      }
-     *localtype_ptr;
-
     /* typedefs defined inside this class.  TYPEDEF_FIELD points to an array of
        TYPEDEF_FIELD_COUNT elements.  */
     struct typedef_field
@@ -1226,10 +1217,6 @@ extern void allocate_gnat_aux_type (struct type *);
 #define TYPE_FN_FIELD_VIRTUAL_P(thisfn, n) ((thisfn)[n].voffset > 1)
 #define TYPE_FN_FIELD_STATIC_P(thisfn, n) ((thisfn)[n].voffset == VOFFSET_STATIC)
 
-#define TYPE_LOCALTYPE_PTR(thistype) (TYPE_CPLUS_SPECIFIC(thistype)->localtype_ptr)
-#define TYPE_LOCALTYPE_FILE(thistype) (TYPE_CPLUS_SPECIFIC(thistype)->localtype_ptr->file)
-#define TYPE_LOCALTYPE_LINE(thistype) (TYPE_CPLUS_SPECIFIC(thistype)->localtype_ptr->line)
-
 #define TYPE_TYPEDEF_FIELD_ARRAY(thistype) \
   TYPE_CPLUS_SPECIFIC (thistype)->typedef_field
 #define TYPE_TYPEDEF_FIELD(thistype, n) \