src: workaround MSVC compiler bug

PR-URL: #25596 Fixes: #25593 Refs: https://developercommunity.visualstudio.com/content/problem/432157/dynamic-initializers-out-of-order.html Reviewed-By: Bartosz Sosnowski <[email protected]> Reviewed-By: Anna Henningsen <[email protected]>
nodejs · Feb 1, 2019 · 998cea5 · 998cea5
1 parent b1e0c43
commit 998cea5
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/src/node_options.cc b/src/node_options.cc
@@ -107,6 +107,20 @@ void EnvironmentOptions::CheckOptions(std::vector<std::string>* errors) {
 
 namespace options_parser {
 
+// Explicitly access the singelton instances in their dependancy order.
+// This was moved here to workaround a compiler bug.
+// Refs: https://github.com/nodejs/node/issues/25593
+
+#if HAVE_INSPECTOR
+const DebugOptionsParser DebugOptionsParser::instance;
+#endif  // HAVE_INSPECTOR
+
+const EnvironmentOptionsParser EnvironmentOptionsParser::instance;
+
+const PerIsolateOptionsParser PerIsolateOptionsParser::instance;
+
+const PerProcessOptionsParser PerProcessOptionsParser::instance;
+
 // XXX: If you add an option here, please also add it to doc/node.1 and
 // doc/api/cli.md
 // TODO(addaleax): Make that unnecessary.
@@ -143,10 +157,6 @@ DebugOptionsParser::DebugOptionsParser() {
   AddAlias("--debug-brk=", { "--inspect-port", "--debug-brk" });
 }
 
-#if HAVE_INSPECTOR
-const DebugOptionsParser DebugOptionsParser::instance;
-#endif  // HAVE_INSPECTOR
-
 EnvironmentOptionsParser::EnvironmentOptionsParser() {
   AddOption("--experimental-modules",
             "experimental ES Module support and caching modules",
@@ -275,8 +285,6 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
 #endif  // HAVE_INSPECTOR
 }
 
-const EnvironmentOptionsParser EnvironmentOptionsParser::instance;
-
 PerIsolateOptionsParser::PerIsolateOptionsParser() {
   AddOption("--track-heap-objects",
             "track heap object allocations for heap snapshots",
@@ -334,8 +342,6 @@ PerIsolateOptionsParser::PerIsolateOptionsParser() {
          &PerIsolateOptions::get_per_env_options);
 }
 
-const PerIsolateOptionsParser PerIsolateOptionsParser::instance;
-
 PerProcessOptionsParser::PerProcessOptionsParser() {
   AddOption("--title",
             "the process title to use on startup",
@@ -442,8 +448,6 @@ PerProcessOptionsParser::PerProcessOptionsParser() {
          &PerProcessOptions::get_per_isolate_options);
 }
 
-const PerProcessOptionsParser PerProcessOptionsParser::instance;
-
 inline std::string RemoveBrackets(const std::string& host) {
   if (!host.empty() && host.front() == '[' && host.back() == ']')
     return host.substr(1, host.size() - 2);