From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id 3D6BF397B819 for ; Wed, 4 Aug 2021 12:30:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 3D6BF397B819 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de Received: from imap1.suse-dmz.suse.de (imap1.suse-dmz.suse.de [192.168.254.73]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 5E4521FDD3 for ; Wed, 4 Aug 2021 12:30:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1628080209; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=f9jftW9au4rtEBAMv/4l3ZQwJtpjSUc0NJr3aN5bnz8=; b=Mj8MnaibB1tI+yWX0nLjt/dT1yf3/GUTkN5pZx1S5YbgSx5PvdYL2SSoy+g08HpVKR7SPm 3SeuuNJEC05Ng/a2h0oB42wxn6krhGL5c8/FaGwRn4csK+hoBTH7Y+NTGM+mFiHaL4lm/n t70yPyvM3F5dMJdGulgUo8r9zsB6GVQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1628080209; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=f9jftW9au4rtEBAMv/4l3ZQwJtpjSUc0NJr3aN5bnz8=; b=LdWsmgAypx9Xf39ZvayuJFpLaGcUCMuKsRC3L0SKA8T5p2QXocdSFG3g01mCOK2JtZ6Vrp 5Drw0alo4GfNtYBg== Received: from imap1.suse-dmz.suse.de (imap1.suse-dmz.suse.de [192.168.254.73]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap1.suse-dmz.suse.de (Postfix) with ESMTPS id 40EF313672 for ; Wed, 4 Aug 2021 12:30:09 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap1.suse-dmz.suse.de with ESMTPSA id qWfADlGICmETKwAAGKfGzw (envelope-from ) for ; Wed, 04 Aug 2021 12:30:09 +0000 Date: Wed, 4 Aug 2021 14:30:07 +0200 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [committed][gdb/symtab] Use lambda function instead of addrmap_foreach_check Message-ID: <20210804123006.GA32185@delia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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, 04 Aug 2021 12:30:11 -0000 Hi, Use a lambda function instead of addrmap_foreach_check, which removes the need for static variables. Also remove unnecessary static on local var temp_obstack in test_addrmap. Committed to trunk. Thanks, - Tom [gdb/symtab] Use lambda function instead of addrmap_foreach_check gdb/ChangeLog: 2021-08-04 Tom de Vries * addrmap.c (addrmap_foreach_check): Remove. (array, val1, val2): Move ... (test_addrmap): ... here. Remove static on temp_obstack. Use lambda function instead of addrmap_foreach_check. --- gdb/addrmap.c | 51 +++++++++++++++++++++------------------------------ 1 file changed, 21 insertions(+), 30 deletions(-) diff --git a/gdb/addrmap.c b/gdb/addrmap.c index 2cb472604f4..22817824cdc 100644 --- a/gdb/addrmap.c +++ b/gdb/addrmap.c @@ -611,41 +611,20 @@ core_addr (void *p) } \ while (0) -/* We'll verify using the addresses of the elements of this array. */ -static char *array; -/* We'll verify using these values stored into the map. */ -static void *val1; -static void *val2; - -/* Callback for addrmap_foreach to check transitions. */ - -static int -addrmap_foreach_check (CORE_ADDR start_addr, void *obj) -{ - if (start_addr == core_addr (nullptr)) - SELF_CHECK (obj == nullptr); - else if (start_addr == core_addr (&array[10])) - SELF_CHECK (obj == val1); - else if (start_addr == core_addr (&array[13])) - SELF_CHECK (obj == nullptr); - else - SELF_CHECK (false); - return 0; -} - /* Entry point for addrmap unit tests. */ static void test_addrmap () { - /* Initialize static variables. */ - char local_array[20]; - array = local_array; - val1 = &array[1]; - val2 = &array[2]; + /* We'll verify using the addresses of the elements of this array. */ + char array[20]; + + /* We'll verify using these values stored into the map. */ + void *val1 = &array[1]; + void *val2 = &array[2]; /* Create mutable addrmap. */ - static struct obstack temp_obstack; + struct obstack temp_obstack; obstack_init (&temp_obstack); struct addrmap *map = addrmap_create_mutable (&temp_obstack); SELF_CHECK (map != nullptr); @@ -668,8 +647,20 @@ test_addrmap () CHECK_ADDRMAP_FIND (map2, array, 13, 19, nullptr); /* Iterate over both addrmaps. */ - SELF_CHECK (addrmap_foreach (map, addrmap_foreach_check) == 0); - SELF_CHECK (addrmap_foreach (map2, addrmap_foreach_check) == 0); + auto callback = [&] (CORE_ADDR start_addr, void *obj) + { + if (start_addr == core_addr (nullptr)) + SELF_CHECK (obj == nullptr); + else if (start_addr == core_addr (&array[10])) + SELF_CHECK (obj == val1); + else if (start_addr == core_addr (&array[13])) + SELF_CHECK (obj == nullptr); + else + SELF_CHECK (false); + return 0; + }; + SELF_CHECK (addrmap_foreach (map, callback) == 0); + SELF_CHECK (addrmap_foreach (map2, callback) == 0); /* Relocate fixed addrmap. */ addrmap_relocate (map2, 1);