From patchwork Mon Feb 27 21:29:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 65706 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 CE46E384FB59 for ; Mon, 27 Feb 2023 21:30:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CE46E384FB59 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1677533434; bh=OtVchp7EDqwPCsvnfU871PfqUHfCKcj6wSxgY86oa7U=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=NpkKvIBnMnJcbw4ugLfj4/MN28RZtxVzVyjppURSetYePumegz4GcA2V1qUnmdsrF 9EXdBMswnLJ5SwaPLN/VYboR7G8YSpd3QD5UswH/s/PFuZyXx79oWr88Fj1Yo5gCWh lWblZ9VEoZ8+u4hk8Rh9jpTngRTvtAeJNLup4tGI= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 334013858C5F for ; Mon, 27 Feb 2023 21:29:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 334013858C5F Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-539-BQgwoMHaNxmH6VQX-VkcYg-1; Mon, 27 Feb 2023 16:29:38 -0500 X-MC-Unique: BQgwoMHaNxmH6VQX-VkcYg-1 Received: by mail-wm1-f71.google.com with SMTP id p22-20020a7bcc96000000b003e2036a1516so5916749wma.7 for ; Mon, 27 Feb 2023 13:29:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677533377; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OtVchp7EDqwPCsvnfU871PfqUHfCKcj6wSxgY86oa7U=; b=PkiD6OJ72D0IdKrrpoPn4g/LKsogyrbw5y5Rpdeh8tOqSjvGoyuXis1uM7oFTnKaVT +QFcf1++B73lIgjM7G56nJQFnGdSySAoM9iFjrP41w44vbCVoLKs3jzLPm5AlmEhK274 GHHrteboeXoB0y5lqzFc1aQ+Uai2Vv5cs7YkbzTfpFt5kzU+whF61/Sg6PDoL/l7zGkj ktkKLV1nPRB4XL/vPdeyskic+dko4wGwUjd/LC2s4WnO/V22NWk36mNMYKdSMfHhyTus GvQxvnr1wUh8Dsw6sW+nHX8KQ+rTsEwmqFW4yaIFPDn37ELdVhpGWf6bkNMYBS/M77V8 z8wg== X-Gm-Message-State: AO0yUKWJq8otYtYpxyMp01eGvQupxXUtnqLNdMt3GHV7B6Dzqqnekdiu BLT/16Kybkp0ZkdHz8YHvkQjAxHPv3n3fv70m6a4lkeHC3NUM16WRR+yvX6Y3lOF7Wtn/fjz0AN skYCWiyz4fQJehveEs0H7pPV0hMs4FzhgYi7DfMUHCyopFke5M4m+uqerLxn/n/Jqh6l2lzqCJS KOH4M= X-Received: by 2002:a05:600c:4d97:b0:3eb:29fe:f922 with SMTP id v23-20020a05600c4d9700b003eb29fef922mr382740wmp.29.1677533377368; Mon, 27 Feb 2023 13:29:37 -0800 (PST) X-Google-Smtp-Source: AK7set/qkgYDe5qxSH60ujgdKZKtu4yrVLPx0E64NXliIqGKlnVWpGg/5C+EXKZ2uQXplYii3Gi0/g== X-Received: by 2002:a05:600c:4d97:b0:3eb:29fe:f922 with SMTP id v23-20020a05600c4d9700b003eb29fef922mr382729wmp.29.1677533377069; Mon, 27 Feb 2023 13:29:37 -0800 (PST) Received: from localhost (95.72.115.87.dyn.plus.net. [87.115.72.95]) by smtp.gmail.com with ESMTPSA id n31-20020a05600c3b9f00b003e8dcc67bdesm15579869wms.30.2023.02.27.13.29.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Feb 2023 13:29:36 -0800 (PST) To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCH 05/13] gdb: remove uses of alloca from dwarf2/expr.c Date: Mon, 27 Feb 2023 21:29:18 +0000 Message-Id: <9ba19b3f47515956e7f49c778e72a460e461f23d.1677533215.git.aburgess@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, 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-Patchwork-Original-From: Andrew Burgess via Gdb-patches From: Andrew Burgess Reply-To: Andrew Burgess Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Remove the remaining uses of alloca from dwarf2/expr.c and replace them with gdb::byte_vector. There should be no user visible changes after this commit. --- gdb/dwarf2/expr.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/gdb/dwarf2/expr.c b/gdb/dwarf2/expr.c index 2b41372be8a..c01e745bf0a 100644 --- a/gdb/dwarf2/expr.c +++ b/gdb/dwarf2/expr.c @@ -1155,12 +1155,12 @@ dwarf_expr_context::fetch_address (int n) for those architectures which require it. */ if (gdbarch_integer_to_address_p (arch)) { - gdb_byte *buf = (gdb_byte *) alloca (this->m_addr_size); - type *int_type = get_unsigned_type (arch, - result_val->type ()); + gdb::byte_vector buf (this->m_addr_size); + type *int_type = get_unsigned_type (arch, result_val->type ()); - store_unsigned_integer (buf, this->m_addr_size, byte_order, result); - return gdbarch_integer_to_address (arch, int_type, buf); + store_unsigned_integer (buf.data (), this->m_addr_size, byte_order, + result); + return gdbarch_integer_to_address (arch, int_type, buf.data ()); } return (CORE_ADDR) result; @@ -1883,7 +1883,6 @@ dwarf_expr_context::execute_stack_op (const gdb_byte *op_ptr, case DW_OP_GNU_deref_type: { int addr_size = (op == DW_OP_deref ? this->m_addr_size : *op_ptr++); - gdb_byte *buf = (gdb_byte *) alloca (addr_size); CORE_ADDR addr = fetch_address (0); struct type *type; @@ -1898,21 +1897,25 @@ dwarf_expr_context::execute_stack_op (const gdb_byte *op_ptr, else type = address_type; - this->read_mem (buf, addr, addr_size); + gdb::byte_vector buf (std::max ((ULONGEST) addr_size, + type->length ())); + + this->read_mem (buf.data (), addr, addr_size); /* If the size of the object read from memory is different from the type length, we need to zero-extend it. */ if (type->length () != addr_size) { ULONGEST datum = - extract_unsigned_integer (buf, addr_size, byte_order); + extract_unsigned_integer (buf.data (), addr_size, + byte_order); - buf = (gdb_byte *) alloca (type->length ()); - store_unsigned_integer (buf, type->length (), + store_unsigned_integer (buf.data (), type->length (), byte_order, datum); } - result_val = value_from_contents_and_address (type, buf, addr); + result_val = value_from_contents_and_address (type, buf.data (), + addr); break; }