From: Jonathan Wakely <jwakely@redhat.com>
To: Jakub Jelinek <jakub@redhat.com>
Cc: "libstdc++@gcc.gnu.org" <libstdc++@gcc.gnu.org>,
"gcc-patches@gcc.gnu.org" <gcc-patches@gcc.gnu.org>,
Siddhesh Poyarekar <siddhesh@gotplt.org>
Subject: Re: [PATCH] libstdc++: Fix tr1/8_c_compatibility/cstdio/functions.cc regression with recent glibc
Date: Thu, 12 Oct 2023 13:05:55 +0100 [thread overview]
Message-ID: <CACb0b4n9gnG3HSZO18QWPowy=4V3Czza2AXZKVc=uLyS_RDe6g@mail.gmail.com> (raw)
In-Reply-To: <ZSemG6R7RSlzJUnI@tucnak>
[-- Attachment #1: Type: text/plain, Size: 1867 bytes --]
On Thursday, 12 October 2023, Jakub Jelinek <jakub@redhat.com> wrote:
> Hi!
>
> The following testcase started FAILing recently after the
>
https://sourceware.org/git/?p=glibc.git;a=commit;h=64b1a44183a3094672ed304532bedb9acc707554
> glibc change which marked vfscanf with nonnull (1) attribute.
> While vfwscanf hasn't been marked similarly (strangely), the patch changes
> that too. By using va_arg one hides the value of it from the compiler
> (volatile keyword would do too, or making the FILE* stream a function
> argument, but then it might need to be guarded by #if or something).
>
> Tested on x86_64-linux, ok for trunk?
OK, thanks.
>
> 2023-10-12 Jakub Jelinek <jakub@redhat.com>
>
> * testsuite/tr1/8_c_compatibility/cstdio/functions.cc (test01):
> Initialize stream to va_arg(ap, FILE*) rather than 0.
> * testsuite/tr1/8_c_compatibility/cwchar/functions.cc (test01):
> Likewise.
>
> --- libstdc++-v3/testsuite/tr1/8_c_compatibility/cstdio/functions.cc.jj
2023-01-16 23:19:06.651711546 +0100
> +++ libstdc++-v3/testsuite/tr1/8_c_compatibility/cstdio/functions.cc
2023-10-12 09:46:28.695011763 +0200
> @@ -35,7 +35,7 @@ void test01(int dummy, ...)
> char* s = 0;
> const char* cs = 0;
> const char* format = "%i";
> - FILE* stream = 0;
> + FILE* stream = va_arg(ap, FILE*);
> std::size_t n = 0;
>
> int ret;
> --- libstdc++-v3/testsuite/tr1/8_c_compatibility/cwchar/functions.cc.jj
2023-01-16 23:19:06.651711546 +0100
> +++ libstdc++-v3/testsuite/tr1/8_c_compatibility/cwchar/functions.cc
2023-10-12 09:46:19.236141897 +0200
> @@ -42,7 +42,7 @@ void test01(int dummy, ...)
> #endif
>
> #if _GLIBCXX_HAVE_VFWSCANF
> - FILE* stream = 0;
> + FILE* stream = va_arg(arg, FILE*);
> const wchar_t* format1 = 0;
> int ret1;
> ret1 = std::tr1::vfwscanf(stream, format1, arg);
>
> Jakub
>
>
prev parent reply other threads:[~2023-10-12 12:06 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-12 7:54 Jakub Jelinek
2023-10-12 12:05 ` Jonathan Wakely [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CACb0b4n9gnG3HSZO18QWPowy=4V3Czza2AXZKVc=uLyS_RDe6g@mail.gmail.com' \
--to=jwakely@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=jakub@redhat.com \
--cc=libstdc++@gcc.gnu.org \
--cc=siddhesh@gotplt.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).