diff options
| author | Reid Kleckner <reid@kleckner.net> | 2013-07-16 14:04:08 +0000 |
|---|---|---|
| committer | Reid Kleckner <reid@kleckner.net> | 2013-07-16 14:04:08 +0000 |
| commit | 5f4535b974e973d52797945fbf80f19ffba8c4ad (patch) | |
| tree | 4e449aae4c5aa180c87c4fba771d99025498d45e /llvm | |
| parent | 6a46149cb13f1294e7fb0823ed4608f06f8ce7aa (diff) | |
| download | bcm5719-llvm-5f4535b974e973d52797945fbf80f19ffba8c4ad.tar.gz bcm5719-llvm-5f4535b974e973d52797945fbf80f19ffba8c4ad.zip | |
[Support] Fix some warnings when self-hosting clang on Windows
llvm-svn: 186413
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/Support/ErrorHandling.cpp | 5 | ||||
| -rw-r--r-- | llvm/lib/Support/Windows/Path.inc | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/llvm/lib/Support/ErrorHandling.cpp b/llvm/lib/Support/ErrorHandling.cpp index f4b591e777e..9425445a853 100644 --- a/llvm/lib/Support/ErrorHandling.cpp +++ b/llvm/lib/Support/ErrorHandling.cpp @@ -96,4 +96,9 @@ void llvm::llvm_unreachable_internal(const char *msg, const char *file, dbgs() << " at " << file << ":" << line; dbgs() << "!\n"; abort(); +#ifdef LLVM_BUILTIN_UNREACHABLE + // Windows systems and possibly others don't declare abort() to be noreturn, + // so use the unreachable builtin to avoid a Clang self-host warning. + LLVM_BUILTIN_UNREACHABLE; +#endif } diff --git a/llvm/lib/Support/Windows/Path.inc b/llvm/lib/Support/Windows/Path.inc index 5787636aa68..5a62a609b83 100644 --- a/llvm/lib/Support/Windows/Path.inc +++ b/llvm/lib/Support/Windows/Path.inc @@ -756,7 +756,6 @@ error_code mapped_file_region::init(int FD, bool CloseFD, uint64_t Offset) { case readonly: flprotect = PAGE_READONLY; break; case readwrite: flprotect = PAGE_READWRITE; break; case priv: flprotect = PAGE_WRITECOPY; break; - default: llvm_unreachable("invalid mapping mode"); } FileMappingHandle = ::CreateFileMapping(FileHandle, @@ -780,7 +779,6 @@ error_code mapped_file_region::init(int FD, bool CloseFD, uint64_t Offset) { case readonly: dwDesiredAccess = FILE_MAP_READ; break; case readwrite: dwDesiredAccess = FILE_MAP_WRITE; break; case priv: dwDesiredAccess = FILE_MAP_COPY; break; - default: llvm_unreachable("invalid mapping mode"); } Mapping = ::MapViewOfFile(FileMappingHandle, dwDesiredAccess, |
