[PUSHED v4 2/2] dwarf2read: Restrict ICC workaround to ICC<14

[PUSHED v4 2/2] dwarf2read: Restrict ICC workaround to ICC<14

[Pedro Alves]

From: Walfred Tedeschi <walfred.tedeschi@intel.com>

GDB has a workaround for DWARF output by ICC, related to missing
DW_AT_declaration on incomplete types.  The bug was fixed in ICC 14,
so this commit adjusts GDB accordingly.

For the version check, this adds a new parser function for the ICC
producer string.  While at it, it also adds unit tests for the
producer parsing covering the new function and preexisting parsers.

gdb/ChangeLog:
2017-09-26  Walfred Tedeschi  <walfred.tedeschi@intel.com>
	    Pedro Alves <palves@redhat.com>

	* dwarf2read.c (dwarf2_cu): Remove field producer_is_icc and add
	producer_is_icc_lt_14.
	(producer_is_icc_lt_14): New function.
	(check_producer): Add code for checking version of ICC.
	(producer_is_icc): Move to producer.c.
	(read_structure_type): Restrict ICC workaround to ICC<14.
	* producer.c: Include selftest.h.
	(producer_is_icc, producer_parsing_tests, _initialize_producer):
	New functions.
	* producer.h (producer_is_icc): New declaration.
---
 gdb/ChangeLog    |  14 ++++++
 gdb/dwarf2read.c |  36 +++++++-------
 gdb/producer.c   | 145 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 gdb/producer.h   |  22 +++++++++
 4 files changed, 200 insertions(+), 17 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7f295e6..efe90f0 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,4 +1,18 @@
 2017-09-26  Walfred Tedeschi  <walfred.tedeschi@intel.com>
+	    Pedro Alves <palves@redhat.com>
+
+	* dwarf2read.c (dwarf2_cu): Remove field producer_is_icc and add
+	producer_is_icc_lt_14.
+	(producer_is_icc_lt_14): New function.
+	(check_producer): Add code for checking version of ICC.
+	(producer_is_icc): Move to producer.c.
+	(read_structure_type): Restrict ICC workaround to ICC<14.
+	* producer.c: Include selftest.h.
+	(producer_is_icc, producer_parsing_tests, _initialize_producer):
+	New functions.
+	* producer.h (producer_is_icc): New declaration.
+
+2017-09-26  Walfred Tedeschi  <walfred.tedeschi@intel.com>
 
 	* Makefile.in (SFILES): Add producer.c.
 	(COMMON_OBS): Add producer.o
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 4083c63..11f1c88 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -603,7 +603,7 @@ struct dwarf2_cu
   unsigned int checked_producer : 1;
   unsigned int producer_is_gxx_lt_4_6 : 1;
   unsigned int producer_is_gcc_lt_4_3 : 1;
-  unsigned int producer_is_icc : 1;
+  unsigned int producer_is_icc_lt_14 : 1;
 
   /* When set, the file that we're processing is known to have
      debugging info for C++ namespaces.  GCC 3.3.x did not produce
@@ -9348,6 +9348,19 @@ read_import_statement (struct die_info *die, struct dwarf2_cu *cu)
 		       &objfile->objfile_obstack);
 }
 
+/* ICC<14 does not output the required DW_AT_declaration on incomplete
+   types, but gives them a size of zero.  Starting with version 14,
+   ICC is compatible with GCC.  */
+
+static int
+producer_is_icc_lt_14 (struct dwarf2_cu *cu)
+{
+  if (!cu->checked_producer)
+    check_producer (cu);
+
+  return cu->producer_is_icc_lt_14;
+}
+
 /* Check for possibly missing DW_AT_comp_dir with relative .debug_line
    directory paths.  GCC SVN r127613 (new option -fdebug-prefix-map) fixed
    this, it was first present in GCC release 4.3.0.  */
@@ -12853,8 +12866,8 @@ check_producer (struct dwarf2_cu *cu)
       cu->producer_is_gxx_lt_4_6 = major < 4 || (major == 4 && minor < 6);
       cu->producer_is_gcc_lt_4_3 = major < 4 || (major == 4 && minor < 3);
     }
