Add testcase for PR/24065.

[deliverable/binutils-gdb.git] / gdb / m2-typeprint.c

diff --git a/gdb/m2-typeprint.c b/gdb/m2-typeprint.c
index 45bc09312193ec604a028c39397ef93c8543bb2f..754fb657afda6a4ebb7fd5657c3cfa8eb58d87ef 100644 (file)
--- a/gdb/m2-typeprint.c
+++ b/gdb/m2-typeprint.c
@@ -1,5 +1,5 @@
 /* Support for printing Modula 2 types for GDB, the GNU debugger.
-   Copyright (C) 1986-2014 Free Software Foundation, Inc.
+   Copyright (C) 1986-2019 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -31,7 +31,6 @@
 #include "c-lang.h"
 #include "typeprint.h"
 #include "cp-abi.h"
-#include <errno.h>
 
 static void m2_print_bounds (struct type *type,
                             struct ui_file *stream, int show, int level,
@@ -75,7 +74,7 @@ m2_print_type (struct type *type, const char *varstring,
               int show, int level,
               const struct type_print_options *flags)
 {
-  CHECK_TYPEDEF (type);
+  type = check_typedef (type);
 
   QUIT;
 
@@ -161,7 +160,7 @@ void
 m2_print_typedef (struct type *type, struct symbol *new_symbol,
                  struct ui_file *stream)
 {
-  CHECK_TYPEDEF (type);
+  type = check_typedef (type);
   fprintf_filtered (stream, "TYPE ");
   if (!TYPE_NAME (SYMBOL_TYPE (new_symbol))
       || strcmp (TYPE_NAME ((SYMBOL_TYPE (new_symbol))),
@@ -189,8 +188,12 @@ m2_range (struct type *type, struct ui_file *stream, int show,
          int level, const struct type_print_options *flags)
 {
   if (TYPE_HIGH_BOUND (type) == TYPE_LOW_BOUND (type))
-    m2_print_type (TYPE_DOMAIN_TYPE (type), "", stream, show, level,
-                  flags);
+    {
+      /* FIXME: TYPE_TARGET_TYPE used to be TYPE_DOMAIN_TYPE but that was
+        wrong.  Not sure if TYPE_TARGET_TYPE is correct though.  */
+      m2_print_type (TYPE_TARGET_TYPE (type), "", stream, show, level,
+                    flags);
+    }
   else
     {
       struct type *target = TYPE_TARGET_TYPE (type);
@@ -277,7 +280,8 @@ m2_procedure (struct type *type, struct ui_file *stream,
 {
   fprintf_filtered (stream, "PROCEDURE ");
   m2_type_name (type, stream);
-  if (TYPE_CODE (TYPE_TARGET_TYPE (type)) != TYPE_CODE_VOID)
+  if (TYPE_TARGET_TYPE (type) == NULL
+      || TYPE_CODE (TYPE_TARGET_TYPE (type)) != TYPE_CODE_VOID)
     {
       int i, len = TYPE_NFIELDS (type);
 
@@ -291,11 +295,11 @@ m2_procedure (struct type *type, struct ui_file *stream,
            }
          m2_print_type (TYPE_FIELD_TYPE (type, i), "", stream, -1, 0, flags);
        }
+      fprintf_filtered (stream, ") : ");
       if (TYPE_TARGET_TYPE (type) != NULL)
-       {
-         fprintf_filtered (stream, " : ");
-         m2_print_type (TYPE_TARGET_TYPE (type), "", stream, 0, 0, flags);
-       }
+       m2_print_type (TYPE_TARGET_TYPE (type), "", stream, 0, 0, flags);
+      else
+       type_print_unknown_return_type (stream);
     }
 }
 
@@ -370,7 +374,7 @@ m2_is_long_set (struct type *type)
 static int
 m2_get_discrete_bounds (struct type *type, LONGEST *lowp, LONGEST *highp)
 {
-  CHECK_TYPEDEF (type);
+  type = check_typedef (type);
   switch (TYPE_CODE (type))
     {
     case TYPE_CODE_CHAR:
@@ -435,22 +439,14 @@ m2_long_set (struct type *type, struct ui_file *stream, int show, int level,
 
   if (m2_is_long_set (type))
     {
-      if (TYPE_TAG_NAME (type) != NULL)
-       {
-         fputs_filtered (TYPE_TAG_NAME (type), stream);
-         if (show == 0)
-           return 1;
-       }
-      else if (TYPE_NAME (type) != NULL)
+      if (TYPE_NAME (type) != NULL)
        {
          fputs_filtered (TYPE_NAME (type), stream);
          if (show == 0)
            return 1;
+         fputs_filtered (" = ", stream);
        }
 
-      if (TYPE_TAG_NAME (type) != NULL || TYPE_NAME (type) != NULL)
-       fputs_filtered (" = ", stream);
-
       if (get_long_set_bounds (type, &low, &high))
        {
          fprintf_filtered(stream, "SET OF ");
@@ -533,11 +529,11 @@ m2_record_fields (struct type *type, struct ui_file *stream, int show,
                  int level, const struct type_print_options *flags)
 {
   /* Print the tag if it exists.  */
-  if (TYPE_TAG_NAME (type) != NULL)
+  if (TYPE_NAME (type) != NULL)
     {
-      if (strncmp (TYPE_TAG_NAME (type), "$$", 2) != 0)
+      if (!startswith (TYPE_NAME (type), "$$"))
        {
-         fputs_filtered (TYPE_TAG_NAME (type), stream);
+         fputs_filtered (TYPE_NAME (type), stream);
          if (show > 0)
            fprintf_filtered (stream, " = ");
        }
@@ -597,10 +593,10 @@ m2_enum (struct type *type, struct ui_file *stream, int show, int level)
   if (show < 0)
     {
       /* If we just printed a tag name, no need to print anything else.  */
-      if (TYPE_TAG_NAME (type) == NULL)
+      if (TYPE_NAME (type) == NULL)
        fprintf_filtered (stream, "(...)");
     }
-  else if (show > 0 || TYPE_TAG_NAME (type) == NULL)
+  else if (show > 0 || TYPE_NAME (type) == NULL)
     {
       fprintf_filtered (stream, "(");
       len = TYPE_NFIELDS (type);