libstdc++: Use init_priority attribute for Init object [PR 98108]
authorJonathan Wakely <jwakely@redhat.com>
Tue, 15 Dec 2020 11:40:06 +0000 (11:40 +0000)
committerJonathan Wakely <jwakely@redhat.com>
Tue, 15 Dec 2020 11:45:26 +0000 (11:45 +0000)
This causes the global objects that run the <iostream> initialization
code to be constructed earlier, which avoids some bugs in user code due
to incorrectly relying on static initialization order.

libstdc++-v3/ChangeLog:

PR libstdc++/98108
* include/std/iostream (__ioinit): Add init_priority attribute.

libstdc++-v3/include/std/iostream

index f988342b90a1c6023a45091d9d5ce06e9d2185dd..6b2f964f68814749acd0824bdd654e03c8951152 100644 (file)
@@ -70,8 +70,16 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 #endif
   //@}
 
+#if __has_attribute(__init_priority__)
+# define _GLIBCXX_INIT_PRIO(N) __attribute__((__init_priority__(N)))
+#else
+# define _GLIBCXX_INIT_PRIO(N)
+#endif
+
   // For construction of filebuffers for cout, cin, cerr, clog et. al.
-  static ios_base::Init __ioinit;
+  static ios_base::Init __ioinit _GLIBCXX_INIT_PRIO(90);
+
+#undef _GLIBCXX_INIT_PRIO
 
 _GLIBCXX_END_NAMESPACE_VERSION
 } // namespace