src: replace snapshot flag with affects_annotation

Author: watilde

src/node_options.h

@@ -478,14 +478,13 @@ class OptionsParser {
   // Options struct instead.
   // affects_snapshot marks that the flag's effective value must match between
   // snapshot build and load time.
-  void AddOption(
-      const char* name,
-      const char* help_text,
-      bool Options::*field,
-      OptionEnvvarSettings env_setting = kDisallowedInEnvvar,
-      bool default_is_true = false,
-      OptionNamespaces namespace_id = OptionNamespaces::kNoNamespace,
-      bool affects_snapshot = false);
+  void AddOption(const char* name,
+                 const char* help_text,
+                 bool Options::*field,
+                 OptionEnvvarSettings env_setting = kDisallowedInEnvvar,
+                 bool default_is_true = false,
+                 OptionNamespaces namespace_id = OptionNamespaces::kNoNamespace,
+                 bool affects_snapshot = false);
   void AddOption(
       const char* name,
       const char* help_text,
@@ -712,9 +711,9 @@ std::vector<std::string> ParseNodeOptionsEnvVar(
 
 // Describes one snapshot-affecting boolean option.
 struct SnapshotFlagInfo {
-  std::string name;       // canonical CLI flag name
-  bool value;             // current effective value
-  bool default_is_true;   // true if the flag defaults to on (--no-* form)
+  std::string name;      // canonical CLI flag name
+  bool value;            // current effective value
+  bool default_is_true;  // true if the flag defaults to on (--no-* form)
 };
 
 // Returns every boolean EnvironmentOption marked affects_snapshot=true,

src/node_snapshotable.cc

@@ -745,19 +745,15 @@ bool SnapshotData::Check() const {
         if (options[i].default_is_true) {
           // --no-<flag> form is what's passed when the feature is off.
           std::string negated = std::string("--no-") + (flag_name + 2);
-          snap_desc = in_snapshot
-              ? (std::string("with ") + flag_name)
-              : (std::string("with ") + negated);
-          curr_desc = in_current
-              ? (std::string("with ") + flag_name)
-              : (std::string("with ") + negated);
+          snap_desc = in_snapshot ? (std::string("with ") + flag_name)
+                                  : (std::string("with ") + negated);
+          curr_desc = in_current ? (std::string("with ") + flag_name)
+                                 : (std::string("with ") + negated);
         } else {
-          snap_desc = in_snapshot
-              ? (std::string("with ") + flag_name)
-              : (std::string("without ") + flag_name);
-          curr_desc = in_current
-              ? (std::string("with ") + flag_name)
-              : (std::string("without ") + flag_name);
+          snap_desc = in_snapshot ? (std::string("with ") + flag_name)
+                                  : (std::string("without ") + flag_name);
+          curr_desc = in_current ? (std::string("with ") + flag_name)
+                                 : (std::string("without ") + flag_name);
         }
         fprintf(stderr,
                 "Failed to load the startup snapshot because it was built "

test/parallel/test-cli-node-options-docs.js

@@ -39,7 +39,7 @@ for (const [, envVar] of manPageText.matchAll(/\.It Fl (-[a-zA-Z0-9._-]+)/g)) {
 }
 
 for (const [, envVar, config] of nodeOptionsCC.matchAll(addOptionRE)) {
-  // detect default_is_true by anchoring to the env_setting parameter position;
+  // Detect default_is_true by anchoring to the env_setting parameter position;
   // a trailing `true` after OptionNamespaces:: would be affects_snapshot, not default_is_true
   const hasTrueAsDefaultValue = /,\s*k(?:Allowed|Disallowed)InEnvvar\s*,\s*(?:true|HAVE_[A-Z_]+)/.test(config);
   const isInNodeOption = config.includes('kAllowedInEnvvar') && !config.includes('kDisallowedInEnvvar');

test/parallel/test-preload.js

@@ -21,7 +21,6 @@ const fixtureC = fixtures.path('printC.js');
 const fixtureD = fixtures.path('define-global.js');
 const fixtureE = fixtures.path('intrinsic-mutation.js');
 const fixtureF = fixtures.path('print-intrinsic-mutation-name.js');
-const fixtureG = fixtures.path('worker-from-argv.js');
 const fixtureThrows = fixtures.path('throws_error4.js');
 const fixtureIsPreloading = fixtures.path('ispreloading.js');