feat: Enhance MSVC support with global flags and update dependencies

Author: scc-tw

CMakeLists.txt

@@ -18,6 +18,7 @@ include(cmake/Options.cmake)            # VMPILOT_ENABLE_TESTS, _SANITIZERS, _LT
 include(cmake/CompilerWarnings.cmake)   # vmpilot_options INTERFACE target
 include(cmake/Sanitizers.cmake)         # vmpilot_sanitizer INTERFACE target
 include(cmake/LTO.cmake)               # CMAKE_INTERPROCEDURAL_OPTIMIZATION
+include(cmake/MSVCGlobal.cmake)         # /utf-8, /fsanitize=address (global)
 include(cmake/Dependencies.cmake)       # googletest (conditional)
 
 # ─────────────────────────────────────────────────────────────────────────────

README.md

@@ -152,7 +152,7 @@ The runtime VM implements the **doc 16 forward-secrecy extension**:
 
 - [CMake](https://cmake.org/download/) 3.20+
 - C++17 compiler (GCC 14+, Clang 18+, MSVC 2022+, Apple Clang)
-- [Ninja](https://github.com/ninja-build/ninja) (recommended)
+- [Ninja](https://github.com/ninja-build/ninja) (required on Linux/macOS; not needed for Windows `*-win` presets)
 
 ### Third-party
 
@@ -196,7 +196,7 @@ cmake --list-presets    # show all available presets
 git submodule update --init --recursive
 
 cmake --preset dev-win
-cmake --build --preset dev-win
+cmake --build --preset dev-win --parallel
 ctest --preset dev-win
 
 # Other presets: release-win, ci-win

cmake/CompilerWarnings.cmake

@@ -7,25 +7,27 @@ add_library(vmpilot_options INTERFACE)
 
 target_compile_features(vmpilot_options INTERFACE cxx_std_17)
 
+# Guard MSVC flags with COMPILE_LANGUAGE:CXX so they are not passed to
+# MASM (ml64.exe), which does not understand /utf-8, /Od, /W4, etc.
 target_compile_options(vmpilot_options INTERFACE
     # Warnings
     $<$<CXX_COMPILER_ID:GNU,Clang,AppleClang>:-Wall -Wextra -Werror -pedantic>
-    $<$<CXX_COMPILER_ID:MSVC>:/W4 /WX /utf-8>
+    $<$<AND:$<CXX_COMPILER_ID:MSVC>,$<COMPILE_LANGUAGE:CXX>>:/W4 /WX /utf-8>
     # Colour diagnostics
     $<$<CXX_COMPILER_ID:GNU>:-fdiagnostics-color=always>
     $<$<CXX_COMPILER_ID:Clang,AppleClang>:-fcolor-diagnostics>
     # Debug
     $<$<AND:$<CONFIG:Debug>,$<NOT:$<CXX_COMPILER_ID:MSVC>>>:-g -fno-omit-frame-pointer -O0>
-    $<$<AND:$<CONFIG:Debug>,$<CXX_COMPILER_ID:MSVC>>:/Zi /Od>
+    $<$<AND:$<CONFIG:Debug>,$<CXX_COMPILER_ID:MSVC>,$<COMPILE_LANGUAGE:CXX>>:/Zi /Od>
     # Release
     $<$<AND:$<CONFIG:Release>,$<NOT:$<CXX_COMPILER_ID:MSVC>>>:-O3 -fdata-sections -ffunction-sections>
-    $<$<AND:$<CONFIG:Release>,$<CXX_COMPILER_ID:MSVC>>:/O2 /Gy>
+    $<$<AND:$<CONFIG:Release>,$<CXX_COMPILER_ID:MSVC>,$<COMPILE_LANGUAGE:CXX>>:/O2 /Gy>
     # MinSizeRel
     $<$<AND:$<CONFIG:MinSizeRel>,$<NOT:$<CXX_COMPILER_ID:MSVC>>>:-Os -fdata-sections -ffunction-sections>
-    $<$<AND:$<CONFIG:MinSizeRel>,$<CXX_COMPILER_ID:MSVC>>:/O1 /Gy>
+    $<$<AND:$<CONFIG:MinSizeRel>,$<CXX_COMPILER_ID:MSVC>,$<COMPILE_LANGUAGE:CXX>>:/O1 /Gy>
     # RelWithDebInfo
     $<$<AND:$<CONFIG:RelWithDebInfo>,$<NOT:$<CXX_COMPILER_ID:MSVC>>>:-O2 -g -fno-omit-frame-pointer>
-    $<$<AND:$<CONFIG:RelWithDebInfo>,$<CXX_COMPILER_ID:MSVC>>:/O2 /Zi>
+    $<$<AND:$<CONFIG:RelWithDebInfo>,$<CXX_COMPILER_ID:MSVC>,$<COMPILE_LANGUAGE:CXX>>:/O2 /Zi>
 )
 
 target_compile_definitions(vmpilot_options INTERFACE

cmake/Dependencies.cmake

@@ -55,6 +55,8 @@ if (VMPILOT_ENABLE_TESTS)
     )
     set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
     set(INSTALL_GTEST OFF CACHE BOOL "" FORCE)
+    # Note: MSVC ASan (/fsanitize=address) and /utf-8 are set globally in
+    # the root CMakeLists.txt, so GoogleTest inherits them automatically.
     FetchContent_MakeAvailable(googletest)
     enable_testing()
     include(GoogleTest)

cmake/MSVCGlobal.cmake

@@ -0,0 +1,31 @@
+# cmake/MSVCGlobal.cmake — MSVC-wide flags applied to ALL targets
+#
+# These flags must be global (not per-target) so that every translation unit
+# shares the same encoding and sanitizer annotation metadata.  A mismatch
+# between any two .obj files causes LNK2038 (annotate_string / annotate_vector)
+# or C4819 (codepage) errors.
+
+if (NOT MSVC)
+    return()
+endif()
+
+# UTF-8 source encoding: avoids C4819 on non-English codepages (e.g. Big5/950).
+# Guarded with COMPILE_LANGUAGE so MASM (ml64.exe) is not affected.
+add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/utf-8>)
+
+# ASan must be consistent across every .obj that links together.
+# Setting it globally prevents annotate_string / annotate_vector mismatches (LNK2038).
+# /fsanitize=address is compile-only; the linker does not accept it.
+# Incremental linking is incompatible with ASan.
+if (VMPILOT_ENABLE_SANITIZERS)
+    add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/fsanitize=address>)
+    add_link_options(/INCREMENTAL:NO)
+endif()
+
+# TODO: fix the underlying alignment issues and remove these suppressions.
+#   C4324: struct padded due to alignas (runtime VmExecution, VmOramState, PlatformCallDesc)
+#   C4146: unary minus on unsigned type (runtime NEG handler, ORAM strategies)
+add_compile_options(
+    $<$<COMPILE_LANGUAGE:C,CXX>:/wd4324>
+    $<$<COMPILE_LANGUAGE:C,CXX>:/wd4146>
+)

cmake/Sanitizers.cmake

@@ -22,8 +22,9 @@ if (VMPILOT_ENABLE_SANITIZERS)
                 -fsanitize=address,undefined)
         endif()
     elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-        # MSVC supports ASan only (no UBsan)