-  else if (startswith (cu->producer, "Intel(R) C"))
-    cu->producer_is_icc = 1;
+  else if (producer_is_icc (cu->producer, &major, &minor))
+    cu->producer_is_icc_lt_14 = major < 14;
   else
     {
       /* For other non-GCC compilers, expect their behavior is DWARF version
@@ -13595,17 +13608,6 @@ quirk_gcc_member_function_pointer (struct type *type, struct objfile *objfile)
   smash_to_methodptr_type (type, new_type);
 }
 
-/* Return non-zero if the CU's PRODUCER string matches the Intel C/C++ compiler
-   (icc).  */
-
-static int
-producer_is_icc (struct dwarf2_cu *cu)
-{
-  if (!cu->checked_producer)
-    check_producer (cu);
-
-  return cu->producer_is_icc;
-}
 
 /* Called when we find the DIE that starts a structure or union scope
    (definition) to create a type for the structure or union.  Fill in
@@ -13711,10 +13713,10 @@ read_structure_type (struct die_info *die, struct dwarf2_cu *cu)
       TYPE_LENGTH (type) = 0;
     }
 
-  if (producer_is_icc (cu) && (TYPE_LENGTH (type) == 0))
+  if (producer_is_icc_lt_14 (cu) && (TYPE_LENGTH (type) == 0))
     {
-      /* ICC does not output the required DW_AT_declaration
-	 on incomplete types, but gives them a size of zero.  */
+      /* ICC<14 does not output the required DW_AT_declaration on
+	 incomplete types, but gives them a size of zero.  */
       TYPE_STUB (type) = 1;
     }
   else
diff --git a/gdb/producer.c b/gdb/producer.c
index 3f9297a..82696ef 100644
--- a/gdb/producer.c
+++ b/gdb/producer.c
@@ -19,6 +19,7 @@
 
 #include "defs.h"
 #include "producer.h"
+#include "selftest.h"
 
 /* See producer.h.  */
 
@@ -71,3 +72,147 @@ producer_is_gcc (const char *producer, int *major, int *minor)
   return 0;
 }
 
