From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from barracuda.ebox.ca (barracuda.ebox.ca [96.127.255.19]) by sourceware.org (Postfix) with ESMTPS id DFAF03857030 for ; Mon, 6 Jul 2020 13:38:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org DFAF03857030 X-ASG-Debug-ID: 1594042723-0c856e4374aa4f0001-fS2M51 Received: from smtp.ebox.ca (smtp.ebox.ca [96.127.255.82]) by barracuda.ebox.ca with ESMTP id clRdZkiThrj7hozP (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 06 Jul 2020 09:38:43 -0400 (EDT) X-Barracuda-Envelope-From: simon.marchi@polymtl.ca X-Barracuda-RBL-Trusted-Forwarder: 96.127.255.82 Received: from simark.localdomain (173-246-6-90.qc.cable.ebox.net [173.246.6.90]) by smtp.ebox.ca (Postfix) with ESMTP id 10F98441D64; Mon, 6 Jul 2020 09:38:43 -0400 (EDT) From: Simon Marchi X-Barracuda-Effective-Source-IP: 173-246-6-90.qc.cable.ebox.net[173.246.6.90] X-Barracuda-Apparent-Source-IP: 173.246.6.90 X-Barracuda-RBL-IP: 173.246.6.90 To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 07/12] gdb: remove TYPE_LOW_BOUND_KIND and TYPE_HIGH_BOUND_KIND Date: Mon, 6 Jul 2020 09:38:28 -0400 X-ASG-Orig-Subj: [PATCH 07/12] gdb: remove TYPE_LOW_BOUND_KIND and TYPE_HIGH_BOUND_KIND Message-Id: <20200706133833.145408-8-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200706133833.145408-1-simon.marchi@polymtl.ca> References: <20200706133833.145408-1-simon.marchi@polymtl.ca> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Barracuda-Connect: smtp.ebox.ca[96.127.255.82] X-Barracuda-Start-Time: 1594042723 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://96.127.255.19:443/cgi-mod/mark.cgi X-Barracuda-Scan-Msg-Size: 5508 X-Virus-Scanned: by bsmtpd at ebox.ca X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=8.0 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.83013 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- X-Spam-Status: No, score=-14.5 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_QUARANTINE, KAM_DMARC_STATUS, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_SOFTFAIL, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: Mon, 06 Jul 2020 13:38:45 -0000 From: Simon Marchi Remove the macros, use the getters of `struct dynamic_prop` instead. gdb/ChangeLog: * gdbtypes.h (TYPE_LOW_BOUND_KIND, TYPE_HIGH_BOUND_KIND): Remove. Update all callers to use dynamic_prop::kind. Change-Id: Icb1fc761f675bfac934209f8102392504d905c44 --- gdb/c-typeprint.c | 4 ++-- gdb/compile/compile-c-symbols.c | 4 ++-- gdb/compile/compile-c-types.c | 6 +++--- gdb/compile/compile-cplus-types.c | 6 +++--- gdb/gdbtypes.h | 4 ---- gdb/rust-lang.c | 4 ++-- 6 files changed, 12 insertions(+), 16 deletions(-) diff --git a/gdb/c-typeprint.c b/gdb/c-typeprint.c index e10a4858a03c..9e408e15a1e2 100644 --- a/gdb/c-typeprint.c +++ b/gdb/c-typeprint.c @@ -780,8 +780,8 @@ c_type_print_varspec_suffix (struct type *type, fprintf_filtered (stream, (is_vector ? " __attribute__ ((vector_size(" : "[")); /* Bounds are not yet resolved, print a bounds placeholder instead. */ - if (TYPE_HIGH_BOUND_KIND (type->index_type ()) == PROP_LOCEXPR - || TYPE_HIGH_BOUND_KIND (type->index_type ()) == PROP_LOCLIST) + if (type->index_type ()->bounds ()->high.kind () == PROP_LOCEXPR + || type->index_type ()->bounds ()->high.kind () == PROP_LOCLIST) fprintf_filtered (stream, "variable length"); else if (get_array_bounds (type, &low_bound, &high_bound)) fprintf_filtered (stream, "%s", diff --git a/gdb/compile/compile-c-symbols.c b/gdb/compile/compile-c-symbols.c index be2ca35dead9..f4e0783d4b89 100644 --- a/gdb/compile/compile-c-symbols.c +++ b/gdb/compile/compile-c-symbols.c @@ -501,8 +501,8 @@ generate_vla_size (compile_instance *compiler, { case TYPE_CODE_RANGE: { - if (TYPE_HIGH_BOUND_KIND (type) == PROP_LOCEXPR - || TYPE_HIGH_BOUND_KIND (type) == PROP_LOCLIST) + if (type->bounds ()->high.kind () == PROP_LOCEXPR + || type->bounds ()->high.kind () == PROP_LOCLIST) { const struct dynamic_prop *prop = &type->bounds ()->high; std::string name = c_get_range_decl_name (prop); diff --git a/gdb/compile/compile-c-types.c b/gdb/compile/compile-c-types.c index 3c900a24a3a6..2b25783bb00c 100644 --- a/gdb/compile/compile-c-types.c +++ b/gdb/compile/compile-c-types.c @@ -44,15 +44,15 @@ convert_array (compile_c_instance *context, struct type *type) element_type = context->convert_type (TYPE_TARGET_TYPE (type)); - if (TYPE_LOW_BOUND_KIND (range) != PROP_CONST) + if (range->bounds ()->low.kind () != PROP_CONST) return context->plugin ().error (_("array type with non-constant" " lower bound is not supported")); if (range->bounds ()->low.const_val () != 0) return context->plugin ().error (_("cannot convert array type with " "non-zero lower bound to C")); - if (TYPE_HIGH_BOUND_KIND (range) == PROP_LOCEXPR - || TYPE_HIGH_BOUND_KIND (range) == PROP_LOCLIST) + if (range->bounds ()->high.kind () == PROP_LOCEXPR + || range->bounds ()->high.kind () == PROP_LOCLIST) { gcc_type result; diff --git a/gdb/compile/compile-cplus-types.c b/gdb/compile/compile-cplus-types.c index 4084f87e5a35..02df7ab90e6e 100644 --- a/gdb/compile/compile-cplus-types.c +++ b/gdb/compile/compile-cplus-types.c @@ -456,7 +456,7 @@ compile_cplus_convert_array (compile_cplus_instance *instance, struct type *range = type->index_type (); gcc_type element_type = instance->convert_type (TYPE_TARGET_TYPE (type)); - if (TYPE_LOW_BOUND_KIND (range) != PROP_CONST) + if (range->bounds ()->low.kind () != PROP_CONST) { const char *s = _("array type with non-constant" " lower bound is not supported"); @@ -472,8 +472,8 @@ compile_cplus_convert_array (compile_cplus_instance *instance, return instance->plugin ().error (s); } - if (TYPE_HIGH_BOUND_KIND (range) == PROP_LOCEXPR - || TYPE_HIGH_BOUND_KIND (range) == PROP_LOCLIST) + if (range->bounds ()->high.kind () == PROP_LOCEXPR + || range->bounds ()->high.kind () == PROP_LOCLIST) { if (TYPE_VECTOR (type)) { diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h index 2d277ac688d0..9be97054cfa5 100644 --- a/gdb/gdbtypes.h +++ b/gdb/gdbtypes.h @@ -1594,10 +1594,6 @@ extern unsigned type_align (struct type *); space in struct type. */ extern bool set_type_align (struct type *, ULONGEST); -#define TYPE_HIGH_BOUND_KIND(range_type) \ - ((range_type)->bounds ()->high.kind ()) -#define TYPE_LOW_BOUND_KIND(range_type) \ - ((range_type)->bounds ()->low.kind ()) #define TYPE_BIT_STRIDE(range_type) \ ((range_type)->bounds ()->stride.const_val () \ * ((range_type)->bounds ()->flag_is_byte_stride ? 8 : 1)) diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c index 31126a24b153..cedb15f555d3 100644 --- a/gdb/rust-lang.c +++ b/gdb/rust-lang.c @@ -813,8 +813,8 @@ rust_internal_print_type (struct type *type, const char *varstring, stream, show - 1, level, flags, false, podata); - if (TYPE_HIGH_BOUND_KIND (type->index_type ()) == PROP_LOCEXPR - || TYPE_HIGH_BOUND_KIND (type->index_type ()) == PROP_LOCLIST) + if (type->index_type ()->bounds ()->high.kind () == PROP_LOCEXPR + || type->index_type ()->bounds ()->high.kind () == PROP_LOCLIST) fprintf_filtered (stream, "; variable length"); else if (get_array_bounds (type, &low_bound, &high_bound)) fprintf_filtered (stream, "; %s", -- 2.27.0