From patchwork Mon Mar 25 14:05:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 87633 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 2A1433858404 for ; Mon, 25 Mar 2024 14:06:07 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id D7F3C3858D33 for ; Mon, 25 Mar 2024 14:05:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D7F3C3858D33 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D7F3C3858D33 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711375544; cv=none; b=V7v2fMy6Rk54A3JK6+cgi/5jWl9qOcgEUN0IJxGVkNI+ZaVWClSjKgbL1jsLkW0rIJZJ5B8eRA6Xy7qgedZZfAluof1oY0e6dl70SvGqD4fu21QmvLuzSidIbMN9ZkIXLQ/1g8IsFvOrVonxBPqXcSOeO+81FmGhvrovU1rszJA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711375544; c=relaxed/simple; bh=cTdBdM7+9r3wmzdz5Khoa67q+7gQs9s0LEwISn2J16k=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=mt9/ibxSHBMvTX0VymcKG4dZZ7bTx5dOX5aRHL5pX5krKbqZPhyXR40tFIzKOg/0s//Bfn7lyg4j4KjVDc86x+g2ILnJznHMYdlCZG1V/N3PBDE6VP2ro4JPOC+qOXAejrufq74fEb+M7SOCAoXEB+mhT0+6etZ253KXfN0DmW0= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id E20735C76F for ; Mon, 25 Mar 2024 14:05:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1711375537; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=aduKLHJEFnWCjrCEJuWfY1Y3fcPS2+YjumL1zzUErrU=; b=NA8WO7YLMTvF1XD+xhPcaMqgsBgEZfjuRsytx6Av5FyrPbiW4OQvK9vA58NG1DjV4zGpeF lbV3KCThX+DOoHDKg4RbEGeDY4HgpQb2qkSCXCclz08yl5lutrkIgGPGTh6yMR9XcSZAh5 8q4SeSwk8ZMXBQCfbRKauRbD8Xx8ROM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1711375537; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=aduKLHJEFnWCjrCEJuWfY1Y3fcPS2+YjumL1zzUErrU=; b=Y9yCqv4agFVTIGwiqBJMfflTiqolnTSdPt/BwgC3E1PNQXZNGJehX+bT8ZZ1FnXR0eZdXA BUbSJwMmj/kcYICg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1711375534; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=aduKLHJEFnWCjrCEJuWfY1Y3fcPS2+YjumL1zzUErrU=; b=Ak7V2zpYQCLGI0GoY5polf1wlhNvJIkOG1xFzFQOED07OFy+D7/ynoL+RcpFvVMkBAwMLo APedhd2Mlu4JmXUuF8XD+dX9OoALTmGf/nzb4R92EzFdmkelw6i7UVqciyxEo/nmUepbvx c4ZkKOivOR7h8dl1/zzmLtdjkr7RZiA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1711375534; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=aduKLHJEFnWCjrCEJuWfY1Y3fcPS2+YjumL1zzUErrU=; b=Ta9tQ6+npKsdXCG2axgKGL9a6OZLC8U5L/6y5pSAWpv8v6+ATTvpMQKwfBPMrxS5sZeVOl Yk041ng/b5IKDeBw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id CACF3137C4 for ; Mon, 25 Mar 2024 14:05:34 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id 2SWVL66EAWZscgAAD6G6ig (envelope-from ) for ; Mon, 25 Mar 2024 14:05:34 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH] [gdb/testsuite] Fix gdb.ada/tagged-lookup.exp with gcc <= 12 Date: Mon, 25 Mar 2024 15:05:28 +0100 Message-Id: <20240325140528.28786-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 X-Spamd-Bar: + Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=Ak7V2zpY; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=Ta9tQ6+n X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [1.96 / 50.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; DWL_DNSWL_BLOCKED(0.00)[suse.de:dkim]; R_MISSING_CHARSET(2.50)[]; TO_DN_NONE(0.00)[]; BROKEN_CONTENT_TYPE(1.50)[]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[suse.de:+]; MX_GOOD(-0.01)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; BAYES_HAM(-1.53)[91.91%]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCPT_COUNT_ONE(0.00)[1]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; MID_CONTAINS_FROM(1.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[sourceware.org:url,pck2.ads:url,suse.de:dkim]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_TLS_ALL(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from] X-Spam-Score: 1.96 X-Rspamd-Queue-Id: E20735C76F 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, KAM_NUMSUBJECT, 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 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+patchwork=sourceware.org@sourceware.org With gcc 13, test-case gdb.ada/tagged-lookup.exp passes for me, but with gcc 12, I get: ... (gdb) set debug symtab-create 1^M (gdb) print *the_local_var^M ... $1 = (n => 2)^M (gdb) FAIL: gdb.ada/tagged-lookup.exp: only one CU expanded ... The problem is that this fails: ... -re -wrap ".* = \\\(n => $decimal\\\)" { if {$found_pck + $found_pck2 == 1} { pass $gdb_test_name } else { fail $gdb_test_name } ... because $found_pck == 0 and $found_pck2 == 0. Indeed, with gcc 13 we have: ... $ grep "start_subfile: name = .*/tagged-lookup/" gdb.log | sed 's%.*/%%' b~foo.adb b~foo.adb b~foo.adb b~foo.ads pck2.adb pck2.adb pck2.ads pck2.adb pck2.ads ... and with gcc 12: ... $ grep "start_subfile: name = .*/tagged-lookup/" gdb.log | sed 's%.*/%%' b~foo.adb b~foo.adb b~foo.adb b~foo.ads ... Fix this by checking for "$found_pck + $found_pck2 <= 1" instead. Tested on x86_64-linux. PR testsuite/31514 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31514 --- gdb/testsuite/gdb.ada/tagged-lookup.exp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: 61ced226a4fc2e6df7836cd9c0f7e1ad47af2440 diff --git a/gdb/testsuite/gdb.ada/tagged-lookup.exp b/gdb/testsuite/gdb.ada/tagged-lookup.exp index 4bc088ba8d5..3803319c505 100644 --- a/gdb/testsuite/gdb.ada/tagged-lookup.exp +++ b/gdb/testsuite/gdb.ada/tagged-lookup.exp @@ -52,7 +52,7 @@ gdb_test_multiple "print *the_local_var" "only one CU expanded" -lbl { exp_continue } -re -wrap ".* = \\\(n => $decimal\\\)" { - if {$found_pck + $found_pck2 == 1} { + if {$found_pck + $found_pck2 <= 1} { pass $gdb_test_name } else { fail $gdb_test_name