+
+/* See producer.h.  */
+
+bool
+producer_is_icc (const char *producer, int *major, int *minor)
+{
+  if (producer == NULL || !startswith (producer, "Intel(R)"))
+    return false;
+
+  /* Prepare the used fields.  */
+  int maj, min;
+  if (major == NULL)
+    major = &maj;
+  if (minor == NULL)
+    minor = &min;
+
+  *minor = 0;
+  *major = 0;
+
+  /* Consumes the string till a "Version" is found.  */
+  const char *cs = strstr (producer, "Version");
+  if (cs != NULL)
+    {
+      cs = skip_to_space (cs);
+
+      int intermediate = 0;
+      int nof = sscanf (cs, "%d.%d.%d.%*d", major, &intermediate, minor);
+
+      /* Internal versions are represented only as MAJOR.MINOR, where
+	 minor is usually 0.
+	 Public versions have 3 fields as described with the command
+	 above.  */
+      if (nof == 3)
+	return true;
+
+      if (nof == 2)
+	{
+	  *minor = intermediate;
+	  return true;
+	}
+    }
+
+  static bool warning_printed = false;
+  /* Not recognized as Intel, let the user know.  */
+  if (!warning_printed)
+    {
+      warning (_("Could not recognize version of Intel Compiler in: \"%s\""),
+	       producer);
+      warning_printed = true;
+    }
+  return false;
+}
+
+#if defined GDB_SELF_TEST
+namespace selftests {
+namespace producer {
+
+static void
+producer_parsing_tests ()
+{
+  {
+    /* Check that we don't crash if "Version" is not found in what
+       looks like an ICC producer string.  */
+    static const char icc_no_version[] = "Intel(R) foo bar";
+
+    int major = 0, minor = 0;
+    SELF_CHECK (!producer_is_icc (icc_no_version, &major, &minor));
+    SELF_CHECK (!producer_is_gcc (icc_no_version, &major, &minor));
+  }
+
+  {
+    static const char extern_f_14_1[] = "\
+Intel(R) Fortran Intel(R) 64 Compiler XE for applications running on \
+Intel(R) 64, \
+Version 14.0.1.074 Build 20130716";
+
+    int major = 0, minor = 0;
+    SELF_CHECK (producer_is_icc (extern_f_14_1, &major, &minor)
+		&& major == 14 && minor == 1);
+    SELF_CHECK (!producer_is_gcc (extern_f_14_1, &major, &minor));
+  }
+
+  {
+    static const char intern_f_14[] = "\
+Intel(R) Fortran Intel(R) 64 Compiler XE for applications running on \
+Intel(R) 64, \
+Version 14.0";
+
+    int major = 0, minor = 0;
+    SELF_CHECK (producer_is_icc (intern_f_14, &major, &minor)
+		&& major == 14 && minor == 0);
+    SELF_CHECK (!producer_is_gcc (intern_f_14, &major, &minor));
+  }
+
+  {
+    static const char intern_c_14[] = "\
+Intel(R) C++ Intel(R) 64 Compiler XE for applications running on \
+Intel(R) 64, \
+Version 14.0";
+    int major = 0, minor = 0;
+    SELF_CHECK (producer_is_icc (intern_c_14, &major, &minor)
+		&& major == 14 && minor == 0);
+    SELF_CHECK (!producer_is_gcc (intern_c_14, &major, &minor));
+  }
+
+  {
+    static const char intern_c_18[] = "\
+Intel(R) C++ Intel(R) 64 Compiler for applications running on \
+Intel(R) 64, \
+Version 18.0 Beta";
+    int major = 0, minor = 0;
+    SELF_CHECK (producer_is_icc (intern_c_18, &major, &minor)
+		&& major == 18 && minor == 0);
+  }
+
+  {
+    static const char gnu[] = "GNU C 4.7.2";
+    SELF_CHECK (!producer_is_icc (gnu, NULL, NULL));
+
+    int major = 0, minor = 0;
+    SELF_CHECK (producer_is_gcc (gnu, &major, &minor)
+		&& major == 4 && minor == 7);
+  }
+
+  {
+    static const char gnu_exp[] = "GNU C++14 5.0.0 20150123 (experimental)";
+    int major = 0, minor = 0;
+    SELF_CHECK (!producer_is_icc (gnu_exp, NULL, NULL));
+    SELF_CHECK (producer_is_gcc (gnu_exp, &major, &minor)
+		&& major == 5 && minor == 0);
+  }
+}
+}
+}
+#endif
+
+void
+_initialize_producer ()
+{
+#if defined GDB_SELF_TEST
+  selftests::register_test
+    ("producer-parser", selftests::producer::producer_parsing_tests);
+#endif
+}
diff --git a/gdb/producer.h b/gdb/producer.h
index 143d4e1..3aac59d 100644
--- a/gdb/producer.h
+++ b/gdb/producer.h
@@ -30,4 +30,26 @@ extern int producer_is_gcc_ge_4 (const char *producer);
    is NULL or it isn't GCC.  */
 extern int producer_is_gcc (const char *producer, int *major, int *minor);
 
+/* Returns true if the given PRODUCER string is Intel or false
+   otherwise.  Sets the MAJOR and MINOR versions when not NULL.
+
+   Internal and external ICC versions have to be taken into account.
+   PRODUCER strings for internal releases are slightly different than
+   for public ones.  Internal releases have a major release number and
+   0 as minor release.  External releases have 4 fields, 3 of them are
+   not 0 and only two are of interest, major and update.
+
+   Examples are:
+
+     Public release:
+       "Intel(R) Fortran Intel(R) 64 Compiler XE for applications
+        running on Intel(R) 64, Version 14.0.1.074 Build 20130716";
+        "Intel(R) C++ Intel(R) 64 Compiler XE for applications
+        running on Intel(R) 64, Version 14.0.1.074 Build 20130716";
+
+    Internal releases:
+      "Intel(R) C++ Intel(R) 64 Compiler for applications
+       running on Intel(R) 64, Version 18.0 Beta ....".  */
+extern bool producer_is_icc (const char *producer, int *major, int *minor);
+
 #endif
-- 
2.5.5

[PUSHED v4 1/2] Move GDB producer parsing routines to a separate file

[Pedro Alves]

From: Walfred Tedeschi <walfred.tedeschi@intel.com>

