src: mark generated snapshot_data as const

This renders the mutex protecting it unnecessary, since mutexes only need to protect concurrent accesses to mutable data. PR-URL: #45786 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Yagiz Nizipli <[email protected]> Reviewed-By: Joyee Cheung <[email protected]> Reviewed-By: Minwoo Jung <[email protected]>
nodejs · Dec 13, 2022 · 81ab540 · 81ab540
1 parent 302c524
commit 81ab540
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/src/node_snapshot_builder.h b/src/node_snapshot_builder.h
@@ -32,8 +32,6 @@ class NODE_EXTERN_PRIVATE SnapshotBuilder {
                                       v8::Isolate::CreateParams* params);
 
  private:
-  // Used to synchronize access to the snapshot data
-  static Mutex snapshot_data_mutex_;
   static const std::vector<intptr_t>& CollectExternalReferences();
 
   static std::unique_ptr<ExternalReferenceRegistry> registry_;

diff --git a/src/node_snapshotable.cc b/src/node_snapshotable.cc
@@ -978,7 +978,7 @@ static void WriteCodeCacheInitializer(std::ostream* ss, const std::string& id) {
   *ss << "    },\n";
 }
 
-void FormatBlob(std::ostream& ss, SnapshotData* data) {
+void FormatBlob(std::ostream& ss, const SnapshotData* data) {
   ss << R"(#include <cstddef>
 #include "env.h"
 #include "node_snapshot_builder.h"
@@ -1004,7 +1004,7 @@ static const int v8_snapshot_blob_size = )"
     WriteStaticCodeCacheData(&ss, item);
   }
 
-  ss << R"(SnapshotData snapshot_data {
+  ss << R"(const SnapshotData snapshot_data {
   // -- data_ownership begins --
   SnapshotData::DataOwnership::kNotOwned,
   // -- data_ownership ends --
@@ -1036,7 +1036,6 @@ static const int v8_snapshot_blob_size = )"
 };
 
 const SnapshotData* SnapshotBuilder::GetEmbeddedSnapshotData() {
-  Mutex::ScopedLock lock(snapshot_data_mutex_);
   return &snapshot_data;
 }
 }  // namespace node
@@ -1053,8 +1052,6 @@ static void ResetContextSettingsBeforeSnapshot(Local<Context> context) {
   context->AllowCodeGenerationFromStrings(true);
 }
 
-Mutex SnapshotBuilder::snapshot_data_mutex_;
-
 const std::vector<intptr_t>& SnapshotBuilder::CollectExternalReferences() {
   static auto registry = std::make_unique<ExternalReferenceRegistry>();
   return registry->external_references();