From patchwork Fri Jul 21 13:41:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 73047 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6C8CE3853D1C for ; Fri, 21 Jul 2023 13:42:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6C8CE3853D1C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1689946933; bh=/yJc0C3YgtkfitEcqfjnKgMaVOT3b2jNahJq1ApwTyQ=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=M6nuG7xz9tLd7B52RGyLCue8vM1WjsBh2vsgLeGRGC7mpyb7uFG7U8g4D3iXz9lSj tEW2uZiPhaOTae09ZzIjXwrYq2VNxqvn2HF4+5OUBj+DipVS/E2mYTE7ugtFlpIEsi 8CyLA4H43f5z6hlZOg2OWwqnuuPiEkEYAGqj0Amc= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd31.google.com (mail-io1-xd31.google.com [IPv6:2607:f8b0:4864:20::d31]) by sourceware.org (Postfix) with ESMTPS id E378D3858409 for ; Fri, 21 Jul 2023 13:41:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E378D3858409 Received: by mail-io1-xd31.google.com with SMTP id ca18e2360f4ac-785ccf19489so89188539f.3 for ; Fri, 21 Jul 2023 06:41:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689946908; x=1690551708; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=/yJc0C3YgtkfitEcqfjnKgMaVOT3b2jNahJq1ApwTyQ=; b=OUYAHXgzAx9TXmoK8HJHP99bQWyJ+gF4MukHq2pF0zQTu/AudxHtzHI9EszERK2Zf5 risWXrHPYYYjDgMFRCLQbP5qO3KJOfnBeFYdrhEu71VF1tEmmI3b7ahxLCxJduYTtrl0 7MP2gYx91llOHnT7c60MKNgIhOZ6sccbMYF8eXaZcs7QHhm8mn0L1RCcqGLVfGq+WnEH MO6C0D4wRUVl0F9pVcI26O4DtyAgyHlidXKCqbFAqDBSIdqI9ihkvWR99rZG2MTavHDw 2ImqIej/j3BtysYj+IEnc88+MxDcExJvlMyyJJ+FJIx2Y1Qsdd+agDlbjUKbJASr+HpF +ETA== X-Gm-Message-State: ABy/qLYI5pysEajlxGOPHu2Jf0ZowUbeje/6lFrind23sbfnEK1aFwZb PSfR/j9vyqVTNEaQny8J1IzTrG6dtXGrrsrXBXWeDA== X-Google-Smtp-Source: APBJJlGTvVm+rG9BhRLS+Z9RNJ/ZsAgRA6NMCqNG2q+44iTFIhVuRiEsPFYRIVzn574p20CZi7z+MA== X-Received: by 2002:a05:6602:25c1:b0:783:39e9:e05c with SMTP id d1-20020a05660225c100b0078339e9e05cmr1776980iop.19.1689946907776; Fri, 21 Jul 2023 06:41:47 -0700 (PDT) Received: from localhost.localdomain (75-166-135-140.hlrn.qwest.net. [75.166.135.140]) by smtp.gmail.com with ESMTPSA id o3-20020a02cc23000000b0042b6978ccc7sm1027725jap.94.2023.07.21.06.41.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jul 2023 06:41:37 -0700 (PDT) To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [pushed] Remove ancient Ada workaround Date: Fri, 21 Jul 2023 07:41:19 -0600 Message-Id: <20230721134119.973372-1-tromey@adacore.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Tom Tromey via Gdb-patches From: Tom Tromey Reply-To: Tom Tromey Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" I ran across this very old code in gdb's Ada support. After a bit of archaeology, we couldn't determine what bug this might have been working around. It is no longer needed, so this patch removes it. As this is entirely Ada-specific and was reviewed and tested at AdaCore, I'm checking it in. --- gdb/ada-lang.c | 17 ----------------- gdb/ada-lang.h | 2 -- gdb/ada-typeprint.c | 3 --- gdb/ada-valprint.c | 13 ------------- 4 files changed, 35 deletions(-) diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 795207589d0..caeea58a803 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -2066,23 +2066,6 @@ ada_is_array_descriptor_type (struct type *type) && desc_arity (desc_bounds_type (type)) > 0); } -/* Non-zero iff type is a partially mal-formed GNAT array - descriptor. FIXME: This is to compensate for some problems with - debugging output from GNAT. Re-examine periodically to see if it - is still needed. */ - -int -ada_is_bogus_array_descriptor (struct type *type) -{ - return - type != NULL - && type->code () == TYPE_CODE_STRUCT - && (lookup_struct_elt_type (type, "P_BOUNDS", 1) != NULL - || lookup_struct_elt_type (type, "P_ARRAY", 1) != NULL) - && !ada_is_array_descriptor_type (type); -} - - /* If ARR has a record type in the form of a standard GNAT array descriptor, (fat pointer) returns the type of the array data described---specifically, a pointer-to-array type. If BOUNDS is non-zero, the bounds data are filled diff --git a/gdb/ada-lang.h b/gdb/ada-lang.h index 08620d7ed7c..9eb9326a86c 100644 --- a/gdb/ada-lang.h +++ b/gdb/ada-lang.h @@ -202,8 +202,6 @@ extern int ada_is_simple_array_type (struct type *); extern int ada_is_array_descriptor_type (struct type *); -extern int ada_is_bogus_array_descriptor (struct type *); - extern LONGEST ada_discrete_type_low_bound (struct type *); extern LONGEST ada_discrete_type_high_bound (struct type *); diff --git a/gdb/ada-typeprint.c b/gdb/ada-typeprint.c index 98faf315460..3d7f61ff25a 100644 --- a/gdb/ada-typeprint.c +++ b/gdb/ada-typeprint.c @@ -1065,9 +1065,6 @@ ada_print_type (struct type *type0, const char *varstring, case TYPE_CODE_STRUCT: if (ada_is_array_descriptor_type (type)) print_array_type (type, stream, show, level, flags); - else if (ada_is_bogus_array_descriptor (type)) - gdb_printf (stream, - _("array (?) of ? ()")); else print_record_type (type, stream, show, level, flags); break; diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c index 0d5916c715c..dacc72d9f1b 100644 --- a/gdb/ada-valprint.c +++ b/gdb/ada-valprint.c @@ -844,12 +844,6 @@ ada_val_print_struct_union (struct value *value, int recurse, const struct value_print_options *options) { - if (ada_is_bogus_array_descriptor (value->type ())) - { - gdb_printf (stream, "(...?)"); - return; - } - gdb_printf (stream, "("); if (print_field_values (value, value, stream, recurse, options, @@ -1089,13 +1083,6 @@ ada_value_print (struct value *val0, struct ui_file *stream, gdb_printf (stream, ") "); } } - else if (ada_is_bogus_array_descriptor (type)) - { - gdb_printf (stream, "("); - type_print (type, "", stream, -1); - gdb_printf (stream, ") (...?)"); - return; - } opts = *options; opts.deref_ref = true;