gdb/ChangeLog:
2017-09-26  Walfred Tedeschi  <walfred.tedeschi@intel.com>

	* Makefile.in (SFILES): Add producer.c.
	(COMMON_OBS): Add producer.o
	* amd64-tdep.c (producer.h): Add new include.
	* dwarf2read.c (producer.h): Add new include.
	* producer.c: New file.
	* producer.h: New file.
	* utils.c (producer_is_gcc, producer_is_gcc_ge_4): Move to
	producer.c.
	* utils.h (producer_is_gcc, producer_is_gcc_ge_4): Move to
	producer.h.
---
 gdb/ChangeLog    | 13 ++++++++++
 gdb/Makefile.in  |  2 ++
 gdb/amd64-tdep.c |  1 +
 gdb/dwarf2read.c |  1 +
 gdb/producer.c   | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 gdb/producer.h   | 33 +++++++++++++++++++++++++
 gdb/utils.c      | 54 -----------------------------------------
 gdb/utils.h      |  3 ---
 8 files changed, 123 insertions(+), 57 deletions(-)
 create mode 100644 gdb/producer.c
 create mode 100644 gdb/producer.h

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 68f4817..7f295e6 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,16 @@
+2017-09-26  Walfred Tedeschi  <walfred.tedeschi@intel.com>
+
+	* Makefile.in (SFILES): Add producer.c.
+	(COMMON_OBS): Add producer.o
+	* amd64-tdep.c (producer.h): Add new include.
+	* dwarf2read.c (producer.h): Add new include.
+	* producer.c: New file.
+	* producer.h: New file.
+	* utils.c (producer_is_gcc, producer_is_gcc_ge_4): Move to
+	producer.c.
+	* utils.h (producer_is_gcc, producer_is_gcc_ge_4): Move to
+	producer.h.
+
 2017-09-26  Matthias Klose  <doko@ubuntu.com>
 
 	* configure.ac: Search ncursesw before ncurses.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 5740d43..9004b35 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1170,6 +1170,7 @@ SFILES = \
 	parse.c \
 	printcmd.c \
 	probe.c \
+	producer.c \
 	proc-service.list \
 	progspace.c \
 	progspace-and-thread.c \
@@ -1792,6 +1793,7 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \
 	print-utils.o \
 	printcmd.o \
 	probe.o \
+	producer.o \
 	progspace.o \
 	progspace-and-thread.o \
 	prologue-value.o \
diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c
index f1e2078..e56c388 100644
--- a/gdb/amd64-tdep.c
+++ b/gdb/amd64-tdep.c
@@ -43,6 +43,7 @@
 #include <algorithm>
 #include "target-descriptions.h"
 #include "arch/amd64.h"
+#include "producer.h"
 #include "ax.h"
 #include "ax-gdb.h"
 
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index b1914cf..4083c63 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -75,6 +75,7 @@
 #include "common/underlying.h"
 #include "common/byte-vector.h"
 #include "filename-seen-cache.h"
+#include "producer.h"
 #include <fcntl.h>
 #include <sys/types.h>
 #include <algorithm>
