From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-il1-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) by sourceware.org (Postfix) with ESMTPS id 653A73858C74 for ; Fri, 7 Apr 2023 16:39:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 653A73858C74 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: by mail-il1-x12e.google.com with SMTP id u8so22415215ilb.2 for ; Fri, 07 Apr 2023 09:39:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1680885599; x=1683477599; h=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=+fyQb92+OggT4pghlueBF0ZfjXQdbHhbRg5hkHHixAc=; b=Fkv/mke7r5qWMK2sHT5/R/Vo431M597wCk+O2brd2W7KsiiLZKSmDw05V6uRdeNwmQ OI9YpYomnQfcw3YgTVX688cBpSDzhf3EeizlFJY+IHv2+fgwdlObz1IqXJudjWXdaZB7 NpcfgdtzEA9ye+h/j6Fo2wdzHtsvpsSZ1Qup7Ts7QLum7rYFMZUmZjSvjvHE2F4oW0dC zz1QQAm17zxZWQTlxB7ZkTBaOGhXmN33JOFEpv8JEpbI8ZxWh39PNnI8Gu69mnhi+ds3 SQlCjh8ngEE6Rkzz7YWOpyyqLH5yrHJyuJIppt9t812mWTtED2k62/2wFz9tFmNm0Rbs n7Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680885599; x=1683477599; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+fyQb92+OggT4pghlueBF0ZfjXQdbHhbRg5hkHHixAc=; b=u3ZxTJDwyLW7P1HH0TGUeI8VfKpIwsCO5pM7uewo996fOiFBMZx2jswu86kOwL1iTl 52ybE3ip7F15NYxVPueon2SS9BRkFZQsp+UEpeOwzSEmWvlhuUeLhoLeuAFo4ukqQRGg r905jfITloM8wVVGDhvUzoluwVcW84lKnxzNbsuUW+9639ROrE+3bkpmGO9rS/z2ebT0 /Zc+Wwzb0wgaaFLQiJ6IOYIgYE4pd8nJsLHpBxSrijm3Bpl92dKIRYAR3eSH53rPp2YB 5k0G8KSuGPXXrXbgUs2dq5RW5D4Wz4qwlM05KCGtq+qIEI6n8SBGlYi305Pg8xOUwers M94g== X-Gm-Message-State: AAQBX9fMWgQEUGJKMD5otj14+TstwPS+TxUtRzPQk7gKStL+tORTxXI6 hyCHzKaZV+QvzTpDOz/y81Zcy5/wDVMi2YIkjJ545Q== X-Google-Smtp-Source: AKy350ao+rYYiKK6wBTRjVHijTItpabNQuB/g4M08lf3bU0oRYyWQl2cXVJWn0hNeVLio2ZzMkvvAg== X-Received: by 2002:a92:90e:0:b0:328:59a9:23dc with SMTP id y14-20020a92090e000000b0032859a923dcmr1046474ilg.29.1680885599069; Fri, 07 Apr 2023 09:39:59 -0700 (PDT) Received: from localhost.localdomain (75-166-159-36.hlrn.qwest.net. [75.166.159.36]) by smtp.gmail.com with ESMTPSA id c62-20020a029644000000b00406431d0fb5sm1171452jai.72.2023.04.07.09.39.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Apr 2023 09:39:58 -0700 (PDT) From: Tom Tromey Date: Fri, 07 Apr 2023 10:39:59 -0600 Subject: [PATCH v2 6/8] Use reference parameter in remove_extra_symbols MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230314-submit-pragma-import-export-v2-6-dcff927191fb@adacore.com> References: <20230314-submit-pragma-import-export-v2-0-dcff927191fb@adacore.com> In-Reply-To: <20230314-submit-pragma-import-export-v2-0-dcff927191fb@adacore.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.2 X-Spam-Status: No, score=-11.9 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 autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Changing ada-lang.c:remove_extra_symbols to take a reference parameter makes the code a bit easier to read, by replacing "(*syms)" with plain "syms". --- gdb/ada-lang.c | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index d2d7dca5c1e..5d0ba5ac20b 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -5027,34 +5027,34 @@ symbols_are_identical_enums (const std::vector &syms) debugging symbols)). Modifies SYMS to squeeze out deleted entries. */ static void -remove_extra_symbols (std::vector *syms) +remove_extra_symbols (std::vector &syms) { int i, j; /* We should never be called with less than 2 symbols, as there cannot be any extra symbol in that case. But it's easy to handle, since we have nothing to do in that case. */ - if (syms->size () < 2) + if (syms.size () < 2) return; i = 0; - while (i < syms->size ()) + while (i < syms.size ()) { int remove_p = 0; /* If two symbols have the same name and one of them is a stub type, the get rid of the stub. */ - if ((*syms)[i].symbol->type ()->is_stub () - && (*syms)[i].symbol->linkage_name () != NULL) + if (syms[i].symbol->type ()->is_stub () + && syms[i].symbol->linkage_name () != NULL) { - for (j = 0; j < syms->size (); j++) + for (j = 0; j < syms.size (); j++) { if (j != i - && !(*syms)[j].symbol->type ()->is_stub () - && (*syms)[j].symbol->linkage_name () != NULL - && strcmp ((*syms)[i].symbol->linkage_name (), - (*syms)[j].symbol->linkage_name ()) == 0) + && !syms[j].symbol->type ()->is_stub () + && syms[j].symbol->linkage_name () != NULL + && strcmp (syms[i].symbol->linkage_name (), + syms[j].symbol->linkage_name ()) == 0) remove_p = 1; } } @@ -5062,26 +5062,26 @@ remove_extra_symbols (std::vector *syms) /* Two symbols with the same name, same class and same address should be identical. */ - else if ((*syms)[i].symbol->linkage_name () != NULL - && (*syms)[i].symbol->aclass () == LOC_STATIC - && is_nondebugging_type ((*syms)[i].symbol->type ())) + else if (syms[i].symbol->linkage_name () != NULL + && syms[i].symbol->aclass () == LOC_STATIC + && is_nondebugging_type (syms[i].symbol->type ())) { - for (j = 0; j < syms->size (); j += 1) + for (j = 0; j < syms.size (); j += 1) { if (i != j - && (*syms)[j].symbol->linkage_name () != NULL - && strcmp ((*syms)[i].symbol->linkage_name (), - (*syms)[j].symbol->linkage_name ()) == 0 - && ((*syms)[i].symbol->aclass () - == (*syms)[j].symbol->aclass ()) - && (*syms)[i].symbol->value_address () - == (*syms)[j].symbol->value_address ()) + && syms[j].symbol->linkage_name () != NULL + && strcmp (syms[i].symbol->linkage_name (), + syms[j].symbol->linkage_name ()) == 0 + && (syms[i].symbol->aclass () + == syms[j].symbol->aclass ()) + && syms[i].symbol->value_address () + == syms[j].symbol->value_address ()) remove_p = 1; } } if (remove_p) - syms->erase (syms->begin () + i); + syms.erase (syms.begin () + i); else i += 1; } @@ -5098,8 +5098,8 @@ remove_extra_symbols (std::vector *syms) to ask the user to disambiguate anyways. And if we have to present a multiple-choice menu, it's less confusing if the list isn't missing some choices that were identical and yet distinct. */ - if (symbols_are_identical_enums (*syms)) - syms->resize (1); + if (symbols_are_identical_enums (syms)) + syms.resize (1); } /* Given a type that corresponds to a renaming entity, use the type name @@ -5711,7 +5711,7 @@ ada_lookup_symbol_list_worker (const lookup_name_info &lookup_name, ada_add_all_symbols (results, block, lookup_name, domain, full_search, &syms_from_global_search); - remove_extra_symbols (&results); + remove_extra_symbols (results); if (results.empty () && full_search && syms_from_global_search) cache_symbol (ada_lookup_name (lookup_name), domain, NULL, NULL); -- 2.39.1