-        target_compile_options(vmpilot_sanitizer INTERFACE /fsanitize=address)
-        target_link_options(vmpilot_sanitizer INTERFACE /fsanitize=address)
+        # MSVC ASan compile flags (/fsanitize=address) and /INCREMENTAL:NO
+        # are set globally in root CMakeLists.txt so that ALL targets
+        # (including third-party) share the same annotation metadata.
+        # This target is kept as a no-op on MSVC for interface compatibility.
     endif()
 endif()

common/crypto

@@ -10,13 +10,13 @@ string(REPLACE "/WX" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
 string(REPLACE "-Werror" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
 string(REPLACE "-Werror" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
 
-# Suppress all warnings from third-party code (abseil/protobuf)
+# Suppress all warnings from third-party code (abseil/protobuf).
+# On MSVC we only strip /WX (above) — adding /w would conflict with abseil's
+# /W3 and protobuf's /W1 target_compile_options, causing D9025 spam.
+# Both libraries are clean at their own warning levels so no extra noise appears.
 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
-elseif (MSVC)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /w")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /w")
 endif()
 
 # Abseil — pinned submodule (LTS 2026-01-07), built before protobuf

sdk/src/CMakeLists.txt

@@ -27,6 +27,10 @@ add_compile_definitions(
     TEST_DATA_DATA_REFS="${CMAKE_SOURCE_DIR}/data/data_refs/bin"
 )
 
+# Note: MSVC ASan is set globally in root CMakeLists.txt for consistency.
+# GCC/Clang sanitizers propagate from linked libraries (VMPilot_Common, etc.)
+# via vmpilot_sanitizer INTERFACE target.
+
 # --- Test targets ---
 
 add_executable(test_native_function_base test_native_function_base.cpp)