Message ID | 23ef4bc4-bae7-662e-d6e7-07a60df053d4@honermann.net |
---|---|
State | New |
Headers | show |
Series | : C++ P1423R3 char8_t remediation implementation | expand |
A revised patch is attached that modifies the tests for deleted ostream inserters to require C++2a. This is required by the revision of patch 2/4 that adds proper preprocessor conditionals to the definitions. Tom. On 9/15/19 3:40 PM, Tom Honermann wrote: > This patch adds new tests to validate new deleted overloads of wchar_t, > char8_t, char16_t, and char32_t for ordinary and wide formatted > character and string ostream inserters. > > Additionally, new tests are added to validate invocations of u8path with > sequences of char8_t for both the C++17 and filesystem TS implementations. > > libstdc++-v3/ChangeLog: > > 2019-09-15 Tom Honermann <tom@honermann.net> > > * > libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/deleted.cc: > > New test to validate deleted overloads of character and string > inserters for narrow ostreams. > * > libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/deleted.cc: > > New test to validate deleted overloads of character and string > inserters for wide ostreams. > * > libstdc++-v3/testsuite/27_io/filesystem/path/factory/u8path-char8_t.cc: > New test to validate u8path invocations with sequences of > char8_t. > * > libstdc++-v3/testsuite/experimental/filesystem/path/factory/u8path-char8_t.cc > > New test to validate u8path invocations with sequences of > char8_t. > > Tom.
On Mon, 16 Sep 2019 at 04:34, Tom Honermann <tom@honermann.net> wrote: > > A revised patch is attached that modifies the tests for deleted ostream > inserters to require C++2a. This is required by the revision of patch > 2/4 that adds proper preprocessor conditionals to the definitions. > > Tom. > > On 9/15/19 3:40 PM, Tom Honermann wrote: > > This patch adds new tests to validate new deleted overloads of wchar_t, > > char8_t, char16_t, and char32_t for ordinary and wide formatted > > character and string ostream inserters. > > > > Additionally, new tests are added to validate invocations of u8path with > > sequences of char8_t for both the C++17 and filesystem TS implementations. > > > > libstdc++-v3/ChangeLog: > > > > 2019-09-15 Tom Honermann <tom@honermann.net> > > > > * > > libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/deleted.cc: > > > > New test to validate deleted overloads of character and string > > inserters for narrow ostreams. > > * > > libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/deleted.cc: > > > > New test to validate deleted overloads of character and string > > inserters for wide ostreams. > > * > > libstdc++-v3/testsuite/27_io/filesystem/path/factory/u8path-char8_t.cc: > > New test to validate u8path invocations with sequences of > > char8_t. > > * > > libstdc++-v3/testsuite/experimental/filesystem/path/factory/u8path-char8_t.cc > > > > New test to validate u8path invocations with sequences of > > char8_t. > > Hi, I've noticed that the new test 27_io/filesystem/path/factory/u8path-char8_t.cc fails to compile on arm-none-eabi with default cpu/fpu, because: /tools/arm-none-eabi/bin/ld: /obj-arm-none-eabi/gcc3/arm-none-eabi/libstdc++-v3/src/.libs/libstdc++.a(string-inst.o): in function `_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEaSEOS4_': string-inst.cc:(.text._ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEaSEOS4_[_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEaSEOS4_]+0xf4): undefined reference to `_ZSt15__alloc_on_moveISaIcEEvRT_S2_' [etc...] The one in experimental is unsupported thanks to // { dg-require-filesystem-ts "" } Should that be added to the version in 27_io? Thanks, Christophe > > Tom. >
On 03/12/19 09:11 +0100, Christophe Lyon wrote: >On Mon, 16 Sep 2019 at 04:34, Tom Honermann <tom@honermann.net> wrote: >> >> A revised patch is attached that modifies the tests for deleted ostream >> inserters to require C++2a. This is required by the revision of patch >> 2/4 that adds proper preprocessor conditionals to the definitions. >> >> Tom. >> >> On 9/15/19 3:40 PM, Tom Honermann wrote: >> > This patch adds new tests to validate new deleted overloads of wchar_t, >> > char8_t, char16_t, and char32_t for ordinary and wide formatted >> > character and string ostream inserters. >> > >> > Additionally, new tests are added to validate invocations of u8path with >> > sequences of char8_t for both the C++17 and filesystem TS implementations. >> > >> > libstdc++-v3/ChangeLog: >> > >> > 2019-09-15 Tom Honermann <tom@honermann.net> >> > >> > * >> > libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/deleted.cc: >> > >> > New test to validate deleted overloads of character and string >> > inserters for narrow ostreams. >> > * >> > libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/deleted.cc: >> > >> > New test to validate deleted overloads of character and string >> > inserters for wide ostreams. >> > * >> > libstdc++-v3/testsuite/27_io/filesystem/path/factory/u8path-char8_t.cc: >> > New test to validate u8path invocations with sequences of >> > char8_t. >> > * >> > libstdc++-v3/testsuite/experimental/filesystem/path/factory/u8path-char8_t.cc >> > >> > New test to validate u8path invocations with sequences of >> > char8_t. >> > > >Hi, > >I've noticed that the new test >27_io/filesystem/path/factory/u8path-char8_t.cc >fails to compile on arm-none-eabi with default cpu/fpu, because: >/tools/arm-none-eabi/bin/ld: >/obj-arm-none-eabi/gcc3/arm-none-eabi/libstdc++-v3/src/.libs/libstdc++.a(string-inst.o): >in function `_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEaSEOS4_': >string-inst.cc:(.text._ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEaSEOS4_[_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEaSEOS4_]+0xf4): >undefined reference to `_ZSt15__alloc_on_moveISaIcEEvRT_S2_' >[etc...] That function is defined inline and so should be instantiated in any TU that needs it, and so should not give linker errors. There was a similar bug reported the other day that turned out to be pilot error: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92733 >The one in experimental is unsupported thanks to >// { dg-require-filesystem-ts "" } >Should that be added to the version in 27_io? No, the std::filesystem::path class has no dependencies, it should work everywhere. I'm not sure what's happening here.
On Tue, 3 Dec 2019 at 10:16, Jonathan Wakely <jwakely@redhat.com> wrote: > > On 03/12/19 09:11 +0100, Christophe Lyon wrote: > >On Mon, 16 Sep 2019 at 04:34, Tom Honermann <tom@honermann.net> wrote: > >> > >> A revised patch is attached that modifies the tests for deleted ostream > >> inserters to require C++2a. This is required by the revision of patch > >> 2/4 that adds proper preprocessor conditionals to the definitions. > >> > >> Tom. > >> > >> On 9/15/19 3:40 PM, Tom Honermann wrote: > >> > This patch adds new tests to validate new deleted overloads of wchar_t, > >> > char8_t, char16_t, and char32_t for ordinary and wide formatted > >> > character and string ostream inserters. > >> > > >> > Additionally, new tests are added to validate invocations of u8path with > >> > sequences of char8_t for both the C++17 and filesystem TS implementations. > >> > > >> > libstdc++-v3/ChangeLog: > >> > > >> > 2019-09-15 Tom Honermann <tom@honermann.net> > >> > > >> > * > >> > libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/deleted.cc: > >> > > >> > New test to validate deleted overloads of character and string > >> > inserters for narrow ostreams. > >> > * > >> > libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/deleted.cc: > >> > > >> > New test to validate deleted overloads of character and string > >> > inserters for wide ostreams. > >> > * > >> > libstdc++-v3/testsuite/27_io/filesystem/path/factory/u8path-char8_t.cc: > >> > New test to validate u8path invocations with sequences of > >> > char8_t. > >> > * > >> > libstdc++-v3/testsuite/experimental/filesystem/path/factory/u8path-char8_t.cc > >> > > >> > New test to validate u8path invocations with sequences of > >> > char8_t. > >> > > > > >Hi, > > > >I've noticed that the new test > >27_io/filesystem/path/factory/u8path-char8_t.cc > >fails to compile on arm-none-eabi with default cpu/fpu, because: > >/tools/arm-none-eabi/bin/ld: > >/obj-arm-none-eabi/gcc3/arm-none-eabi/libstdc++-v3/src/.libs/libstdc++.a(string-inst.o): > >in function `_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEaSEOS4_': > >string-inst.cc:(.text._ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEaSEOS4_[_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEaSEOS4_]+0xf4): > >undefined reference to `_ZSt15__alloc_on_moveISaIcEEvRT_S2_' > >[etc...] > > That function is defined inline and so should be instantiated in any > TU that needs it, and so should not give linker errors. There was a > similar bug reported the other day that turned out to be pilot error: > https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92733 > Hi, Sorry for the delay, it took me a while to reproduce the problem manually. I think I see this because I build that particular configuration with CXXFLAGS_FOR_TARGET=-fno-threadsafe-statics Does that sound plausible? > >The one in experimental is unsupported thanks to > >// { dg-require-filesystem-ts "" } > >Should that be added to the version in 27_io? > > No, the std::filesystem::path class has no dependencies, it should > work everywhere. I'm not sure what's happening here. >
On 05/12/19 09:00 +0100, Christophe Lyon wrote: >On Tue, 3 Dec 2019 at 10:16, Jonathan Wakely <jwakely@redhat.com> wrote: >> >> On 03/12/19 09:11 +0100, Christophe Lyon wrote: >> >On Mon, 16 Sep 2019 at 04:34, Tom Honermann <tom@honermann.net> wrote: >> >> >> >> A revised patch is attached that modifies the tests for deleted ostream >> >> inserters to require C++2a. This is required by the revision of patch >> >> 2/4 that adds proper preprocessor conditionals to the definitions. >> >> >> >> Tom. >> >> >> >> On 9/15/19 3:40 PM, Tom Honermann wrote: >> >> > This patch adds new tests to validate new deleted overloads of wchar_t, >> >> > char8_t, char16_t, and char32_t for ordinary and wide formatted >> >> > character and string ostream inserters. >> >> > >> >> > Additionally, new tests are added to validate invocations of u8path with >> >> > sequences of char8_t for both the C++17 and filesystem TS implementations. >> >> > >> >> > libstdc++-v3/ChangeLog: >> >> > >> >> > 2019-09-15 Tom Honermann <tom@honermann.net> >> >> > >> >> > * >> >> > libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/deleted.cc: >> >> > >> >> > New test to validate deleted overloads of character and string >> >> > inserters for narrow ostreams. >> >> > * >> >> > libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/deleted.cc: >> >> > >> >> > New test to validate deleted overloads of character and string >> >> > inserters for wide ostreams. >> >> > * >> >> > libstdc++-v3/testsuite/27_io/filesystem/path/factory/u8path-char8_t.cc: >> >> > New test to validate u8path invocations with sequences of >> >> > char8_t. >> >> > * >> >> > libstdc++-v3/testsuite/experimental/filesystem/path/factory/u8path-char8_t.cc >> >> > >> >> > New test to validate u8path invocations with sequences of >> >> > char8_t. >> >> > >> > >> >Hi, >> > >> >I've noticed that the new test >> >27_io/filesystem/path/factory/u8path-char8_t.cc >> >fails to compile on arm-none-eabi with default cpu/fpu, because: >> >/tools/arm-none-eabi/bin/ld: >> >/obj-arm-none-eabi/gcc3/arm-none-eabi/libstdc++-v3/src/.libs/libstdc++.a(string-inst.o): >> >in function `_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEaSEOS4_': >> >string-inst.cc:(.text._ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEaSEOS4_[_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEaSEOS4_]+0xf4): >> >undefined reference to `_ZSt15__alloc_on_moveISaIcEEvRT_S2_' >> >[etc...] >> >> That function is defined inline and so should be instantiated in any >> TU that needs it, and so should not give linker errors. There was a >> similar bug reported the other day that turned out to be pilot error: >> https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92733 >> >Hi, >Sorry for the delay, it took me a while to reproduce the problem manually. >I think I see this because I build that particular configuration with >CXXFLAGS_FOR_TARGET=-fno-threadsafe-statics > >Does that sound plausible? Not really ... I still don't know why that function template would ever be undefined.
On Thu, 5 Dec 2019 at 12:43, Jonathan Wakely <jwakely@redhat.com> wrote: > > On 05/12/19 09:00 +0100, Christophe Lyon wrote: > >On Tue, 3 Dec 2019 at 10:16, Jonathan Wakely <jwakely@redhat.com> wrote: > >> > >> On 03/12/19 09:11 +0100, Christophe Lyon wrote: > >> >On Mon, 16 Sep 2019 at 04:34, Tom Honermann <tom@honermann.net> wrote: > >> >> > >> >> A revised patch is attached that modifies the tests for deleted ostream > >> >> inserters to require C++2a. This is required by the revision of patch > >> >> 2/4 that adds proper preprocessor conditionals to the definitions. > >> >> > >> >> Tom. > >> >> > >> >> On 9/15/19 3:40 PM, Tom Honermann wrote: > >> >> > This patch adds new tests to validate new deleted overloads of wchar_t, > >> >> > char8_t, char16_t, and char32_t for ordinary and wide formatted > >> >> > character and string ostream inserters. > >> >> > > >> >> > Additionally, new tests are added to validate invocations of u8path with > >> >> > sequences of char8_t for both the C++17 and filesystem TS implementations. > >> >> > > >> >> > libstdc++-v3/ChangeLog: > >> >> > > >> >> > 2019-09-15 Tom Honermann <tom@honermann.net> > >> >> > > >> >> > * > >> >> > libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/deleted.cc: > >> >> > > >> >> > New test to validate deleted overloads of character and string > >> >> > inserters for narrow ostreams. > >> >> > * > >> >> > libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/deleted.cc: > >> >> > > >> >> > New test to validate deleted overloads of character and string > >> >> > inserters for wide ostreams. > >> >> > * > >> >> > libstdc++-v3/testsuite/27_io/filesystem/path/factory/u8path-char8_t.cc: > >> >> > New test to validate u8path invocations with sequences of > >> >> > char8_t. > >> >> > * > >> >> > libstdc++-v3/testsuite/experimental/filesystem/path/factory/u8path-char8_t.cc > >> >> > > >> >> > New test to validate u8path invocations with sequences of > >> >> > char8_t. > >> >> > > >> > > >> >Hi, > >> > > >> >I've noticed that the new test > >> >27_io/filesystem/path/factory/u8path-char8_t.cc > >> >fails to compile on arm-none-eabi with default cpu/fpu, because: > >> >/tools/arm-none-eabi/bin/ld: > >> >/obj-arm-none-eabi/gcc3/arm-none-eabi/libstdc++-v3/src/.libs/libstdc++.a(string-inst.o): > >> >in function `_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEaSEOS4_': > >> >string-inst.cc:(.text._ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEaSEOS4_[_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEaSEOS4_]+0xf4): > >> >undefined reference to `_ZSt15__alloc_on_moveISaIcEEvRT_S2_' > >> >[etc...] > >> > >> That function is defined inline and so should be instantiated in any > >> TU that needs it, and so should not give linker errors. There was a > >> similar bug reported the other day that turned out to be pilot error: > >> https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92733 > >> > >Hi, > >Sorry for the delay, it took me a while to reproduce the problem manually. > >I think I see this because I build that particular configuration with > >CXXFLAGS_FOR_TARGET=-fno-threadsafe-statics > > > >Does that sound plausible? > > Not really ... I still don't know why that function template would > ever be undefined. > Hmmm that's because doing CXXFLAGS_FOR_TARGET means that the generated Makefile contains: CXXFLAGS = -fno-threadsafe-statics while if I don't define CXXFLAGS_FOR_TARGET, it contains CXXFLAGS = -g -O2 -D_GNU_SOURCE Re-compiling string-inst with -O2 removes the undefined reference Sigh... looks like I fixed something similar 7 years ago :-( https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=189046 So... the current configure.ac code makes sure -O2 and -g are present in CXXFLAGS_FOR_TARGET only if it's derived from CXXFLAGS, which happens only when CXXFLAGS_FOR_TARGET is NOT overridden, and not cross-compiling... We have: case " $CXXFLAGS " in *" -O2 "*) ;; *) CXXFLAGS_FOR_TARGET="-O2 $CXXFLAGS_FOR_TARGET" ;; esac Why isn't it case "$CXXFLAGS_FOR_TARGET" instead? And that whole case/esac should be after the 'fi'. Or is it that way on purpose? So it seems the fix for the problem I saw is for me to use CXXFLAGS_FOR_TARGET="-O2 -g -fno-threadsafe-statics" Christophe
On 05/12/19 17:12 +0100, Christophe Lyon wrote: >On Thu, 5 Dec 2019 at 12:43, Jonathan Wakely <jwakely@redhat.com> wrote: >> >> On 05/12/19 09:00 +0100, Christophe Lyon wrote: >> >On Tue, 3 Dec 2019 at 10:16, Jonathan Wakely <jwakely@redhat.com> wrote: >> >> >> >> On 03/12/19 09:11 +0100, Christophe Lyon wrote: >> >> >On Mon, 16 Sep 2019 at 04:34, Tom Honermann <tom@honermann.net> wrote: >> >> >> >> >> >> A revised patch is attached that modifies the tests for deleted ostream >> >> >> inserters to require C++2a. This is required by the revision of patch >> >> >> 2/4 that adds proper preprocessor conditionals to the definitions. >> >> >> >> >> >> Tom. >> >> >> >> >> >> On 9/15/19 3:40 PM, Tom Honermann wrote: >> >> >> > This patch adds new tests to validate new deleted overloads of wchar_t, >> >> >> > char8_t, char16_t, and char32_t for ordinary and wide formatted >> >> >> > character and string ostream inserters. >> >> >> > >> >> >> > Additionally, new tests are added to validate invocations of u8path with >> >> >> > sequences of char8_t for both the C++17 and filesystem TS implementations. >> >> >> > >> >> >> > libstdc++-v3/ChangeLog: >> >> >> > >> >> >> > 2019-09-15 Tom Honermann <tom@honermann.net> >> >> >> > >> >> >> > * >> >> >> > libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/deleted.cc: >> >> >> > >> >> >> > New test to validate deleted overloads of character and string >> >> >> > inserters for narrow ostreams. >> >> >> > * >> >> >> > libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/deleted.cc: >> >> >> > >> >> >> > New test to validate deleted overloads of character and string >> >> >> > inserters for wide ostreams. >> >> >> > * >> >> >> > libstdc++-v3/testsuite/27_io/filesystem/path/factory/u8path-char8_t.cc: >> >> >> > New test to validate u8path invocations with sequences of >> >> >> > char8_t. >> >> >> > * >> >> >> > libstdc++-v3/testsuite/experimental/filesystem/path/factory/u8path-char8_t.cc >> >> >> > >> >> >> > New test to validate u8path invocations with sequences of >> >> >> > char8_t. >> >> >> > >> >> > >> >> >Hi, >> >> > >> >> >I've noticed that the new test >> >> >27_io/filesystem/path/factory/u8path-char8_t.cc >> >> >fails to compile on arm-none-eabi with default cpu/fpu, because: >> >> >/tools/arm-none-eabi/bin/ld: >> >> >/obj-arm-none-eabi/gcc3/arm-none-eabi/libstdc++-v3/src/.libs/libstdc++.a(string-inst.o): >> >> >in function `_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEaSEOS4_': >> >> >string-inst.cc:(.text._ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEaSEOS4_[_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEaSEOS4_]+0xf4): >> >> >undefined reference to `_ZSt15__alloc_on_moveISaIcEEvRT_S2_' >> >> >[etc...] >> >> >> >> That function is defined inline and so should be instantiated in any >> >> TU that needs it, and so should not give linker errors. There was a >> >> similar bug reported the other day that turned out to be pilot error: >> >> https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92733 >> >> >> >Hi, >> >Sorry for the delay, it took me a while to reproduce the problem manually. >> >I think I see this because I build that particular configuration with >> >CXXFLAGS_FOR_TARGET=-fno-threadsafe-statics >> > >> >Does that sound plausible? >> >> Not really ... I still don't know why that function template would >> ever be undefined. >> > >Hmmm that's because doing CXXFLAGS_FOR_TARGET means that the generated >Makefile contains: >CXXFLAGS = -fno-threadsafe-statics >while if I don't define CXXFLAGS_FOR_TARGET, it contains >CXXFLAGS = -g -O2 -D_GNU_SOURCE > >Re-compiling string-inst with -O2 removes the undefined reference > >Sigh... looks like I fixed something similar 7 years ago :-( >https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=189046 > >So... the current configure.ac code makes sure -O2 and -g are present >in CXXFLAGS_FOR_TARGET only if it's derived from CXXFLAGS, which >happens only when CXXFLAGS_FOR_TARGET is NOT overridden, and not >cross-compiling... > >We have: > case " $CXXFLAGS " in > *" -O2 "*) ;; > *) CXXFLAGS_FOR_TARGET="-O2 $CXXFLAGS_FOR_TARGET" ;; > esac > >Why isn't it case "$CXXFLAGS_FOR_TARGET" instead? And that whole >case/esac should be after the 'fi'. >Or is it that way on purpose? > >So it seems the fix for the problem I saw is for me to use >CXXFLAGS_FOR_TARGET="-O2 -g -fno-threadsafe-statics" This is https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92927 and thanks to the bisected revision number in the PR I see what the problem is.
On 19/12/19 09:36 +0000, Jonathan Wakely wrote: >On 05/12/19 17:12 +0100, Christophe Lyon wrote: >>On Thu, 5 Dec 2019 at 12:43, Jonathan Wakely <jwakely@redhat.com> wrote: >>> >>>On 05/12/19 09:00 +0100, Christophe Lyon wrote: >>>>On Tue, 3 Dec 2019 at 10:16, Jonathan Wakely <jwakely@redhat.com> wrote: >>>>> >>>>> On 03/12/19 09:11 +0100, Christophe Lyon wrote: >>>>> >On Mon, 16 Sep 2019 at 04:34, Tom Honermann <tom@honermann.net> wrote: >>>>> >> >>>>> >> A revised patch is attached that modifies the tests for deleted ostream >>>>> >> inserters to require C++2a. This is required by the revision of patch >>>>> >> 2/4 that adds proper preprocessor conditionals to the definitions. >>>>> >> >>>>> >> Tom. >>>>> >> >>>>> >> On 9/15/19 3:40 PM, Tom Honermann wrote: >>>>> >> > This patch adds new tests to validate new deleted overloads of wchar_t, >>>>> >> > char8_t, char16_t, and char32_t for ordinary and wide formatted >>>>> >> > character and string ostream inserters. >>>>> >> > >>>>> >> > Additionally, new tests are added to validate invocations of u8path with >>>>> >> > sequences of char8_t for both the C++17 and filesystem TS implementations. >>>>> >> > >>>>> >> > libstdc++-v3/ChangeLog: >>>>> >> > >>>>> >> > 2019-09-15 Tom Honermann <tom@honermann.net> >>>>> >> > >>>>> >> > * >>>>> >> > libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/deleted.cc: >>>>> >> > >>>>> >> > New test to validate deleted overloads of character and string >>>>> >> > inserters for narrow ostreams. >>>>> >> > * >>>>> >> > libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/deleted.cc: >>>>> >> > >>>>> >> > New test to validate deleted overloads of character and string >>>>> >> > inserters for wide ostreams. >>>>> >> > * >>>>> >> > libstdc++-v3/testsuite/27_io/filesystem/path/factory/u8path-char8_t.cc: >>>>> >> > New test to validate u8path invocations with sequences of >>>>> >> > char8_t. >>>>> >> > * >>>>> >> > libstdc++-v3/testsuite/experimental/filesystem/path/factory/u8path-char8_t.cc >>>>> >> > >>>>> >> > New test to validate u8path invocations with sequences of >>>>> >> > char8_t. >>>>> >> > >>>>> > >>>>> >Hi, >>>>> > >>>>> >I've noticed that the new test >>>>> >27_io/filesystem/path/factory/u8path-char8_t.cc >>>>> >fails to compile on arm-none-eabi with default cpu/fpu, because: >>>>> >/tools/arm-none-eabi/bin/ld: >>>>> >/obj-arm-none-eabi/gcc3/arm-none-eabi/libstdc++-v3/src/.libs/libstdc++.a(string-inst.o): >>>>> >in function `_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEaSEOS4_': >>>>> >string-inst.cc:(.text._ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEaSEOS4_[_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEaSEOS4_]+0xf4): >>>>> >undefined reference to `_ZSt15__alloc_on_moveISaIcEEvRT_S2_' >>>>> >[etc...] >>>>> >>>>> That function is defined inline and so should be instantiated in any >>>>> TU that needs it, and so should not give linker errors. There was a >>>>> similar bug reported the other day that turned out to be pilot error: >>>>> https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92733 >>>>> >>>>Hi, >>>>Sorry for the delay, it took me a while to reproduce the problem manually. >>>>I think I see this because I build that particular configuration with >>>>CXXFLAGS_FOR_TARGET=-fno-threadsafe-statics >>>> >>>>Does that sound plausible? >>> >>>Not really ... I still don't know why that function template would >>>ever be undefined. >>> >> >>Hmmm that's because doing CXXFLAGS_FOR_TARGET means that the generated >>Makefile contains: >>CXXFLAGS = -fno-threadsafe-statics >>while if I don't define CXXFLAGS_FOR_TARGET, it contains >>CXXFLAGS = -g -O2 -D_GNU_SOURCE >> >>Re-compiling string-inst with -O2 removes the undefined reference >> >>Sigh... looks like I fixed something similar 7 years ago :-( >>https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=189046 >> >>So... the current configure.ac code makes sure -O2 and -g are present >>in CXXFLAGS_FOR_TARGET only if it's derived from CXXFLAGS, which >>happens only when CXXFLAGS_FOR_TARGET is NOT overridden, and not >>cross-compiling... >> >>We have: >> case " $CXXFLAGS " in >> *" -O2 "*) ;; >> *) CXXFLAGS_FOR_TARGET="-O2 $CXXFLAGS_FOR_TARGET" ;; >> esac >> >>Why isn't it case "$CXXFLAGS_FOR_TARGET" instead? And that whole >>case/esac should be after the 'fi'. >>Or is it that way on purpose? >> >>So it seems the fix for the problem I saw is for me to use >>CXXFLAGS_FOR_TARGET="-O2 -g -fno-threadsafe-statics" > >This is https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92927 and thanks >to the bisected revision number in the PR I see what the problem is. To be clear, PR 92927 is about the undefined references when building with -O0, and will be fixed soon by the attached patch that I've just committed to trunk. I don't know the answer to the question about CXXFLAGS_FOR_TARGET, and don't know if it's that way on purpose. Please feel free to create a bug for it, or propose a patch.
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/deleted.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/deleted.cc new file mode 100644 index 00000000000..87afb295086 --- /dev/null +++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/deleted.cc @@ -0,0 +1,43 @@ +// Copyright (C) 2019 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// <http://www.gnu.org/licenses/>. + +// 29.7.2 Header <ostream> synopsys; deleted character inserters. + +// Test character inserters defined as deleted by P1423. + +// { dg-options "-std=gnu++17 -fchar8_t" } +// { dg-do compile { target c++17 } } + +#include <ostream> + +void test_character_inserters(std::ostream &os) +{ + os << 'x'; // ok. + os << L'x'; // { dg-error "use of deleted function" } + os << u8'x'; // { dg-error "use of deleted function" } + os << u'x'; // { dg-error "use of deleted function" } + os << U'x'; // { dg-error "use of deleted function" } +} + +void test_string_inserters(std::ostream &os) +{ + os << "text"; // ok. + os << L"text"; // { dg-error "use of deleted function" } + os << u8"text"; // { dg-error "use of deleted function" } + os << u"text"; // { dg-error "use of deleted function" } + os << U"text"; // { dg-error "use of deleted function" } +} diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/deleted.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/deleted.cc new file mode 100644 index 00000000000..701de16822b --- /dev/null +++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/deleted.cc @@ -0,0 +1,43 @@ +// Copyright (C) 2019 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// <http://www.gnu.org/licenses/>. + +// 29.7.2 Header <ostream> synopsys; deleted character inserters. + +// Test wide character inserters defined as deleted by P1423. + +// { dg-options "-std=gnu++17 -fchar8_t" } +// { dg-do compile { target c++17 } } + +#include <ostream> + +void test_character_inserters(std::wostream &os) +{ + os << 'x'; // ok. + os << L'x'; // ok. + os << u8'x'; // { dg-error "use of deleted function" } + os << u'x'; // { dg-error "use of deleted function" } + os << U'x'; // { dg-error "use of deleted function" } +} + +void test_string_inserters(std::wostream &os) +{ + os << "text"; // ok. + os << L"text"; // ok. + os << u8"text"; // { dg-error "use of deleted function" } + os << u"text"; // { dg-error "use of deleted function" } + os << U"text"; // { dg-error "use of deleted function" } +} diff --git a/libstdc++-v3/testsuite/27_io/filesystem/path/factory/u8path-char8_t.cc b/libstdc++-v3/testsuite/27_io/filesystem/path/factory/u8path-char8_t.cc new file mode 100644 index 00000000000..867ee5b3856 --- /dev/null +++ b/libstdc++-v3/testsuite/27_io/filesystem/path/factory/u8path-char8_t.cc @@ -0,0 +1,60 @@ +// Copyright (C) 2019 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// <http://www.gnu.org/licenses/>. + +// { dg-options "-std=gnu++17 -fchar8_t" } +// { dg-do run { target c++17 } } + +#include <filesystem> +#include <string_view> +#include <testsuite_hooks.h> + +namespace fs = std::filesystem; + +void +test01() +{ + fs::path p = fs::u8path(u8""); + VERIFY( p.empty() ); + + p = fs::u8path(u8"filename1"); + VERIFY( p.u8string() == u8"filename1" ); + + p = fs::u8path(u8"\xf0\x9d\x84\x9e"); + VERIFY( p.u8string() == u8"\U0001D11E" ); + + std::u8string s1 = u8"filename2"; + p = fs::u8path(s1); + VERIFY( p.u8string() == u8"filename2" ); + + std::u8string s2 = u8"filename3"; + p = fs::u8path(s2.begin(), s2.end()); + VERIFY( p.u8string() == u8"filename3" ); + + std::u8string_view sv1{ s1 }; + p = fs::u8path(sv1); + VERIFY( p.u8string() == u8"filename2" ); + + std::u8string_view sv2{ s2 }; + p = fs::u8path(sv2.begin(), sv2.end()); + VERIFY( p.u8string() == u8"filename3" ); +} + +int +main() +{ + test01(); +} diff --git a/libstdc++-v3/testsuite/experimental/filesystem/path/factory/u8path-char8_t.cc b/libstdc++-v3/testsuite/experimental/filesystem/path/factory/u8path-char8_t.cc new file mode 100644 index 00000000000..dc509c3f912 --- /dev/null +++ b/libstdc++-v3/testsuite/experimental/filesystem/path/factory/u8path-char8_t.cc @@ -0,0 +1,52 @@ +// Copyright (C) 2019 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// <http://www.gnu.org/licenses/>. + +// { dg-options "-lstdc++fs -fchar8_t" } +// { dg-do run { target c++11 } } +// { dg-require-filesystem-ts "" } + +#include <experimental/filesystem> +#include <testsuite_hooks.h> + +namespace fs = std::experimental::filesystem; + +void +test01() +{ + fs::path p = fs::u8path(u8""); + VERIFY( p.empty() ); + + p = fs::u8path(u8"filename1"); + VERIFY( p.u8string() == u8"filename1" ); + + p = fs::u8path(u8"\xf0\x9d\x84\x9e"); + VERIFY( p.u8string() == u8"\U0001D11E" ); + + std::u8string s1 = u8"filename2"; + p = fs::u8path(s1); + VERIFY( p.u8string() == u8"filename2" ); + + std::u8string s2 = u8"filename3"; + p = fs::u8path(s2.begin(), s2.end()); + VERIFY( p.u8string() == u8"filename3" ); +} + +int +main() +{ + test01(); +}