diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldCOFF.cpp b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldCOFF.cpp
index 4791f87..56bcb8e 100644
--- a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldCOFF.cpp
+++ b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldCOFF.cpp
@@ -60,7 +60,7 @@
 
 uint64_t RuntimeDyldCOFF::getSymbolOffset(const SymbolRef &Sym) {
   uint64_t Address;
-  if (std::error_code EC = Sym.getAddress(Address))
+  if (Sym.getAddress(Address))
     return UnknownAddressOrSize;
 
   if (Address == UnknownAddressOrSize)
@@ -68,7 +68,7 @@
 
   const ObjectFile *Obj = Sym.getObject();
   section_iterator SecI(Obj->section_end());
-  if (std::error_code EC = Sym.getSection(SecI))
+  if (Sym.getSection(SecI))
     return UnknownAddressOrSize;
 
   if (SecI == Obj->section_end())
diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h
index 210ee47..20c63f17 100644
--- a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h
+++ b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h
@@ -36,15 +36,13 @@
 
 namespace llvm {
 
-namespace {
   // Helper for extensive error checking in debug builds.
-  std::error_code Check(std::error_code Err) {
-    if (Err) {
-      report_fatal_error(Err.message());
-    }
-    return Err;
+inline std::error_code Check(std::error_code Err) {
+  if (Err) {
+    report_fatal_error(Err.message());
   }
-} // end anonymous namespace
+  return Err;
+}
 
 class Twine;
 
diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldCOFFX86_64.cpp b/llvm/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldCOFFX86_64.cpp
index 342eb13..9ea628a 100644
--- a/llvm/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldCOFFX86_64.cpp
+++ b/llvm/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldCOFFX86_64.cpp
@@ -118,7 +118,6 @@
     report_fatal_error("Unknown symbol in relocation");
   unsigned TargetSectionID = 0;
   uint64_t TargetOffset = UnknownAddressOrSize;
-  const COFFObjectFile *COFFObj = cast<COFFObjectFile>(&Obj);
   section_iterator SecI(Obj.section_end());
   Symbol->getSection(SecI);
   if (SecI == Obj.section_end())