test _LIBCPP_HIDE_FROM_ABI on sentry methods

Author: jeremyd2019

libcxx/include/__ostream/basic_ostream.h

@@ -180,43 +180,45 @@ class basic_ostream : virtual public basic_ios<_CharT, _Traits> {
   _LIBCPP_HIDE_FROM_ABI basic_ostream() {} // extension, intentially does not initialize
 };
 
+#if defined(__MINGW32__) || defined(__CYGWIN__)
+#  define _LIBCPP_HIDE_INNER_CLASS_METHOD _LIBCPP_HIDE_FROM_ABI
+#else
+#  define _LIBCPP_HIDE_INNER_CLASS_METHOD _LIBCPP_HIDE_FROM_ABI_AFTER_V1
+#endif
+
 template <class _CharT, class _Traits>
 class basic_ostream<_CharT, _Traits>::sentry {
   bool __ok_;
   basic_ostream<_CharT, _Traits>& __os_;
 
 public:
-  explicit sentry(basic_ostream<_CharT, _Traits>& __os);
-  ~sentry();
-  sentry(const sentry&)            = delete;
-  sentry& operator=(const sentry&) = delete;
-
-  _LIBCPP_HIDE_FROM_ABI explicit operator bool() const { return __ok_; }
-};
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>::sentry::sentry(basic_ostream<_CharT, _Traits>& __os) : __ok_(false), __os_(__os) {
-  if (__os.good()) {
-    if (__os.tie())
-      __os.tie()->flush();
-    __ok_ = true;
+  _LIBCPP_HIDE_INNER_CLASS_METHOD explicit sentry(basic_ostream<_CharT, _Traits>& __os) : __ok_(false), __os_(__os) {
+    if (__os.good()) {
+      if (__os.tie())
+        __os.tie()->flush();
+      __ok_ = true;
+    }
   }
-}
 
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>::sentry::~sentry() {
-  if (__os_.rdbuf() && __os_.good() && (__os_.flags() & ios_base::unitbuf) && uncaught_exceptions() == 0) {
+  _LIBCPP_HIDE_INNER_CLASS_METHOD ~sentry() {
+    if (__os_.rdbuf() && __os_.good() && (__os_.flags() & ios_base::unitbuf) && uncaught_exceptions() == 0) {
 #  if _LIBCPP_HAS_EXCEPTIONS
-    try {
+      try {
 #  endif // _LIBCPP_HAS_EXCEPTIONS
-      if (__os_.rdbuf()->pubsync() == -1)
-        __os_.setstate(ios_base::badbit);
+        if (__os_.rdbuf()->pubsync() == -1)
+          __os_.setstate(ios_base::badbit);
 #  if _LIBCPP_HAS_EXCEPTIONS
-    } catch (...) {
-    }
+      } catch (...) {
+      }
 #  endif // _LIBCPP_HAS_EXCEPTIONS
+    }
   }
-}
+
+  sentry(const sentry&)            = delete;
+  sentry& operator=(const sentry&) = delete;
+
+  _LIBCPP_HIDE_FROM_ABI explicit operator bool() const { return __ok_; }
+};
 
 template <class _CharT, class _Traits>
 basic_ostream<_CharT, _Traits>::basic_ostream(basic_ostream&& __rhs) {

libcxx/include/istream

@@ -309,7 +309,30 @@ class basic_istream<_CharT, _Traits>::sentry {
   bool __ok_;
 
 public:
-  explicit sentry(basic_istream<_CharT, _Traits>& __is, bool __noskipws = false);
+#if defined(__MINGW32__) || defined(__CYGWIN__)
+  _LIBCPP_HIDE_FROM_ABI
+#else
+  _LIBCPP_HIDE_FROM_ABI_AFTER_V1
+#endif
+  explicit sentry(basic_istream<_CharT, _Traits>& __is, bool __noskipws = false) : __ok_(false) {
+    if (__is.good()) {
+      if (__is.tie())
+        __is.tie()->flush();
+      if (!__noskipws && (__is.flags() & ios_base::skipws)) {
+        typedef istreambuf_iterator<_CharT, _Traits> _Ip;
+        const ctype<_CharT>& __ct = std::use_facet<ctype<_CharT> >(__is.getloc());
+        _Ip __i(__is);
+        _Ip __eof;
+        for (; __i != __eof; ++__i)
+          if (!__ct.is(__ct.space, *__i))
+            break;
+        if (__i == __eof)
+          __is.setstate(ios_base::failbit | ios_base::eofbit);
+      }
+      __ok_ = __is.good();
+    } else
+      __is.setstate(ios_base::failbit);
+  }
   //    ~sentry() = default;
 
   _LIBCPP_HIDE_FROM_ABI explicit operator bool() const { return __ok_; }
@@ -318,27 +341,6 @@ public:
   sentry& operator=(const sentry&) = delete;
 };
 
-template <class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>::sentry::sentry(basic_istream<_CharT, _Traits>& __is, bool __noskipws) : __ok_(false) {
-  if (__is.good()) {
-    if (__is.tie())
-      __is.tie()->flush();
-    if (!__noskipws && (__is.flags() & ios_base::skipws)) {
-      typedef istreambuf_iterator<_CharT, _Traits> _Ip;
-      const ctype<_CharT>& __ct = std::use_facet<ctype<_CharT> >(__is.getloc());
-      _Ip __i(__is);
-      _Ip __eof;
-      for (; __i != __eof; ++__i)
-        if (!__ct.is(__ct.space, *__i))
-          break;
-      if (__i == __eof)
-        __is.setstate(ios_base::failbit | ios_base::eofbit);
-    }
-    __ok_ = __is.good();
-  } else
-    __is.setstate(ios_base::failbit);
-}
-
 template <class _CharT, class _Traits>
 basic_istream<_CharT, _Traits>::basic_istream(basic_istream&& __rhs) : __gc_(__rhs.__gc_) {
   __rhs.__gc_ = 0;