From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id csbRHNAe/mlpOyQAWB0awg (envelope-from ) for ; Fri, 08 May 2026 13:35:12 -0400 Authentication-Results: simark.ca; dkim=pass (2048-bit key; secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=hQxlkAkw; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 578421E0BA; Fri, 08 May 2026 13:35:12 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [38.145.34.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 5B4F51E067 for ; Fri, 08 May 2026 13:35:11 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 46FE24BA2E1B for ; Fri, 8 May 2026 17:35:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 46FE24BA2E1B Authentication-Results: sourceware.org; dkim=pass (2048-bit key, secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=hQxlkAkw Received: from mail-oi1-x22f.google.com (mail-oi1-x22f.google.com [IPv6:2607:f8b0:4864:20::22f]) by sourceware.org (Postfix) with ESMTPS id 574624BA5439 for ; Fri, 8 May 2026 17:34:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 574624BA5439 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 574624BA5439 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::22f ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1778261660; cv=none; b=BUgw3tWIXRnLB49+FppI3WoqSmNPaTCUgG2pINKQeqCRprjh+wGUR1RnE6EU0UdHDiC6sMB4RX34OkL61tbhg9NGB+3MhNz0voBUkx32DxlyNndHZGtKQ1T8ZFcjp5sFvNN2bHdlOiPGlvYazVfo61zFEJyjtVoBdkLn5xflyy0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1778261660; c=relaxed/simple; bh=ScszKMgKDzCBOOJZUOry7Z3xwdAfOowq6CNi4nEh6MI=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=iYzj3W+5V9n+RwChOt2hobLghotWBs9oxsC8Vy8W5dQ9lIU/Jp1qX1sY8EBwOEzF5nr0rnVRgvhCEm9PP10h9Zy17+wHwlyNCNm/W35bBUb7t9K5aa30CM2uqpOSqL/TexrqoBQvMBbCEbfEdUQEEl/CL4G0AbGLcrAKA/zQ8Rw= ARC-Authentication-Results: i=1; sourceware.org; dkim=pass (2048-bit key, secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=hQxlkAkw DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 574624BA5439 Received: by mail-oi1-x22f.google.com with SMTP id 5614622812f47-4645dde00a7so2838616b6e.1 for ; Fri, 08 May 2026 10:34:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1778261659; x=1778866459; darn=sourceware.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=zxCSenCjac9/IA7bxxCEvofe4qpUTp5eLkcH+a2nY1o=; b=hQxlkAkwLLSfKrgmMWWePqgbNrDWGy528l0PE6Qjkj0XBjjAungG+Lb169pywAUhnl +xmH2pI+BJYwcAN5VbT6ameBP0BEidZVQGSpW9Sh2P/6HvyvmxpaotfKjy3puoxi2VOs g6xwR2hWXe3+Q2yQv94qwWIJwVnPCh7s4NMlGEsj5gWfluKaVeI7E2W/WLC93hYukk91 80fXJVBXQMoRCPlGq/x3qytmnm3Sgql1MkYidJ+ZK7VuSKiW90lo2Bb4/e6kYyJ8WXo5 xvI80lifjCXBcg4DqphP8QQh+cDOfQ4t1qjj/PV6GdHYcE1ruRRGJ6uT9eAA9qFwmL7d reZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778261659; x=1778866459; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=zxCSenCjac9/IA7bxxCEvofe4qpUTp5eLkcH+a2nY1o=; b=kt8hsF2l7val4dVaGWyjoXyxIST15jByayAHKjWk5OvRAW0WCXUbX2LQUko/kAG3lw wm+paehOQ5VdtlnL0wDPrBjmc7YS70orifMGDgW2j/8m+cKPVFylHjMPpLC4zwKnNz5Q cf021X3GawVYDd5i6p88jQXqMWmJ/bw1IEHw/7GBE1nBffY9F+jXBMlOM/8Xuvpk4rmK vh0/Uz538cGPjPEvmiAswSS//8tL5KjzYWCFgJ1wSt3zIPR2XxYhodZNJ5cSvXmgfdS3 9JPCrV5uuwfSdQKqIsRk1wWc9otBnrXloiSj6bjKMFiVYcWCr6QfiKXN2HN2QIHDsHin pnHg== X-Gm-Message-State: AOJu0YwmgKn2yaRJsXEYgL2jgM7MYZbPzCAVZ6huTCE1zxapDHECpfuw 2ro5NYo0CWKfNnq1999Pyx4aLwLUpzQNh1+GCcte/GWVKpKiG6z0sYeFjOPEdYaeNhOPdGz/C77 FLL4= X-Gm-Gg: AeBDievUazfu6cPojIRN9HHSk/GP8oB7Wyd1KqEruGbUDZ4sTep3C/zH4aBj/oyb8ug qtHD/JTB3M0Nk5GxS3NbHz1Ll33eg8Q/ZjBHC3+MlhxYMvOBJT8iZP4mD8eUVedGxcHYvVe4ZNF gomgr0zdyp6wXZLdv5hEqI4oFBY6TBCRmhTT5jS9t4EwpKTOxQ8htqByyf3705yN5CEQBMcYEMR zNAOrbxWNjBAjKe8beBN+JKsHEZwWCnFBNZWOqcGg47iyloW7xZyolzzY4GCY0SpF1K1MoYrkyc jgJzMJYjjVTFXaHkR/Lv2hg8Cq0MuaBZahgsEG+sYUUsrVvFoKtc2JeqkeY75EJfSzG0ghqJPzT rQE1Rqdw+j/d4h75ZI/OpiFa025dbkvjlt1MjJtVgvMW9l7sSeMsuiL4T+MsJRWbhhN8Ljm3ZFc XEvSF6ETjsLTancWLKm9QX/WXhPtOJi7WgVRDoiniAWzZObyBUPfeWXZyPd/B3ZslX X-Received: by 2002:a05:6820:2106:b0:694:9e2f:cfac with SMTP id 006d021491bc7-699ab5a1006mr3861054eaf.9.1778261659527; Fri, 08 May 2026 10:34:19 -0700 (PDT) Received: from [192.168.0.26] (75-166-225-82.hlrn.qwest.net. [75.166.225.82]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-69b25cb58b2sm1425242eaf.8.2026.05.08.10.34.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 May 2026 10:34:19 -0700 (PDT) From: Tom Tromey Date: Fri, 08 May 2026 11:34:16 -0600 Subject: [PATCH 1/3] Combine ada_unop_atr and ada_unop_atr_operation::evaluate MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260508-ada-unop-atr-v1-1-6951c4566b82@adacore.com> References: <20260508-ada-unop-atr-v1-0-6951c4566b82@adacore.com> In-Reply-To: <20260508-ada-unop-atr-v1-0-6951c4566b82@adacore.com> To: gdb-patches@sourceware.org Cc: Tom Tromey X-Mailer: b4 0.14.3 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org This inlines ada_unop_atr into its sole caller. This split was an artifact of the expression type conversion. --- gdb/ada-lang.c | 263 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 128 insertions(+), 135 deletions(-) diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 0600394361c..0ecc6712677 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -10364,139 +10364,6 @@ ada_binop_in_bounds_operation::evaluate (struct type *expect_type, } /* namespace expr */ -/* A helper function for some attribute operations. */ - -static value * -ada_unop_atr (struct expression *exp, enum noside noside, enum exp_opcode op, - struct value *arg1, struct type *type_arg, int tem) -{ - const char *attr_name = nullptr; - if (op == OP_ATR_FIRST) - attr_name = "first"; - else if (op == OP_ATR_LAST) - attr_name = "last"; - - if (noside == EVAL_AVOID_SIDE_EFFECTS) - { - if (type_arg == NULL) - type_arg = arg1->type (); - - if (ada_is_constrained_packed_array_type (type_arg)) - type_arg = decode_constrained_packed_array_type (type_arg); - - if (!discrete_type_p (type_arg)) - { - switch (op) - { - default: /* Should never happen. */ - error (_("unexpected attribute encountered")); - case OP_ATR_FIRST: - case OP_ATR_LAST: - type_arg = ada_index_type (type_arg, tem, - attr_name); - break; - case OP_ATR_LENGTH: - type_arg = builtin_type (exp->gdbarch)->builtin_int; - break; - } - } - - return value::zero (type_arg, not_lval); - } - else if (type_arg == NULL) - { - arg1 = ada_coerce_ref (arg1); - - if (ada_is_constrained_packed_array_type (arg1->type ())) - arg1 = ada_coerce_to_simple_array (arg1); - - struct type *type; - if (op == OP_ATR_LENGTH) - type = builtin_type (exp->gdbarch)->builtin_int; - else - { - type = ada_index_type (arg1->type (), tem, - attr_name); - if (type == NULL) - type = builtin_type (exp->gdbarch)->builtin_int; - } - - switch (op) - { - default: /* Should never happen. */ - error (_("unexpected attribute encountered")); - case OP_ATR_FIRST: - return value_from_longest - (type, ada_array_bound (arg1, tem, 0)); - case OP_ATR_LAST: - return value_from_longest - (type, ada_array_bound (arg1, tem, 1)); - case OP_ATR_LENGTH: - return value_from_longest - (type, ada_array_length (arg1, tem)); - } - } - else if (discrete_type_p (type_arg)) - { - struct type *range_type; - const char *name = ada_type_name (type_arg); - - range_type = NULL; - if (name != NULL && type_arg->code () != TYPE_CODE_ENUM) - range_type = to_fixed_range_type (type_arg, NULL); - if (range_type == NULL) - range_type = type_arg; - switch (op) - { - default: - error (_("unexpected attribute encountered")); - case OP_ATR_FIRST: - return value_from_longest - (range_type, ada_discrete_type_low_bound (range_type)); - case OP_ATR_LAST: - return value_from_longest - (range_type, ada_discrete_type_high_bound (range_type)); - case OP_ATR_LENGTH: - error (_("the 'length attribute applies only to array types")); - } - } - else if (type_arg->code () == TYPE_CODE_FLT) - error (_("unimplemented type attribute")); - else - { - LONGEST low, high; - - if (ada_is_constrained_packed_array_type (type_arg)) - type_arg = decode_constrained_packed_array_type (type_arg); - - struct type *type; - if (op == OP_ATR_LENGTH) - type = builtin_type (exp->gdbarch)->builtin_int; - else - { - type = ada_index_type (type_arg, tem, attr_name); - if (type == NULL) - type = builtin_type (exp->gdbarch)->builtin_int; - } - - switch (op) - { - default: - error (_("unexpected attribute encountered")); - case OP_ATR_FIRST: - low = ada_array_bound_from_type (type_arg, tem, 0); - return value_from_longest (type, low); - case OP_ATR_LAST: - high = ada_array_bound_from_type (type_arg, tem, 1); - return value_from_longest (type, high); - case OP_ATR_LENGTH: - low = ada_array_bound_from_type (type_arg, tem, 0); - high = ada_array_bound_from_type (type_arg, tem, 1); - return value_from_longest (type, high - low + 1); - } - } -} - /* A helper function for OP_ATR_MIN and OP_ATR_MAX. */ struct value * @@ -10855,8 +10722,134 @@ ada_unop_atr_operation::evaluate (struct type *expect_type, else val = std::get<0> (m_storage)->evaluate (nullptr, exp, noside); - return ada_unop_atr (exp, noside, std::get<1> (m_storage), - val, type_arg, std::get<2> (m_storage)); + exp_opcode op = std::get<1> (m_storage); + const char *attr_name = nullptr; + if (op == OP_ATR_FIRST) + attr_name = "first"; + else if (op == OP_ATR_LAST) + attr_name = "last"; + + int tem = std::get<2> (m_storage); + + if (noside == EVAL_AVOID_SIDE_EFFECTS) + { + if (type_arg == NULL) + type_arg = val->type (); + + if (ada_is_constrained_packed_array_type (type_arg)) + type_arg = decode_constrained_packed_array_type (type_arg); + + if (!discrete_type_p (type_arg)) + { + switch (op) + { + default: /* Should never happen. */ + error (_("unexpected attribute encountered")); + case OP_ATR_FIRST: + case OP_ATR_LAST: + type_arg = ada_index_type (type_arg, tem, + attr_name); + break; + case OP_ATR_LENGTH: + type_arg = builtin_type (exp->gdbarch)->builtin_int; + break; + } + } + + return value::zero (type_arg, not_lval); + } + else if (type_arg == NULL) + { + val = ada_coerce_ref (val); + + if (ada_is_constrained_packed_array_type (val->type ())) + val = ada_coerce_to_simple_array (val); + + struct type *type; + if (op == OP_ATR_LENGTH) + type = builtin_type (exp->gdbarch)->builtin_int; + else + { + type = ada_index_type (val->type (), tem, + attr_name); + if (type == NULL) + type = builtin_type (exp->gdbarch)->builtin_int; + } + + switch (op) + { + default: /* Should never happen. */ + error (_("unexpected attribute encountered")); + case OP_ATR_FIRST: + return value_from_longest + (type, ada_array_bound (val, tem, 0)); + case OP_ATR_LAST: + return value_from_longest + (type, ada_array_bound (val, tem, 1)); + case OP_ATR_LENGTH: + return value_from_longest + (type, ada_array_length (val, tem)); + } + } + else if (discrete_type_p (type_arg)) + { + struct type *range_type; + const char *name = ada_type_name (type_arg); + + range_type = NULL; + if (name != NULL && type_arg->code () != TYPE_CODE_ENUM) + range_type = to_fixed_range_type (type_arg, NULL); + if (range_type == NULL) + range_type = type_arg; + switch (op) + { + default: + error (_("unexpected attribute encountered")); + case OP_ATR_FIRST: + return value_from_longest + (range_type, ada_discrete_type_low_bound (range_type)); + case OP_ATR_LAST: + return value_from_longest + (range_type, ada_discrete_type_high_bound (range_type)); + case OP_ATR_LENGTH: + error (_("the 'length attribute applies only to array types")); + } + } + else if (type_arg->code () == TYPE_CODE_FLT) + error (_("unimplemented type attribute")); + else + { + LONGEST low, high; + + if (ada_is_constrained_packed_array_type (type_arg)) + type_arg = decode_constrained_packed_array_type (type_arg); + + struct type *type; + if (op == OP_ATR_LENGTH) + type = builtin_type (exp->gdbarch)->builtin_int; + else + { + type = ada_index_type (type_arg, tem, attr_name); + if (type == NULL) + type = builtin_type (exp->gdbarch)->builtin_int; + } + + switch (op) + { + default: + error (_("unexpected attribute encountered")); + case OP_ATR_FIRST: + low = ada_array_bound_from_type (type_arg, tem, 0); + return value_from_longest (type, low); + case OP_ATR_LAST: + high = ada_array_bound_from_type (type_arg, tem, 1); + return value_from_longest (type, high); + case OP_ATR_LENGTH: + low = ada_array_bound_from_type (type_arg, tem, 0); + high = ada_array_bound_from_type (type_arg, tem, 1); + return value_from_longest (type, high - low + 1); + } + } } value * -- 2.54.0