diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2023-10-13 09:09:32 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2023-10-13 09:09:32 +0200 |
| commit | badb798f5e96a995bb9fa8c4ea48071aa4f2b4b3 (patch) | |
| tree | e80fed2bd2b34102d6877c08023c422fbe6e9320 | |
| parent | 6decda1a35be5764101987c210b5693a0d914e58 (diff) | |
| download | gcc-badb798f5e96a995bb9fa8c4ea48071aa4f2b4b3.zip gcc-badb798f5e96a995bb9fa8c4ea48071aa4f2b4b3.tar.gz gcc-badb798f5e96a995bb9fa8c4ea48071aa4f2b4b3.tar.bz2 | |
libstdc++: Fix tr1/8_c_compatibility/cstdio/functions.cc regression with recent glibc
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).
2023-10-13 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.
| -rw-r--r-- | libstdc++-v3/testsuite/tr1/8_c_compatibility/cstdio/functions.cc | 2 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/tr1/8_c_compatibility/cwchar/functions.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libstdc++-v3/testsuite/tr1/8_c_compatibility/cstdio/functions.cc b/libstdc++-v3/testsuite/tr1/8_c_compatibility/cstdio/functions.cc index 8880946..db8d9dc 100644 --- a/libstdc++-v3/testsuite/tr1/8_c_compatibility/cstdio/functions.cc +++ b/libstdc++-v3/testsuite/tr1/8_c_compatibility/cstdio/functions.cc @@ -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; diff --git a/libstdc++-v3/testsuite/tr1/8_c_compatibility/cwchar/functions.cc b/libstdc++-v3/testsuite/tr1/8_c_compatibility/cwchar/functions.cc index 9fddaf5..df9d7e6 100644 --- a/libstdc++-v3/testsuite/tr1/8_c_compatibility/cwchar/functions.cc +++ b/libstdc++-v3/testsuite/tr1/8_c_compatibility/cwchar/functions.cc @@ -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); |