Index: compiler-rt/lib/fuzzer/FuzzerUtilWindows.cpp
===================================================================
--- compiler-rt/lib/fuzzer/FuzzerUtilWindows.cpp
+++ compiler-rt/lib/fuzzer/FuzzerUtilWindows.cpp
@@ -234,8 +234,13 @@
 }
 
 void SetThreadName(std::thread &thread, const std::string &name) {
-  // TODO ?
-  // to UTF-8 then SetThreadDescription ?
+  std::wstring wname;
+  auto sz = MultiByteToWideChar(CP_UTF8, 0, name.data(), name.size(), nullptr, 0);
+  wname.resize(sz);
+  if (sz == MultiByteToWideChar(CP_UTF8, 0, name.data, name.size, &wname[0], sz) > 0) {
+      wname.resize(sz - 1);
+      (void)SetThreadDescription(thread.native_handle(), wname.c_str());
+  }
 }
 
 } // namespace fuzzer