From 001a3a254b6d75c98078930049e6bdd8b3ecf3f8 Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Tue, 14 Mar 2023 16:51:08 +0100
Subject: [PATCH] Remove comments about non-existent support for
 smpi/privatization in MC.

[ci-skip]
---
 src/mc/AddressSpace.hpp             | 4 ----
 src/mc/sosp/RemoteProcessMemory.hpp | 1 -
 src/mc/sosp/Snapshot.cpp            | 4 +---
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/mc/AddressSpace.hpp b/src/mc/AddressSpace.hpp
index 2ae6d4d0fd..f817bf0d33 100644
--- a/src/mc/AddressSpace.hpp
+++ b/src/mc/AddressSpace.hpp
@@ -76,10 +76,6 @@ public:
  *  * the current state of an existing process;
  *
  *  * a snapshot.
- *
- *  In order to support SMPI privatization, the can read the memory from the
- *  context of a given SMPI process: if specified, the code reads data from the
- *  correct SMPI privatization VMA.
  */
 class AddressSpace {
 private:
diff --git a/src/mc/sosp/RemoteProcessMemory.hpp b/src/mc/sosp/RemoteProcessMemory.hpp
index 1e3422a590..7cc058adf8 100644
--- a/src/mc/sosp/RemoteProcessMemory.hpp
+++ b/src/mc/sosp/RemoteProcessMemory.hpp
@@ -56,7 +56,6 @@ struct IgnoredHeapRegion {
  *
  *  - reading from the process memory (`AddressSpace`);
  *  - accessing the system state of the process (heap, …);
- *  - privatization;
  *  - stack unwinding;
  *  - etc.
  */
diff --git a/src/mc/sosp/Snapshot.cpp b/src/mc/sosp/Snapshot.cpp
index 08b1a97aa6..7d9caba33a 100644
--- a/src/mc/sosp/Snapshot.cpp
+++ b/src/mc/sosp/Snapshot.cpp
@@ -181,7 +181,6 @@ void Snapshot::handle_ignore()
     s_mc_snapshot_ignored_data_t ignored_data;
     ignored_data.start = (void*)region.addr;
     ignored_data.data.resize(region.size);
-    // TODO, we should do this once per privatization segment:
     get_remote_process_memory()->read_bytes(ignored_data.data.data(), region.size, remote(region.addr));
     ignored_data_.push_back(std::move(ignored_data));
   }
@@ -277,8 +276,7 @@ void Snapshot::restore(RemoteProcessMemory& memory) const
 
   // Restore regions
   for (std::unique_ptr<Region> const& region : snapshot_regions_) {
-    if (region) // privatized variables are not snapshotted
-      region.get()->restore();
+    region->restore();
   }
 
   ignore_restore();
-- 
2.20.1