From 92cbd7a182b0df61969ef4a736d79013e428a482 Mon Sep 17 00:00:00 2001
From: Duncan Ogilvie <mr.exodia.tpodt@gmail.com>
Date: Wed, 29 Oct 2025 12:02:58 +0100
Subject: [PATCH] Fix compilation on Windows (clang-cl)

---
 bin/differential_tester_x86/LiftAndCompare.cpp   | 2 +-
 include/remill/Arch/Context.h                    | 1 +
 include/remill/BC/InstructionLifter.h            | 1 +
 test_runner_lib/TestRunner.cpp                   | 2 +-
 test_runner_lib/include/test_runner/TestRunner.h | 2 +-
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/bin/differential_tester_x86/LiftAndCompare.cpp b/bin/differential_tester_x86/LiftAndCompare.cpp
index 880745ac..9c447bcb 100644
--- a/bin/differential_tester_x86/LiftAndCompare.cpp
+++ b/bin/differential_tester_x86/LiftAndCompare.cpp
@@ -168,7 +168,7 @@ class DifferentialModuleBuilder {
 };
 
 using random_bytes_engine =
-    std::independent_bits_engine<std::default_random_engine, CHAR_BIT, uint8_t>;
+    std::independent_bits_engine<std::default_random_engine, CHAR_BIT, uint16_t>;
 
 
 std::string PrintState(X86State *state) {
diff --git a/include/remill/Arch/Context.h b/include/remill/Arch/Context.h
index 67e2f992..7d4a2acc 100644
--- a/include/remill/Arch/Context.h
+++ b/include/remill/Arch/Context.h
@@ -23,6 +23,7 @@
 #include <functional>
 #include <map>
 #include <string_view>
+#include <string>
 
 namespace remill {
 
diff --git a/include/remill/BC/InstructionLifter.h b/include/remill/BC/InstructionLifter.h
index 62bb1628..64933d5c 100644
--- a/include/remill/BC/InstructionLifter.h
+++ b/include/remill/BC/InstructionLifter.h
@@ -19,6 +19,7 @@
 #include <cstdint>
 #include <memory>
 #include <string_view>
+#include <string>
 
 namespace llvm {
 class Argument;
diff --git a/test_runner_lib/TestRunner.cpp b/test_runner_lib/TestRunner.cpp
index f221b71c..e59f1af6 100644
--- a/test_runner_lib/TestRunner.cpp
+++ b/test_runner_lib/TestRunner.cpp
@@ -86,7 +86,7 @@ uint8_t MemoryHandler::read_byte(uint64_t addr) {
     return state.find(addr)->second;
   }
 
-  auto genned = rbe();
+  auto genned = static_cast<uint8_t>(rbe());
   uninitialized_reads.insert({addr, genned});
   state.insert({addr, genned});
   return genned;
diff --git a/test_runner_lib/include/test_runner/TestRunner.h b/test_runner_lib/include/test_runner/TestRunner.h
index 9e09401a..62dd6005 100644
--- a/test_runner_lib/include/test_runner/TestRunner.h
+++ b/test_runner_lib/include/test_runner/TestRunner.h
@@ -45,7 +45,7 @@ namespace test_runner {
 
 
 using random_bytes_engine =
-    std::independent_bits_engine<std::default_random_engine, CHAR_BIT, uint8_t>;
+    std::independent_bits_engine<std::default_random_engine, CHAR_BIT, uint16_t>;
 
 
 class MemoryHandler {