From patchwork Mon Sep 25 14:51:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Walfred Tedeschi X-Patchwork-Id: 23135 Received: (qmail 83117 invoked by alias); 25 Sep 2017 14:51:44 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 83107 invoked by uid 89); 25 Sep 2017 14:51:43 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-23.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=4.3.0, Beta X-HELO: mga14.intel.com Received: from mga14.intel.com (HELO mga14.intel.com) (192.55.52.115) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 25 Sep 2017 14:51:37 +0000 Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Sep 2017 07:51:35 -0700 X-ExtLoop1: 1 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by fmsmga005.fm.intel.com with ESMTP; 25 Sep 2017 07:51:34 -0700 Received: from ulvlx001.iul.intel.com (ulvlx001.iul.intel.com [172.28.207.17]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id v8PEpXfC030952; Mon, 25 Sep 2017 15:51:33 +0100 Received: from ulvlx001.iul.intel.com (localhost [127.0.0.1]) by ulvlx001.iul.intel.com with ESMTP id v8PEpXCv005788; Mon, 25 Sep 2017 16:51:33 +0200 Received: (from wtedesch@localhost) by ulvlx001.iul.intel.com with LOCAL id v8PEpXZh005784; Mon, 25 Sep 2017 16:51:33 +0200 From: Walfred Tedeschi To: palves@redhat.com, simon.marchi@polymtl.ca Cc: gdb-patches@sourceware.org, Walfred Tedeschi Subject: [PATCH V3] icc: allow code path for newer versions of icc. Date: Mon, 25 Sep 2017 16:51:32 +0200 Message-Id: <1506351092-5754-1-git-send-email-walfred.tedeschi@intel.com> X-IsSubscribed: yes Patch adds a version checkin for workaround an icc problem. Icc problem was fixed in version 14, and gdb code has to reflect the fix. This patch contains a parser for the icc string version and conditional workaround execution. Adds also gdb self tests for the dwarf producers. 2017-06-28 Walfred Tedeschi gdb/ChangeLog: * 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 dwarf2utils. (read_structure_type): Add a check for the later version of icc where the issue was still not fixed. (dwarf_producer_test): Add new unit test. (_initialize_dwarf2_read): Register the unit test. * producer.c (producer_is_icc, _initialize_producer): New function. * producer.h (producer_is_icc): New function. # Conflicts: # gdb/producer.c --- gdb/dwarf2read.c | 32 ++++++++------- gdb/producer.c | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ gdb/producer.h | 23 +++++++++++ 3 files changed, 161 insertions(+), 15 deletions(-) diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 4083c63..d226c67 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); } +/* For versions older than 14 ICC did not output the required DW_AT_declaration + on incomplete types, but gives them a size of zero. Starting on 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,7 +13713,7 @@ 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. */ diff --git a/gdb/producer.c b/gdb/producer.c index 5417e52..7d79c83 100644 --- a/gdb/producer.c +++ b/gdb/producer.c @@ -76,3 +76,124 @@ producer_is_gcc (const char *producer, int *major, int *minor) return 0; } + +/* See documentation in the producer.h file. */ + +bool +producer_is_icc (const char *producer, int *major, int *minor) +{ + if (producer == NULL || !startswith (producer, "Intel(R)")) + return 0; + +/* Preparing 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"); + 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 user know. */ + if (warning_printed == FALSE) + { + 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_parser () +{ + int major = 0, minor = 0; + + 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"; + + bool retval = producer_is_icc (extern_f_14_1, &major, &minor); + SELF_CHECK (retval == 1 && major == 14 && minor == 1); + retval = producer_is_gcc (extern_f_14_1, &major, &minor); + SELF_CHECK (retval == 0); + + const char *intern_f_14 = "Intel(R) Fortran Intel(R) 64 Compiler \ +XE for applications running on Intel(R) 64, Version \ +14.0"; + + major = 0; + minor = 0; + retval = producer_is_icc (intern_f_14, &major, &minor); + SELF_CHECK (retval == 1 && major == 14 && minor == 0); + retval = producer_is_gcc (intern_f_14, &major, &minor); + SELF_CHECK (retval == 0); + + const char *intern_c_14 = "Intel(R) C++ Intel(R) 64 Compiler \ +XE for applications running on Intel(R) 64, Version \ +14.0"; + major = 0; + minor = 0; + retval = producer_is_icc (intern_c_14, &major, &minor); + SELF_CHECK (retval == 1 && major == 14 && minor == 0); + retval = producer_is_gcc (intern_c_14, &major, &minor); + SELF_CHECK (retval == 0); + + const char *intern_c_18 = "Intel(R) C++ Intel(R) 64 Compiler \ +for applications running on Intel(R) 64, Version 18.0 Beta"; + major = 0; + minor = 0; + retval = producer_is_icc (intern_c_18, &major, &minor); + SELF_CHECK (retval == 1 && major == 18 && minor == 0); + + const char *gnu = "GNU C 4.7.2"; + major = 0; + minor = 0; + retval = producer_is_icc (gnu, &major, &minor); + SELF_CHECK (retval == 0); + retval = producer_is_gcc (gnu, &major, &minor); + SELF_CHECK (retval == 1 && major == 4 && minor == 7); + + const char *gnu_exp ="GNU C++14 5.0.0 20150123 (experimental)"; + major = 0; + minor = 0; + retval = producer_is_icc (gnu_exp, &major, &minor); + SELF_CHECK (retval == 0); + retval = producer_is_gcc (gnu_exp, &major, &minor); + SELF_CHECK (retval == 1 && major == 5 && minor == 0); +} +} +} +#endif + +void +_initialize_dwarf2utils () +{ +#if defined GDB_SELF_TEST + selftests::register_test ("producer-parser", selftests::producer::producer_parser); +#endif +} diff --git a/gdb/producer.h b/gdb/producer.h index cd27d8f..06c8058 100644 --- a/gdb/producer.h +++ b/gdb/producer.h @@ -31,4 +31,27 @@ 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 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