Merge pull request #4733 from michaliskok/genmc-bug-fixes

genmc: Bug fixes

Author: RalfJung

src/tools/miri/genmc-sys/build.rs

@@ -28,7 +28,7 @@ mod downloading {
     /// The GenMC repository the we get our commit from.
     pub(crate) const GENMC_GITHUB_URL: &str = "https://github.com/MPI-SWS/genmc.git";
     /// The GenMC commit we depend on. It must be available on the specified GenMC repository.
-    pub(crate) const GENMC_COMMIT: &str = "aa10ed65117c3291524efc19253b5d443a4602ac";
+    pub(crate) const GENMC_COMMIT: &str = "22d3d0b44dedb4e8e1aae3330e546465e4664529";
 
     /// Ensure that a local GenMC repo is present and set to the correct commit.
     /// Return the path of the GenMC repo and whether the checked out commit was changed.
@@ -178,14 +178,8 @@ fn compile_cpp_dependencies(genmc_path: &Path, always_configure: bool) {
     // These are all the C++ files we need to compile, which needs to be updated if more C++ files are added to Miri.
     // We use absolute paths since relative paths can confuse IDEs when attempting to go-to-source on a path in a compiler error.
     let cpp_files_base_path = Path::new("cpp/src/");
-    let cpp_files = [
-        "MiriInterface/EventHandling.cpp",
-        "MiriInterface/Exploration.cpp",
-        "MiriInterface/Mutex.cpp",
-        "MiriInterface/Setup.cpp",
-        "MiriInterface/ThreadManagement.cpp",
-    ]
-    .map(|file| std::path::absolute(cpp_files_base_path.join(file)).unwrap());
+    let cpp_files = ["MiriInterface/Exploration.cpp", "MiriInterface/Setup.cpp"]
+        .map(|file| std::path::absolute(cpp_files_base_path.join(file)).unwrap());
 
     let mut bridge = cxx_build::bridge("src/lib.rs");
     // FIXME(genmc,cmake): Remove once the GenMC debug setting is available in the config.h file.

src/tools/miri/genmc-sys/cpp/include/MiriInterface.hpp

@@ -125,8 +125,11 @@ struct MiriGenmcShim : private GenMCDriver {
     void handle_fence(ThreadId thread_id, MemOrdering ord);
 
     /**** Memory (de)allocation ****/
+
     auto handle_malloc(ThreadId thread_id, uint64_t size, uint64_t alignment) -> uint64_t;
-    auto handle_free(ThreadId thread_id, uint64_t address) -> bool;
+
+    /** Returns null on success, or an error string if an error occurs. */
+    auto handle_free(ThreadId thread_id, uint64_t address) -> std::unique_ptr<std::string>;
 
     /**** Thread management ****/
     void handle_thread_create(ThreadId thread_id, ThreadId parent_id);