diff options
| author | 刘雨培 <liuyupei951018@hotmail.com> | 2017-11-03 04:06:00 +0800 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2017-11-02 13:06:00 -0700 |
| commit | 96f1a89a2bb007b7dbe5ccc613a0fa3f8dd323dd (patch) | |
| tree | 99e924e1b4bddd8a7f0c50c4dd51212e878c93f4 | |
| parent | 7dc0f2779bedea15a592c161ad6a9eddfc88c5f9 (diff) | |
| download | coreclr-96f1a89a2bb007b7dbe5ccc613a0fa3f8dd323dd.tar.gz coreclr-96f1a89a2bb007b7dbe5ccc613a0fa3f8dd323dd.tar.bz2 coreclr-96f1a89a2bb007b7dbe5ccc613a0fa3f8dd323dd.zip | |
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.
| -rw-r--r-- | compileoptions.cmake | 1 | ||||
| -rw-r--r-- | src/vm/siginfo.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/compileoptions.cmake b/compileoptions.cmake index 9f9f28eaf5..6f9d55fa33 100644 --- 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 40a55cb6f0..be919c8b7e 100644 --- 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’t 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()) |