diff --git a/gdb/producer.c b/gdb/producer.c
new file mode 100644
index 0000000..3f9297a
--- /dev/null
+++ b/gdb/producer.c
@@ -0,0 +1,73 @@
+/* Producer string parsers for GDB.
+
+   Copyright (C) 2012-2017 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.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "defs.h"
+#include "producer.h"
+
+/* See producer.h.  */
+
+int
+producer_is_gcc_ge_4 (const char *producer)
+{
+  int major, minor;
+
+  if (! producer_is_gcc (producer, &major, &minor))
+    return -1;
+  if (major < 4)
+    return -1;
+  if (major > 4)
+    return INT_MAX;
+  return minor;
+}
+
+/* See producer.h.  */
+
+int
+producer_is_gcc (const char *producer, int *major, int *minor)
+{
+  const char *cs;
+
+  if (producer != NULL && startswith (producer, "GNU "))
+    {
+      int maj, min;
+
+      if (major == NULL)
+	major = &maj;
+      if (minor == NULL)
+	minor = &min;
+
+      /* Skip any identifier after "GNU " - such as "C11" "C++" or "Java".
+	 A full producer string might look like:
+	 "GNU C 4.7.2"
+	 "GNU Fortran 4.8.2 20140120 (Red Hat 4.8.2-16) -mtune=generic ..."
+	 "GNU C++14 5.0.0 20150123 (experimental)"
+      */
+      cs = &producer[strlen ("GNU ")];
+      while (*cs && !isspace (*cs))
+        cs++;
+      if (*cs && isspace (*cs))
+        cs++;
+      if (sscanf (cs, "%d.%d", major, minor) == 2)
+	return 1;
+    }
+
+  /* Not recognized as GCC.  */
+  return 0;
+}
+
diff --git a/gdb/producer.h b/gdb/producer.h
new file mode 100644
index 0000000..143d4e1
--- /dev/null
+++ b/gdb/producer.h
@@ -0,0 +1,33 @@
+/* Producer string parsers for GDB.
+
+   Copyright (C) 2012-2017 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.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef PRODUCER_H
+#define PRODUCER_H
+
+/* Check for GCC >= 4.x according to the symtab->producer string.  Return minor
+   version (x) of 4.x in such case.  If it is not GCC or it is GCC older than
+   4.x return -1.  If it is GCC 5.x or higher return INT_MAX.  */
+extern int producer_is_gcc_ge_4 (const char *producer);
+
+/* Returns nonzero if the given PRODUCER string is GCC and sets the MAJOR
+   and MINOR versions when not NULL.  Returns zero if the given PRODUCER
+   is NULL or it isn't GCC.  */
+extern int producer_is_gcc (const char *producer, int *major, int *minor);
+
+#endif
diff --git a/gdb/utils.c b/gdb/utils.c
index 41ad35f..24294be 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -2947,60 +2947,6 @@ make_bpstat_clear_actions_cleanup (void)
   return make_cleanup (do_bpstat_clear_actions_cleanup, NULL);
 }
 
-/* Check for GCC >= 4.x according to the symtab->producer string.  Return minor
-   version (x) of 4.x in such case.  If it is not GCC or it is GCC older than
-   4.x return -1.  If it is GCC 5.x or higher return INT_MAX.  */
-
-int
-producer_is_gcc_ge_4 (const char *producer)
-{
-  int major, minor;
-
-  if (! producer_is_gcc (producer, &major, &minor))
-    return -1;
-  if (major < 4)
-    return -1;
-  if (major > 4)
-    return INT_MAX;
-  return minor;
-}
-
-/* Returns nonzero if the given PRODUCER string is GCC and sets the MAJOR
-   and MINOR versions when not NULL.  Returns zero if the given PRODUCER
-   is NULL or it isn't GCC.  */
-
-int
-producer_is_gcc (const char *producer, int *major, int *minor)
-{
-  const char *cs;
-
-  if (producer != NULL && startswith (producer, "GNU "))
-    {
-      int maj, min;
-
-      if (major == NULL)
-	major = &maj;
-      if (minor == NULL)
-	minor = &min;
-
-      /* Skip any identifier after "GNU " - such as "C11" or "C++".
-	 A full producer string might look like:
-	 "GNU C 4.7.2"
-	 "GNU Fortran 4.8.2 20140120 (Red Hat 4.8.2-16) -mtune=generic ..."
-	 "GNU C++14 5.0.0 20150123 (experimental)"
-      */
-      cs = &producer[strlen ("GNU ")];
-      while (*cs && !isspace (*cs))
-        cs++;
-      if (*cs && isspace (*cs))
-        cs++;
-      if (sscanf (cs, "%d.%d", major, minor) == 2)
-	return 1;
-    }
-
-  /* Not recognized as GCC.  */
-  return 0;
-}
 
 /* Helper for make_cleanup_free_char_ptr_vec.  */
 
diff --git a/gdb/utils.h b/gdb/utils.h
index 6d33e8d..7b45cc8 100644
--- a/gdb/utils.h
+++ b/gdb/utils.h
@@ -442,9 +442,6 @@ void dummy_obstack_deallocate (void *object, void *data);
 extern pid_t wait_to_die_with_timeout (pid_t pid, int *status, int timeout);
 #endif
 
-extern int producer_is_gcc_ge_4 (const char *producer);
-extern int producer_is_gcc (const char *producer, int *major, int *minor);
-
 extern int myread (int, char *, int);
 
 /* Ensure that V is aligned to an N byte boundary (B's assumed to be a
-- 
2.5.5