Switch to /utf-8 for MSVC (#14822)

* Add /source-charset:utf-8 to force MSVC to compile source as UTF-8.

* Fix the illegal character in siginfo.cpp.

diff --git a/compileoptions.cmake b/compileoptions.cmake
index 9f9f28eaf5779a75a1e9ba9e5c5af044d5618c5a..6f9d55fa334695575c6f72c97a2cb998f1f07522 100644 (file)
--- a/compileoptions.cmake
+++ b/compileoptions.cmake
@@ -94,6 +94,7 @@ if (WIN32)
   add_compile_options(/wd4960 /wd4961 /wd4603 /wd4627 /wd4838 /wd4456 /wd4457 /wd4458 /wd4459 /wd4091 /we4640)
   add_compile_options(/Zi) # enable debugging information
   add_compile_options(/ZH:SHA_256) # use SHA256 for generating hashes of compiler processed source files.
+  add_compile_options(/source-charset:utf-8) # Force MSVC to compile source as UTF-8.
 
   if (CLR_CMAKE_PLATFORM_ARCH_I386)
     add_compile_options(/Gz)

diff --git a/src/vm/siginfo.cpp b/src/vm/siginfo.cpp
index 40a55cb6f02e718bc65f278e8a5958e62d0e9190..be919c8b7ef9e691e29d2e8f4b804d2d9114578c 100644 (file)
--- a/src/vm/siginfo.cpp
+++ b/src/vm/siginfo.cpp
@@ -4969,7 +4969,7 @@ void ReportByRefPointersFromByRefLikeObject(promote_func *fn, ScanContext *sc, P
         }
 
         // TODO: GetApproxFieldTypeHandleThrowing may throw. This is a potential stress problem for fragile NGen of non-CoreLib
-        // assemblies. It won\92t ever throw for CoreCLR with R2R. Figure out if anything needs to be done to deal with the
+        // assemblies. It won't ever throw for CoreCLR with R2R. Figure out if anything needs to be done to deal with the
         // exception.
         PTR_MethodTable pFieldMT = pFD->GetApproxFieldTypeHandleThrowing().AsMethodTable();
         if (!pFieldMT->IsByRefLike())