diff options
Diffstat (limited to 'lib/Linker')
| -rw-r--r-- | lib/Linker/LinkItems.cpp | 5 | ||||
| -rw-r--r-- | lib/Linker/LinkModules.cpp | 9 |
2 files changed, 8 insertions, 6 deletions
diff --git a/lib/Linker/LinkItems.cpp b/lib/Linker/LinkItems.cpp index dc0f7c17bf..a4e7db5017 100644 --- a/lib/Linker/LinkItems.cpp +++ b/lib/Linker/LinkItems.cpp @@ -14,6 +14,7 @@ #include "llvm/Linker.h" #include "llvm/Module.h" +#include "llvm/Support/ErrorHandling.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Bitcode/ReaderWriter.h" @@ -80,7 +81,7 @@ bool Linker::LinkInLibrary(const std::string& Lib, bool& is_native) { std::string Magic; Pathname.getMagicNumber(Magic, 64); switch (sys::IdentifyFileType(Magic.c_str(), 64)) { - default: assert(0 && "Bad file type identification"); + default: LLVM_UNREACHABLE("Bad file type identification"); case sys::Unknown_FileType: return warning("Supposed library '" + Lib + "' isn't a library."); @@ -178,7 +179,7 @@ bool Linker::LinkInFile(const sys::Path &File, bool &is_native) { std::string Magic; File.getMagicNumber(Magic, 64); switch (sys::IdentifyFileType(Magic.c_str(), 64)) { - default: assert(0 && "Bad file type identification"); + default: LLVM_UNREACHABLE("Bad file type identification"); case sys::Unknown_FileType: return warning("Ignoring file '" + File.toString() + "' because does not contain bitcode."); diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp index a69f724bcc..3b1fcebffc 100644 --- a/lib/Linker/LinkModules.cpp +++ b/lib/Linker/LinkModules.cpp @@ -26,6 +26,7 @@ #include "llvm/Instructions.h" #include "llvm/Assembly/Writer.h" #include "llvm/Support/Streams.h" +#include "llvm/Support/ErrorHandling.h" #include "llvm/System/Path.h" #include "llvm/ADT/DenseMap.h" #include <sstream> @@ -392,7 +393,7 @@ static Value *RemapOperand(const Value *In, Result = CE->getWithOperands(Ops); } else { assert(!isa<GlobalValue>(CPV) && "Unmapped global?"); - assert(0 && "Unknown type of derived type constant value!"); + LLVM_UNREACHABLE("Unknown type of derived type constant value!"); } } else if (isa<InlineAsm>(In)) { Result = const_cast<Value*>(In); @@ -409,7 +410,7 @@ static Value *RemapOperand(const Value *In, PrintMap(ValueMap); cerr << "Couldn't remap value: " << (void*)In << " " << *In << "\n"; - assert(0 && "Couldn't remap value!"); + LLVM_UNREACHABLE("Couldn't remap value!"); #endif return 0; } @@ -899,9 +900,9 @@ static bool LinkGlobalInits(Module *Dest, const Module *Src, // Nothing is required, mapped values will take the new global // automatically. } else if (DGVar->hasAppendingLinkage()) { - assert(0 && "Appending linkage unimplemented!"); + LLVM_UNREACHABLE("Appending linkage unimplemented!"); } else { - assert(0 && "Unknown linkage!"); + LLVM_UNREACHABLE("Unknown linkage!"); } } else { // Copy the initializer over now... |