about summary refs log tree commit diff
path: root/src/rustllvm/Linker.cpp
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2018-11-01 21:06:50 +0100
committerNikita Popov <nikita.ppv@gmail.com>2018-11-01 21:09:02 +0100
commitd79459769832c5c1724ce1e7e7099edb945b1467 (patch)
tree29284ef386e33ccb2c0339a32ee94bd985a3667a /src/rustllvm/Linker.cpp
parentf6e9a6e41cd9b1fb687e296b5a6d4c6ad399f862 (diff)
downloadrust-d79459769832c5c1724ce1e7e7099edb945b1467.tar.gz
rust-d79459769832c5c1724ce1e7e7099edb945b1467.zip
Remove checks for LLVM < 4.0
While we still have to support LLVM 4.0 for Emscripten, we can
drop checks for LLVM >= 4.0 and < 4.0.
Diffstat (limited to 'src/rustllvm/Linker.cpp')
-rw-r--r--src/rustllvm/Linker.cpp13
1 files changed, 0 insertions, 13 deletions
diff --git a/src/rustllvm/Linker.cpp b/src/rustllvm/Linker.cpp
index 534e4b91090..59f0b23361e 100644
--- a/src/rustllvm/Linker.cpp
+++ b/src/rustllvm/Linker.cpp
@@ -42,7 +42,6 @@ LLVMRustLinkerAdd(RustLinker *L, char *BC, size_t Len) {
   std::unique_ptr<MemoryBuffer> Buf =
       MemoryBuffer::getMemBufferCopy(StringRef(BC, Len));
 
-#if LLVM_VERSION_GE(4, 0)
   Expected<std::unique_ptr<Module>> SrcOrError =
       llvm::getLazyBitcodeModule(Buf->getMemBufferRef(), L->Ctx);
   if (!SrcOrError) {
@@ -51,20 +50,8 @@ LLVMRustLinkerAdd(RustLinker *L, char *BC, size_t Len) {
   }
 
   auto Src = std::move(*SrcOrError);
-#else
-  ErrorOr<std::unique_ptr<Module>> Src =
-      llvm::getLazyBitcodeModule(std::move(Buf), L->Ctx);
-  if (!Src) {
-    LLVMRustSetLastError(Src.getError().message().c_str());
-    return false;
-  }
-#endif
 
-#if LLVM_VERSION_GE(4, 0)
   if (L->L.linkInModule(std::move(Src))) {
-#else
-  if (L->L.linkInModule(std::move(Src.get()))) {
-#endif
     LLVMRustSetLastError("");
     return false;
   }