From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io1-xd2d.google.com (mail-io1-xd2d.google.com [IPv6:2607:f8b0:4864:20::d2d]) by sourceware.org (Postfix) with ESMTPS id 7CECD3857C42 for ; Wed, 28 Sep 2022 17:03:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7CECD3857C42 Received: by mail-io1-xd2d.google.com with SMTP id r134so10646568iod.8 for ; Wed, 28 Sep 2022 10:03:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=N1GrkWAoXZsp5FDwOZRgNJBdkb64YhWPti5/DpBUzLg=; b=y/00znzLmSnhza33KL8El/cWeu0vbb5nHJKWsJSX6gMJ5IZlFQhPdcCyoy47CDSR5t Oqw4s6IwljJ4PwWYzgLumt9igqSB64XSQ7Jzdw0vv/xjAIfhy7B+l7VAjzW60KxvotO2 gPFNwwC2xqaoWrnm0LSDZljoIAom9rSYbZRWVvxXLy7iJacl7pi/J0x4zl9pMuj/9vxC /y4G+kbtRWWzNwkHlrN/ygWZcvc691M2jPvIHR+WHsBMUmIgKkAr7VGMyiOp4PhAELID i2enweD09C+sJxMgXY2f9mSEEzAYoeHLjCAoNzCdH+SmRn15F3asz5ICPbFHyGULipxl N0nw== X-Gm-Message-State: ACrzQf0tHO0ZwGj63pejoQZp4U4vqmDYzoe5NZcp5JUdhcypluyc5YDz zeY5GZfiPcl+bArJ9PqcLNcOXRaAN+ioiw== X-Google-Smtp-Source: AMsMyM5eR/KuI00aDvmmbHC8oUCw/M//flDk3pRZsw3MWVLYX8HzQ4AmlQ9uQqkK+aVXGnlXte45gg== X-Received: by 2002:a02:c4d4:0:b0:35a:a076:bb5e with SMTP id h20-20020a02c4d4000000b0035aa076bb5emr18593242jaj.300.1664384611664; Wed, 28 Sep 2022 10:03:31 -0700 (PDT) Received: from localhost.localdomain (71-211-160-49.hlrn.qwest.net. [71.211.160.49]) by smtp.gmail.com with ESMTPSA id x18-20020a92dc52000000b002f91b533ef2sm5506ilq.15.2022.09.28.10.03.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Sep 2022 10:03:31 -0700 (PDT) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [pushed] Treat Character as a discrete type in Ada Date: Wed, 28 Sep 2022 11:03:19 -0600 Message-Id: <20220928170319.3798368-1-tromey@adacore.com> X-Mailer: git-send-email 2.34.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP 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-List-Received-Date: Wed, 28 Sep 2022 17:03:34 -0000 A user noticed that gdb would assert when printing a certain array with array-indexes enabled. This turned out to be caused by the array having an index type of Character, which is completely valid in Ada. This patch changes the Ada support to recognize Character as a discrete type, and adds some tests. Because this is Ada-specific and was also reviewed internally, I am checking it in. --- gdb/ada-lang.c | 5 ++- gdb/testsuite/gdb.ada/discrete-char.exp | 42 ++++++++++++++++++++ gdb/testsuite/gdb.ada/discrete-char/main.adb | 23 +++++++++++ 3 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 gdb/testsuite/gdb.ada/discrete-char.exp create mode 100644 gdb/testsuite/gdb.ada/discrete-char/main.adb diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index d539c50602c..ac23eb5938c 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -4149,7 +4149,9 @@ scalar_type_p (struct type *type) } } -/* True iff TYPE is discrete (INT, RANGE, ENUM). */ +/* True iff TYPE is discrete, as defined in the Ada Reference Manual. + This essentially means one of (INT, RANGE, ENUM) -- but note that + "enum" includes character and boolean as well. */ static int discrete_type_p (struct type *type) @@ -4164,6 +4166,7 @@ discrete_type_p (struct type *type) case TYPE_CODE_RANGE: case TYPE_CODE_ENUM: case TYPE_CODE_BOOL: + case TYPE_CODE_CHAR: return 1; default: return 0; diff --git a/gdb/testsuite/gdb.ada/discrete-char.exp b/gdb/testsuite/gdb.ada/discrete-char.exp new file mode 100644 index 00000000000..762b3def4b9 --- /dev/null +++ b/gdb/testsuite/gdb.ada/discrete-char.exp @@ -0,0 +1,42 @@ +# Copyright 2022 Free Software Foundation, Inc. +# +# 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 . + +# Tests that require character to be a discrete type. + +load_lib "ada.exp" + +if { [skip_ada_tests] } { return -1 } + +standard_ada_testfile main + +if {[gdb_compile_ada "${srcfile}" "${binfile}" executable {debug}] != ""} { + return -1 +} + +clean_restart ${testfile} + +set bp_location [gdb_get_line_number "STOP" ${testdir}/main.adb] +if {![runto "main.adb:$bp_location"]} then { + perror "Couldn't run ${testfile}" + return +} + +gdb_test_no_output "set print array-indexes on" +gdb_test "print array_value" \ + [string_to_regexp "= (65 'A' => true, 66 'B' => false , 90 'Z' => true)"] + +gdb_test "print character'val(65)" " = 65 'A'" +gdb_test "print character'pos('A')" " = 65" +gdb_test "print character'first" [string_to_regexp " = 0 '\[\"00\"\]'"] diff --git a/gdb/testsuite/gdb.ada/discrete-char/main.adb b/gdb/testsuite/gdb.ada/discrete-char/main.adb new file mode 100644 index 00000000000..4758c3c42d3 --- /dev/null +++ b/gdb/testsuite/gdb.ada/discrete-char/main.adb @@ -0,0 +1,23 @@ +-- Copyright 2022 Free Software Foundation, Inc. +-- +-- 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 . + +procedure Main is + type Letters is new Character range 'A' .. 'Z'; + type Array_Type is array (Letters) of Boolean; + + Array_Value : Array_Type := ('A' => true, 'Z' => true, others => false); +begin + null; -- STOP +end Main; -- 2.34.3