From: Jonathan Wakely <jwakely@redhat.com>
To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org
Subject: [committed] libstdc++: Only use dynamic_cast in tests when RTTI is enabled
Date: Fri, 12 Feb 2021 14:45:44 +0000 [thread overview]
Message-ID: <YCaUmIg+5fUT+hw+@redhat.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 519 bytes --]
libstdc++-v3/ChangeLog:
* testsuite/27_io/basic_istringstream/rdbuf/char/2832.cc: Use
static_cast when RTTI is disabled.
* testsuite/27_io/basic_istringstream/rdbuf/wchar_t/2832.cc:
Likewise.
* testsuite/27_io/basic_ostringstream/rdbuf/char/2832.cc:
Likewise.
* testsuite/27_io/basic_ostringstream/rdbuf/wchar_t/2832.cc:
Likewise.
* testsuite/27_io/basic_stringstream/str/char/2.cc:
Likewise.
* testsuite/27_io/basic_stringstream/str/wchar_t/2.cc:
Likewise.
Tested powerpc64le-linux. Committed to trunk.
[-- Attachment #2: patch.txt --]
[-- Type: text/plain, Size: 8590 bytes --]
commit e9c310521182c9359cf23fa9b0c5057b35e8b53f
Author: Jonathan Wakely <jwakely@redhat.com>
Date: Fri Feb 12 11:09:00 2021
libstdc++: Only use dynamic_cast in tests when RTTI is enabled
libstdc++-v3/ChangeLog:
* testsuite/27_io/basic_istringstream/rdbuf/char/2832.cc: Use
static_cast when RTTI is disabled.
* testsuite/27_io/basic_istringstream/rdbuf/wchar_t/2832.cc:
Likewise.
* testsuite/27_io/basic_ostringstream/rdbuf/char/2832.cc:
Likewise.
* testsuite/27_io/basic_ostringstream/rdbuf/wchar_t/2832.cc:
Likewise.
* testsuite/27_io/basic_stringstream/str/char/2.cc:
Likewise.
* testsuite/27_io/basic_stringstream/str/wchar_t/2.cc:
Likewise.
diff --git a/libstdc++-v3/testsuite/27_io/basic_istringstream/rdbuf/char/2832.cc b/libstdc++-v3/testsuite/27_io/basic_istringstream/rdbuf/char/2832.cc
index 00f732fee57..87677c50a13 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istringstream/rdbuf/char/2832.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istringstream/rdbuf/char/2832.cc
@@ -22,8 +22,8 @@
#include <sstream>
#include <testsuite_hooks.h>
-void
-redirect_buffer(std::ios& stream, std::streambuf* new_buf)
+void
+redirect_buffer(std::ios& stream, std::streambuf* new_buf)
{ stream.rdbuf(new_buf); }
std::streambuf*
@@ -50,7 +50,7 @@ void test02()
redirect_buffer(sstrm1, &sbuf);
std::stringbuf* const buf2 = sstrm1.rdbuf();
std::streambuf* pbasebuf2 = active_buffer(sstrm1);
- VERIFY( buf1 == buf2 );
+ VERIFY( buf1 == buf2 );
VERIFY( pbasebuf1 != pbasebuf2 );
VERIFY( pbasebuf2 == pbasebuf0 );
@@ -58,7 +58,11 @@ void test02()
VERIFY( sstrm1.str() != str01 );
VERIFY( sstrm1.str() == str00 );
// however, casting the active streambuf to a stringbuf shows what's up:
+#if __cpp_rtti
std::stringbuf* psbuf = dynamic_cast<std::stringbuf*>(pbasebuf2);
+#else
+ std::stringbuf* psbuf = static_cast<std::stringbuf*>(pbasebuf2);
+#endif
str02 = psbuf->str();
VERIFY( str02 == str01 );
diff --git a/libstdc++-v3/testsuite/27_io/basic_istringstream/rdbuf/wchar_t/2832.cc b/libstdc++-v3/testsuite/27_io/basic_istringstream/rdbuf/wchar_t/2832.cc
index b24ecc6619f..64475b5fc61 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istringstream/rdbuf/wchar_t/2832.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istringstream/rdbuf/wchar_t/2832.cc
@@ -20,8 +20,8 @@
#include <sstream>
#include <testsuite_hooks.h>
-void
-redirect_buffer(std::wios& stream, std::wstreambuf* new_buf)
+void
+redirect_buffer(std::wios& stream, std::wstreambuf* new_buf)
{ stream.rdbuf(new_buf); }
std::wstreambuf*
@@ -48,7 +48,7 @@ void test02()
redirect_buffer(sstrm1, &sbuf);
std::wstringbuf* const buf2 = sstrm1.rdbuf();
std::wstreambuf* pbasebuf2 = active_buffer(sstrm1);
- VERIFY( buf1 == buf2 );
+ VERIFY( buf1 == buf2 );
VERIFY( pbasebuf1 != pbasebuf2 );
VERIFY( pbasebuf2 == pbasebuf0 );
@@ -56,7 +56,11 @@ void test02()
VERIFY( sstrm1.str() != str01 );
VERIFY( sstrm1.str() == str00 );
// however, casting the active streambuf to a stringbuf shows what's up:
+#if __cpp_rtti
std::wstringbuf* psbuf = dynamic_cast<std::wstringbuf*>(pbasebuf2);
+#else
+ std::wstringbuf* psbuf = static_cast<std::wstringbuf*>(pbasebuf2);
+#endif
str02 = psbuf->str();
VERIFY( str02 == str01 );
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostringstream/rdbuf/char/2832.cc b/libstdc++-v3/testsuite/27_io/basic_ostringstream/rdbuf/char/2832.cc
index 825aaf32cef..553edd6c243 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostringstream/rdbuf/char/2832.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostringstream/rdbuf/char/2832.cc
@@ -22,8 +22,8 @@
#include <sstream>
#include <testsuite_hooks.h>
-void
-redirect_buffer(std::ios& stream, std::streambuf* new_buf)
+void
+redirect_buffer(std::ios& stream, std::streambuf* new_buf)
{ stream.rdbuf(new_buf); }
std::streambuf*
@@ -50,7 +50,7 @@ void test02()
redirect_buffer(sstrm1, &sbuf);
std::stringbuf* const buf2 = sstrm1.rdbuf();
std::streambuf* pbasebuf2 = active_buffer(sstrm1);
- VERIFY( buf1 == buf2 );
+ VERIFY( buf1 == buf2 );
VERIFY( pbasebuf1 != pbasebuf2 );
VERIFY( pbasebuf2 == pbasebuf0 );
@@ -58,7 +58,11 @@ void test02()
VERIFY( sstrm1.str() != str01 );
VERIFY( sstrm1.str() == str00 );
// however, casting the active streambuf to a stringbuf shows what's up:
+#if __cpp_rtti
std::stringbuf* psbuf = dynamic_cast<std::stringbuf*>(pbasebuf2);
+#else
+ std::stringbuf* psbuf = static_cast<std::stringbuf*>(pbasebuf2);
+#endif
str02 = psbuf->str();
VERIFY( str02 == str01 );
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostringstream/rdbuf/wchar_t/2832.cc b/libstdc++-v3/testsuite/27_io/basic_ostringstream/rdbuf/wchar_t/2832.cc
index 927ebc207f1..3a1b4e52761 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ostringstream/rdbuf/wchar_t/2832.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostringstream/rdbuf/wchar_t/2832.cc
@@ -20,8 +20,8 @@
#include <sstream>
#include <testsuite_hooks.h>
-void
-redirect_buffer(std::wios& stream, std::wstreambuf* new_buf)
+void
+redirect_buffer(std::wios& stream, std::wstreambuf* new_buf)
{ stream.rdbuf(new_buf); }
std::wstreambuf*
@@ -48,7 +48,7 @@ void test02()
redirect_buffer(sstrm1, &sbuf);
std::wstringbuf* const buf2 = sstrm1.rdbuf();
std::wstreambuf* pbasebuf2 = active_buffer(sstrm1);
- VERIFY( buf1 == buf2 );
+ VERIFY( buf1 == buf2 );
VERIFY( pbasebuf1 != pbasebuf2 );
VERIFY( pbasebuf2 == pbasebuf0 );
@@ -56,7 +56,11 @@ void test02()
VERIFY( sstrm1.str() != str01 );
VERIFY( sstrm1.str() == str00 );
// however, casting the active streambuf to a stringbuf shows what's up:
+#if __cpp_rtti
std::wstringbuf* psbuf = dynamic_cast<std::wstringbuf*>(pbasebuf2);
+#else
+ std::wstringbuf* psbuf = static_cast<std::wstringbuf*>(pbasebuf2);
+#endif
str02 = psbuf->str();
VERIFY( str02 == str01 );
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringstream/str/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_stringstream/str/char/2.cc
index b8c0140fecf..60631df83b5 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringstream/str/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringstream/str/char/2.cc
@@ -22,8 +22,8 @@
#include <sstream>
#include <testsuite_hooks.h>
-void
-redirect_buffer(std::ios& stream, std::streambuf* new_buf)
+void
+redirect_buffer(std::ios& stream, std::streambuf* new_buf)
{ stream.rdbuf(new_buf); }
std::streambuf*
@@ -50,7 +50,7 @@ void test02()
redirect_buffer(sstrm1, &sbuf);
std::stringbuf* const buf2 = sstrm1.rdbuf();
std::streambuf* pbasebuf2 = active_buffer(sstrm1);
- VERIFY( buf1 == buf2 );
+ VERIFY( buf1 == buf2 );
VERIFY( pbasebuf1 != pbasebuf2 );
VERIFY( pbasebuf2 == pbasebuf0 );
@@ -58,7 +58,11 @@ void test02()
VERIFY( sstrm1.str() != str01 );
VERIFY( sstrm1.str() == str00 );
// however, casting the active streambuf to a stringbuf shows what's up:
+#if __cpp_rtti
std::stringbuf* psbuf = dynamic_cast<std::stringbuf*>(pbasebuf2);
+#else
+ std::stringbuf* psbuf = static_cast<std::stringbuf*>(pbasebuf2);
+#endif
str02 = psbuf->str();
VERIFY( str02 == str01 );
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringstream/str/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/basic_stringstream/str/wchar_t/2.cc
index 4f5461ea1c9..4e008a60e63 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringstream/str/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringstream/str/wchar_t/2.cc
@@ -20,8 +20,8 @@
#include <sstream>
#include <testsuite_hooks.h>
-void
-redirect_buffer(std::wios& stream, std::wstreambuf* new_buf)
+void
+redirect_buffer(std::wios& stream, std::wstreambuf* new_buf)
{ stream.rdbuf(new_buf); }
std::wstreambuf*
@@ -48,7 +48,7 @@ void test02()
redirect_buffer(sstrm1, &sbuf);
std::wstringbuf* const buf2 = sstrm1.rdbuf();
std::wstreambuf* pbasebuf2 = active_buffer(sstrm1);
- VERIFY( buf1 == buf2 );
+ VERIFY( buf1 == buf2 );
VERIFY( pbasebuf1 != pbasebuf2 );
VERIFY( pbasebuf2 == pbasebuf0 );
@@ -56,7 +56,11 @@ void test02()
VERIFY( sstrm1.str() != str01 );
VERIFY( sstrm1.str() == str00 );
// however, casting the active streambuf to a stringbuf shows what's up:
+#if __cpp_rtti
std::wstringbuf* psbuf = dynamic_cast<std::wstringbuf*>(pbasebuf2);
+#else
+ std::wstringbuf* psbuf = static_cast<std::wstringbuf*>(pbasebuf2);
+#endif
str02 = psbuf->str();
VERIFY( str02 == str01 );
reply other threads:[~2021-02-12 14:45 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=YCaUmIg+5fUT+hw+@redhat.com \
--to=jwakely@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=libstdc++@gcc.gnu.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).