From patchwork Fri Oct 4 08:42:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam James X-Patchwork-Id: 1992651 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XKht33fsTz1xt7 for ; Fri, 4 Oct 2024 18:44:11 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id AE97C386D606 for ; Fri, 4 Oct 2024 08:44:09 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id D09A338460B4 for ; Fri, 4 Oct 2024 08:43:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D09A338460B4 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D09A338460B4 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2001:470:ea4a:1:5054:ff:fec7:86e4 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728031400; cv=none; b=gCX8dLe21ceWJDAVj1WBoSy1Om31xMz4L/4c/fAfaam2s00t3V6GCcZrfLt8O7hVNrfi6QXF/dr9IFcisXPtIqfke5JmnVnj7Q0Mbf6HVRDgnRMUeVx1YKQvnx9GwdEnitXIShanZB8xwravhZD/4VpaQNn6FBOeThTnjASt6aE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728031400; c=relaxed/simple; bh=KpS//K9T/A+dTHyeqqkCvjYbu+AO4RvLNGXj7eO8Urc=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=E+puR2hUodXvn4fiIwwMxrtW6JJFIAKt7HUdQl4CEryj2hhHzy4JtrMS1UDIkV9oyrLYMPPi5uNN9/LRl4aqYW55P54wQamo1mRfjDiYYty7XCwkQKa9zg9y0SpJH3b4Oee1PTHcWk8oPENdiZrCNQdyCJTkcNhkuDEpMjwS1Bw= ARC-Authentication-Results: i=1; server2.sourceware.org From: Sam James To: gcc-patches@gcc.gnu.org Cc: Sam James Subject: [COMMITTED 1/2] testsuite: add missing braces around dejagnu directives Date: Fri, 4 Oct 2024 09:42:59 +0100 Message-ID: X-Mailer: git-send-email 2.46.2 MIME-Version: 1.0 X-Spam-Status: No, score=-10.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_PASS, 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: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org gcc/testsuite/ChangeLog: * c-c++-common/analyzer/flex-without-call-summaries.c: Add missing brace. * c-c++-common/analyzer/malloc-callbacks.c: Ditto. * gcc.dg/Wstringop-overflow-79.c: Ditto. * gcc.dg/Wstringop-overflow-80.c: Ditto. --- .../analyzer/flex-without-call-summaries.c | 2 +- .../c-c++-common/analyzer/malloc-callbacks.c | 2 +- gcc/testsuite/gcc.dg/Wstringop-overflow-79.c | 28 +++++++++---------- gcc/testsuite/gcc.dg/Wstringop-overflow-80.c | 28 +++++++++---------- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/gcc/testsuite/c-c++-common/analyzer/flex-without-call-summaries.c b/gcc/testsuite/c-c++-common/analyzer/flex-without-call-summaries.c index 092d78486219..e68ac2f3b749 100644 --- a/gcc/testsuite/c-c++-common/analyzer/flex-without-call-summaries.c +++ b/gcc/testsuite/c-c++-common/analyzer/flex-without-call-summaries.c @@ -889,7 +889,7 @@ static int yy_get_next_buffer (void) } else /* Can't grow it, we don't own it. */ - b->yy_ch_buf = NULL; /* { dg-bogus "leak" "PR analyzer/103546" */ + b->yy_ch_buf = NULL; /* { dg-bogus "leak" "PR analyzer/103546" } */ if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( diff --git a/gcc/testsuite/c-c++-common/analyzer/malloc-callbacks.c b/gcc/testsuite/c-c++-common/analyzer/malloc-callbacks.c index 0ba4f3824c62..422b40373634 100644 --- a/gcc/testsuite/c-c++-common/analyzer/malloc-callbacks.c +++ b/gcc/testsuite/c-c++-common/analyzer/malloc-callbacks.c @@ -64,7 +64,7 @@ void test_5 (void) { allocator_t alloc_fn = get_alloca (); deallocator_t dealloc_fn = get_free (); - int *ptr = (int *) alloc_fn (sizeof (int)); /* dg-message "region created on stack here" } */ + int *ptr = (int *) alloc_fn (sizeof (int)); /* { dg-message "region created on stack here" } */ dealloc_fn (ptr); /* { dg-warning "'free' of 'ptr' which points to memory on the stack" } */ } diff --git a/gcc/testsuite/gcc.dg/Wstringop-overflow-79.c b/gcc/testsuite/gcc.dg/Wstringop-overflow-79.c index 15eb26fbdb73..e97cb91ba18d 100644 --- a/gcc/testsuite/gcc.dg/Wstringop-overflow-79.c +++ b/gcc/testsuite/gcc.dg/Wstringop-overflow-79.c @@ -5,8 +5,8 @@ { dg-do compile } { dg-options "-O0 -Wno-array-bounds" } */ -extern char a[8]; // dg-message at offset \\\[3, 6] into destination object 'a'" "note 1" } - // dg-message at offset \\\[5, 8] into destination object 'a'" "note 2" { target *-*-* } .-1 } +extern char a[8]; // { dg-message "at offset \\\[3, 6] into destination object 'a'" "note 1" } + // { dg-message "at offset \\\[5, 8] into destination object 'a'" "note 2" { target *-*-* } .-1 } void test_2_notes (int i) { @@ -15,9 +15,9 @@ void test_2_notes (int i) } -extern char b[8]; // dg-message at offset \\\[3, 6] into destination object 'b'" "note 1" } - // dg-message at offset \\\[4, 7] into destination object 'b'" "note 2" { target *-*-* } .-1 } - // dg-message at offset \\\[5, 8] into destination object 'b'" "note 3" { target *-*-* } .-2 } +extern char b[8]; // { dg-message "at offset \\\[3, 6] into destination object 'b'" "note 1" } + // { dg-message "at offset \\\[4, 7] into destination object 'b'" "note 2" { target *-*-* } .-1 } + // { dg-message "at offset \\\[5, 8] into destination object 'b'" "note 3" { target *-*-* } .-2 } void test_3_notes (int i) { @@ -26,10 +26,10 @@ void test_3_notes (int i) } -extern char c[8]; // dg-message at offset \\\[3, 6] into destination object 'c'" "note 1" } - // dg-message at offset \\\[4, 7] into destination object 'c'" "note 2" { target *-*-* } .-1 } - // dg-message at offset \\\[5, 8] into destination object 'c'" "note 3" { target *-*-* } .-2 } - // dg-message at offset \\\[6, 8] into destination object 'c'" "note 3" { target *-*-* } .-2 } +extern char c[8]; // { dg-message "at offset \\\[3, 6] into destination object 'c'" "note 1" } + // { dg-message "at offset \\\[4, 7] into destination object 'c'" "note 2" { target *-*-* } .-1 } + // { dg-message "at offset \\\[5, 8] into destination object 'c'" "note 3" { target *-*-* } .-2 } + // { dg-message "at offset \\\[6, 8] into destination object 'c'" "note 3" { target *-*-* } .-2 } void test_4_notes (int i) { @@ -47,11 +47,11 @@ void test_4_notes (int i) } -extern char d[8]; // dg-message at offset \\\[3, 6] into destination object 'd'" "note 1" } - // dg-message at offset \\\[4, 7] into destination object 'd'" "note 2" { target *-*-* } .-1 } - // dg-message at offset \\\[5, 8] into destination object 'd'" "note 3" { target *-*-* } .-2 } - // dg-message at offset \\\[6, 8] into destination object 'd'" "note 3" { target *-*-* } .-3 } - // dg-message at offset \\\[7, 8] into destination object 'd'" "note 3" { target *-*-* } .-4 } +extern char d[8]; // { dg-message "at offset \\\[3, 6] into destination object 'd'" "note 1" } + // { dg-message "at offset \\\[4, 7] into destination object 'd'" "note 2" { target *-*-* } .-1 } + // { dg-message "at offset \\\[5, 8] into destination object 'd'" "note 3" { target *-*-* } .-2 } + // { dg-message "at offset \\\[6, 8] into destination object 'd'" "note 3" { target *-*-* } .-3 } + // { dg-message "at offset \\\[7, 8] into destination object 'd'" "note 3" { target *-*-* } .-4 } void test_5_notes (int i) { diff --git a/gcc/testsuite/gcc.dg/Wstringop-overflow-80.c b/gcc/testsuite/gcc.dg/Wstringop-overflow-80.c index 1628c2f0159c..c74ca3a7918b 100644 --- a/gcc/testsuite/gcc.dg/Wstringop-overflow-80.c +++ b/gcc/testsuite/gcc.dg/Wstringop-overflow-80.c @@ -5,8 +5,8 @@ { dg-do compile } { dg-options "-O2 -Wno-array-bounds" } */ -extern char a[8]; // dg-message at offset \\\[3, 6] into destination object 'a'" "note 1" } - // dg-message at offset \\\[5, 8] into destination object 'a'" "note 2" { target *-*-* } .-1 } +extern char a[8]; // { dg-message "at offset \\\[3, 6] into destination object 'a'" "note 1" } + // { dg-message "at offset \\\[5, 8] into destination object 'a'" "note 2" { target *-*-* } .-1 } void test_2_notes (int i) { @@ -15,9 +15,9 @@ void test_2_notes (int i) } -extern char b[8]; // dg-message at offset \\\[3, 6] into destination object 'b'" "note 1" } - // dg-message at offset \\\[4, 7] into destination object 'b'" "note 2" { target *-*-* } .-1 } - // dg-message at offset \\\[5, 8] into destination object 'b'" "note 3" { target *-*-* } .-2 } +extern char b[8]; // { dg-message "at offset \\\[3, 6] into destination object 'b'" "note 1" } + // { dg-message "at offset \\\[4, 7] into destination object 'b'" "note 2" { target *-*-* } .-1 } + // { dg-message "at offset \\\[5, 8] into destination object 'b'" "note 3" { target *-*-* } .-2 } void test_3_notes (int i) { @@ -26,10 +26,10 @@ void test_3_notes (int i) } -extern char c[8]; // dg-message at offset \\\[3, 6] into destination object 'c'" "note 1" } - // dg-message at offset \\\[4, 7] into destination object 'c'" "note 2" { target *-*-* } .-1 } - // dg-message at offset \\\[5, 8] into destination object 'c'" "note 3" { target *-*-* } .-2 } - // dg-message at offset \\\[6, 8] into destination object 'c'" "note 3" { target *-*-* } .-2 } +extern char c[8]; // { dg-message "at offset \\\[3, 6] into destination object 'c'" "note 1" } + // { dg-message "at offset \\\[4, 7] into destination object 'c'" "note 2" { target *-*-* } .-1 } + // { dg-message "at offset \\\[5, 8] into destination object 'c'" "note 3" { target *-*-* } .-2 } + // { dg-message "at offset \\\[6, 8] into destination object 'c'" "note 3" { target *-*-* } .-2 } void test_4_notes (int i) { @@ -47,11 +47,11 @@ void test_4_notes (int i) } -extern char d[8]; // dg-message at offset \\\[3, 6] into destination object 'd'" "note 1" } - // dg-message at offset \\\[4, 7] into destination object 'd'" "note 2" { target *-*-* } .-1 } - // dg-message at offset \\\[5, 8] into destination object 'd'" "note 3" { target *-*-* } .-2 } - // dg-message at offset \\\[6, 8] into destination object 'd'" "note 3" { target *-*-* } .-3 } - // dg-message at offset \\\[7, 8] into destination object 'd'" "note 3" { target *-*-* } .-4 } +extern char d[8]; // { dg-message "at offset \\\[3, 6] into destination object 'd'" "note 1" } + // { dg-message "at offset \\\[4, 7] into destination object 'd'" "note 2" { target *-*-* } .-1 } + // { dg-message "at offset \\\[5, 8] into destination object 'd'" "note 3" { target *-*-* } .-2 } + // { dg-message "at offset \\\[6, 8] into destination object 'd'" "note 3" { target *-*-* } .-3 } + // { dg-message "at offset \\\[7, 8] into destination object 'd'" "note 3" { target *-*-* } .-4 } void test_5_notes (int i) { From patchwork Fri Oct 4 08:43:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam James X-Patchwork-Id: 1992650 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XKhsX4cfsz1xt7 for ; Fri, 4 Oct 2024 18:43:44 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 43FD6385DDEC for ; Fri, 4 Oct 2024 08:43:42 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id DD2D43848373 for ; Fri, 4 Oct 2024 08:43:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DD2D43848373 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org DD2D43848373 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2001:470:ea4a:1:5054:ff:fec7:86e4 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728031399; cv=none; b=Dro764Fr5s3Ti7gSCqMzKukYpNT8+TG5EaenGwR5pNRl6R1lsUZQ36E7mmKkI89NLrpj69ZSZh8y74zEZYc7bltAVFO3vScWTVKxvzrbopopK1d3TYYHpBPlcOrd61mbUUl5IesRbcBejAz9Vvr0DXz2f9iHad+zd4QuGXOApsE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728031399; c=relaxed/simple; bh=49GjsN1aDvP+Dz5ElhmOlNlsswtUyyib5dZsuhxP/PI=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=YdZu3vfogfLiIgrcirk9yPwcUazeCUDfibfsEYbBRcio51a1hxpvIM0YDD1MGGbvx1A/jE3rdowcU4hDh/sHQW9wMLmpBnjSHlUivk45AEn19mN0orNlMUX+sB2P8ZrrPxEc4n295BT9AUAoyzOnxQ8DYvevzWV5nsHjRHsJR9c= ARC-Authentication-Results: i=1; server2.sourceware.org From: Sam James To: gcc-patches@gcc.gnu.org Cc: Sam James Subject: [COMMITTED 2/2] testsuite: fix two newly-running -Wstringop-overflow test directives Date: Fri, 4 Oct 2024 09:43:00 +0100 Message-ID: <0fae155090f2ce77fe876b2d16059dbeac6ded6e.1728031380.git.sam@gentoo.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-10.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_PASS, 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: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org This didn't show up until the previous commit which fixed the directive syntax. The indexing was off for the notes. gcc/testsuite/ChangeLog: * gcc.dg/Wstringop-overflow-79.c: Fix index for notes. * gcc.dg/Wstringop-overflow-80.c: Ditto. --- gcc/testsuite/gcc.dg/Wstringop-overflow-79.c | 6 +++--- gcc/testsuite/gcc.dg/Wstringop-overflow-80.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gcc/testsuite/gcc.dg/Wstringop-overflow-79.c b/gcc/testsuite/gcc.dg/Wstringop-overflow-79.c index e97cb91ba18d..87bf775c0b2b 100644 --- a/gcc/testsuite/gcc.dg/Wstringop-overflow-79.c +++ b/gcc/testsuite/gcc.dg/Wstringop-overflow-79.c @@ -29,7 +29,7 @@ void test_3_notes (int i) extern char c[8]; // { dg-message "at offset \\\[3, 6] into destination object 'c'" "note 1" } // { dg-message "at offset \\\[4, 7] into destination object 'c'" "note 2" { target *-*-* } .-1 } // { dg-message "at offset \\\[5, 8] into destination object 'c'" "note 3" { target *-*-* } .-2 } - // { dg-message "at offset \\\[6, 8] into destination object 'c'" "note 3" { target *-*-* } .-2 } + // { dg-message "at offset \\\[6, 8] into destination object 'c'" "note 4" { target *-*-* } .-3 } void test_4_notes (int i) { @@ -50,8 +50,8 @@ void test_4_notes (int i) extern char d[8]; // { dg-message "at offset \\\[3, 6] into destination object 'd'" "note 1" } // { dg-message "at offset \\\[4, 7] into destination object 'd'" "note 2" { target *-*-* } .-1 } // { dg-message "at offset \\\[5, 8] into destination object 'd'" "note 3" { target *-*-* } .-2 } - // { dg-message "at offset \\\[6, 8] into destination object 'd'" "note 3" { target *-*-* } .-3 } - // { dg-message "at offset \\\[7, 8] into destination object 'd'" "note 3" { target *-*-* } .-4 } + // { dg-message "at offset \\\[6, 8] into destination object 'd'" "note 4" { target *-*-* } .-3 } + // { dg-message "at offset \\\[7, 8] into destination object 'd'" "note 5" { target *-*-* } .-4 } void test_5_notes (int i) { diff --git a/gcc/testsuite/gcc.dg/Wstringop-overflow-80.c b/gcc/testsuite/gcc.dg/Wstringop-overflow-80.c index c74ca3a7918b..f49b5ffc636b 100644 --- a/gcc/testsuite/gcc.dg/Wstringop-overflow-80.c +++ b/gcc/testsuite/gcc.dg/Wstringop-overflow-80.c @@ -29,7 +29,7 @@ void test_3_notes (int i) extern char c[8]; // { dg-message "at offset \\\[3, 6] into destination object 'c'" "note 1" } // { dg-message "at offset \\\[4, 7] into destination object 'c'" "note 2" { target *-*-* } .-1 } // { dg-message "at offset \\\[5, 8] into destination object 'c'" "note 3" { target *-*-* } .-2 } - // { dg-message "at offset \\\[6, 8] into destination object 'c'" "note 3" { target *-*-* } .-2 } + // { dg-message "at offset \\\[6, 8] into destination object 'c'" "note 4" { target *-*-* } .-3 } void test_4_notes (int i) { @@ -50,8 +50,8 @@ void test_4_notes (int i) extern char d[8]; // { dg-message "at offset \\\[3, 6] into destination object 'd'" "note 1" } // { dg-message "at offset \\\[4, 7] into destination object 'd'" "note 2" { target *-*-* } .-1 } // { dg-message "at offset \\\[5, 8] into destination object 'd'" "note 3" { target *-*-* } .-2 } - // { dg-message "at offset \\\[6, 8] into destination object 'd'" "note 3" { target *-*-* } .-3 } - // { dg-message "at offset \\\[7, 8] into destination object 'd'" "note 3" { target *-*-* } .-4 } + // { dg-message "at offset \\\[6, 8] into destination object 'd'" "note 4" { target *-*-* } .-3 } + // { dg-message "at offset \\\[7, 8] into destination object 'd'" "note 5" { target *-*-* } .-4 } void test_5_notes (int i) {