diff --git a/llvm/include/llvm/ExecutionEngine/Orc/ThreadSafeModule.h b/llvm/include/llvm/ExecutionEngine/Orc/ThreadSafeModule.h
index c48af2ecde98..d979c8dda1a8 100644
--- a/llvm/include/llvm/ExecutionEngine/Orc/ThreadSafeModule.h
+++ b/llvm/include/llvm/ExecutionEngine/Orc/ThreadSafeModule.h
@@ -16,7 +16,6 @@
 
 #include "llvm/IR/LLVMContext.h"
 #include "llvm/IR/Module.h"
-#include "llvm/Support/Compiler.h"
 
 #include <functional>
 #include <memory>
@@ -41,7 +40,7 @@ private:
 public:
 
   // RAII based lock for ThreadSafeContext.
-  class LLVM_NODISCARD Lock {
+  class Lock {
   private:
     using UnderlyingLock = std::lock_guard<std::recursive_mutex>;
   public:
@@ -89,11 +88,13 @@ public:
   /// Construct a ThreadSafeModule from a unique_ptr<Module> and a
   /// unique_ptr<LLVMContext>. This creates a new ThreadSafeContext from the
   /// given context.
-  ThreadSafeModule(std::unique_ptr<Module> M, std::unique_ptr<LLVMContext> Ctx)
-      : TSCtx(std::move(Ctx)), M(std::move(M)) {}
+  ThreadSafeModule(std::unique_ptr<Module> M,
+                   std::unique_ptr<LLVMContext> Ctx)
+    : M(std::move(M)), TSCtx(std::move(Ctx)) {}
 
-  ThreadSafeModule(std::unique_ptr<Module> M, ThreadSafeContext TSCtx)
-      : TSCtx(std::move(TSCtx)), M(std::move(M)) {}
+  ThreadSafeModule(std::unique_ptr<Module> M,
+                   ThreadSafeContext TSCtx)
+    : M(std::move(M)), TSCtx(std::move(TSCtx)) {}
 
   Module* getModule() { return M.get(); }
 
@@ -108,8 +109,8 @@ public:
   }
 
 private:
-  ThreadSafeContext TSCtx;
   std::unique_ptr<Module> M;
+  ThreadSafeContext TSCtx;
 };
 
 using GVPredicate = std::function<bool(const GlobalValue&)>;
diff --git a/llvm/unittests/ExecutionEngine/Orc/CMakeLists.txt b/llvm/unittests/ExecutionEngine/Orc/CMakeLists.txt
index 3a47bfa20bf3..c18c9361cb00 100644
--- a/llvm/unittests/ExecutionEngine/Orc/CMakeLists.txt
+++ b/llvm/unittests/ExecutionEngine/Orc/CMakeLists.txt
@@ -26,7 +26,6 @@ add_llvm_unittest(OrcJITTests
   RTDyldObjectLinkingLayerTest.cpp
   RTDyldObjectLinkingLayer2Test.cpp
   SymbolStringPoolTest.cpp
-  ThreadSafeModuleTest.cpp
   )
 
 target_link_libraries(OrcJITTests PRIVATE ${ORC_JIT_TEST_LIBS})
diff --git a/llvm/unittests/ExecutionEngine/Orc/ThreadSafeModuleTest.cpp b/llvm/unittests/ExecutionEngine/Orc/ThreadSafeModuleTest.cpp
deleted file mode 100644
index 40efd36160e2..000000000000
--- a/llvm/unittests/ExecutionEngine/Orc/ThreadSafeModuleTest.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-//===--- ThreadSafeModuleTest.cpp - Test basic use of ThreadSafeModule ----===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ExecutionEngine/Orc/ThreadSafeModule.h"
-#include "gtest/gtest.h"
-
-#include <atomic>
-#include <future>
-#include <thread>
-
-using namespace llvm;
-using namespace llvm::orc;
-
-namespace {
-
-TEST(ThreadSafeModuleTest, ContextWhollyOwnedByOneModule) {
-  // Test that ownership of a context can be transferred to a single
-  // ThreadSafeModule.
-  ThreadSafeContext TSCtx(llvm::make_unique<LLVMContext>());
-  ThreadSafeModule TSM(llvm::make_unique<Module>("M", *TSCtx.getContext()),
-                       std::move(TSCtx));
-}
-
-TEST(ThreadSafeModuleTest, ContextOwnershipSharedByTwoModules) {
-  // Test that ownership of a context can be shared between more than one
-  // ThreadSafeModule.
-  ThreadSafeContext TSCtx(llvm::make_unique<LLVMContext>());
-
-  ThreadSafeModule TSM1(llvm::make_unique<Module>("M1", *TSCtx.getContext()),
-                        TSCtx);
-  ThreadSafeModule TSM2(llvm::make_unique<Module>("M2", *TSCtx.getContext()),
-                        std::move(TSCtx));
-}
-
-TEST(ThreadSafeModuleTest, ContextOwnershipSharedWithClient) {
-  // Test that ownership of a context can be shared with a client-held
-  // ThreadSafeContext so that it can be re-used for new modules.
-  ThreadSafeContext TSCtx(llvm::make_unique<LLVMContext>());
-
-  {
-    // Create and destroy a module.
-    ThreadSafeModule TSM1(llvm::make_unique<Module>("M1", *TSCtx.getContext()),
-                          TSCtx);
-  }
-
-  // Verify that the context is still available for re-use.
-  ThreadSafeModule TSM2(llvm::make_unique<Module>("M2", *TSCtx.getContext()),
-                        std::move(TSCtx));
-}
-
-TEST(ThreadSafeModuleTest, BasicContextLockAPI) {
-  // Test that basic lock API calls work.
-  ThreadSafeContext TSCtx(llvm::make_unique<LLVMContext>());
-  ThreadSafeModule TSM(llvm::make_unique<Module>("M", *TSCtx.getContext()),
-                       TSCtx);
-
-  { auto L = TSCtx.getLock(); }
-
-  { auto L = TSM.getContextLock(); }
-}
-
-TEST(ThreadSafeModuleTest, ContextLockPreservesContext) {
-  // Test that the existence of a context lock preserves the attached
-  // context.
-  // The trick to verify this is a bit of a hack: We attach a Module
-  // (without the ThreadSafeModule wrapper) to the context, then verify
-  // that this Module destructs safely (which it will not if its context
-  // has been destroyed) even though all references to the context have
-  // been thrown away (apart from the lock).
-
-  ThreadSafeContext TSCtx(llvm::make_unique<LLVMContext>());
-  auto L = TSCtx.getLock();
-  auto &Ctx = *TSCtx.getContext();
-  auto M = llvm::make_unique<Module>("M", Ctx);
-  TSCtx = ThreadSafeContext();
-}
-
-} // end anonymous namespace