[llvm] r186413 - [Support] Fix some warnings when self-hosting clang on Windows

Reid Kleckner reid at kleckner.net
Tue Jul 16 07:04:08 PDT 2013


Author: rnk
Date: Tue Jul 16 09:04:08 2013
New Revision: 186413

URL: http://llvm.org/viewvc/llvm-project?rev=186413&view=rev
Log:
[Support] Fix some warnings when self-hosting clang on Windows

Modified:
    llvm/trunk/lib/Support/ErrorHandling.cpp
    llvm/trunk/lib/Support/Windows/Path.inc

Modified: llvm/trunk/lib/Support/ErrorHandling.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/ErrorHandling.cpp?rev=186413&r1=186412&r2=186413&view=diff
==============================================================================
--- llvm/trunk/lib/Support/ErrorHandling.cpp (original)
+++ llvm/trunk/lib/Support/ErrorHandling.cpp Tue Jul 16 09:04:08 2013
@@ -96,4 +96,9 @@ void llvm::llvm_unreachable_internal(con
     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
 }

Modified: llvm/trunk/lib/Support/Windows/Path.inc
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Windows/Path.inc?rev=186413&r1=186412&r2=186413&view=diff
==============================================================================
--- llvm/trunk/lib/Support/Windows/Path.inc (original)
+++ llvm/trunk/lib/Support/Windows/Path.inc Tue Jul 16 09:04:08 2013
@@ -756,7 +756,6 @@ error_code mapped_file_region::init(int
   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
   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,





More information about the llvm-commits mailing list