RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-23 03:02:36 +01:00
Code Issues Projects Releases Wiki Activity

Fix C2712 build error on Windows

Browse Source 
Move the __try/__except block outside of the set_thread_name function to avoid a conflict with object unwinding due to the use of the llvm::Storage.

Differential Revision: https://reviews.llvm.org/D30707

llvm-svn: 297192
This commit is contained in:
Konstantin Zhuravlyov 2017-03-07 20:09:46 +00:00
parent c03d6c063c
commit a6bcb7aebb
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/Support/Windows/Threading.inc
View File

@ -61,11 +61,8 @@ uint64_t llvm::get_threadid() {
uint32_t llvm::get_max_thread_name_length() { return 0; }
void llvm::set_thread_name(const Twine &Name) {
#if defined(_MSC_VER)
// Make sure the input is null terminated.
SmallString<64> Storage;
StringRef NameStr = Name.toNullTerminatedStringRef(Storage);
static void SetThreadName(DWORD Id, LPCSTR Name) {
constexpr DWORD MS_VC_EXCEPTION = 0x406D1388;
#pragma pack(push, 8)
@ -79,8 +76,8 @@ void llvm::set_thread_name(const Twine &Name) {
THREADNAME_INFO info;
info.dwType = 0x1000;
info.szName = NameStr.data();
info.dwThreadId = ::GetCurrentThreadId();
info.szName = Name;
info.dwThreadId = Id;
info.dwFlags = 0;
__try {
@ -89,6 +86,15 @@ void llvm::set_thread_name(const Twine &Name) {
}
__except (EXCEPTION_EXECUTE_HANDLER) {
}
}
#endif
void llvm::set_thread_name(const Twine &Name) {
#if defined(_MSC_VER)
// Make sure the input is null terminated.
SmallString<64> Storage;
StringRef NameStr = Name.toNullTerminatedStringRef(Storage);
SetThreadName(::GetCurrentThreadId(), NameStr.data());
#endif
}