diff --git a/compiler-rt/lib/orc/coff_platform.cpp b/compiler-rt/lib/orc/coff_platform.cpp
index 78c86c855dcb..9fe5c0b06289 100644
--- a/compiler-rt/lib/orc/coff_platform.cpp
+++ b/compiler-rt/lib/orc/coff_platform.cpp
@@ -509,7 +509,6 @@ Error COFFPlatformRuntimeState::deregisterObjectSections(
               << HeaderAddr.getValue();
     return make_error<StringError>(ErrStream.str());
   }
-  auto &JDState = I->second;
   for (auto &KV : Secs) {
     if (auto Err = deregisterBlockRange(HeaderAddr, KV.second))
       return Err;
@@ -687,7 +686,14 @@ struct ThrowInfo {
 
 ORC_RT_INTERFACE void __stdcall __orc_rt_coff_cxx_throw_exception(
     void *pExceptionObject, ThrowInfo *pThrowInfo) {
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wmultichar"
+#endif
   constexpr uint32_t EH_EXCEPTION_NUMBER = 'msc' | 0xE0000000;
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
   constexpr uint32_t EH_MAGIC_NUMBER1 = 0x19930520;
   auto BaseAddr = COFFPlatformRuntimeState::get().findJITDylibBaseByPC(
       reinterpret_cast<uint64_t>(pThrowInfo));