commit da9dd05011be9f9d6576299a24aee639d212faff
author Kevin Enderby <enderby@apple.com> Wed Oct 21 17:13:20 2015 +0000
committer Kevin Enderby <enderby@apple.com> Wed Oct 21 17:13:20 2015 +0000
tree 908d4c7021df8da6f3f53a77b4cc630fd9806d4e
parent 6e91c598b9f3b2fa5f7cfd158cb6eebb6a6ae8f4

Backing out commit r250906 as it broke lld.

llvm-svn: 250908

llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp

diff --git a/llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp b/llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp
index a7238e4..bbe4432 100644
--- a/llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp
+++ b/llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp
@@ -318,10 +318,10 @@
     object::Archive *A = OB.getBinary();
     // Look for our symbols in each Archive
     object::Archive::child_iterator ChildIt = A->findSym(Name);
-    if (*ChildIt && ChildIt != A->child_end()) {
+    if (ChildIt != A->child_end()) {
       // FIXME: Support nested archives?
       ErrorOr<std::unique_ptr<object::Binary>> ChildBinOrErr =
-        (*ChildIt)->getAsBinary();
+          ChildIt->getAsBinary();
       if (ChildBinOrErr.getError())
         continue;
       std::unique_ptr<object::Binary> &ChildBin = ChildBinOrErr.get();

llvm/lib/ExecutionEngine/Orc/OrcMCJITReplacement.h

diff --git a/llvm/lib/ExecutionEngine/Orc/OrcMCJITReplacement.h b/llvm/lib/ExecutionEngine/Orc/OrcMCJITReplacement.h
index e52df2d..951993f 100644
--- a/llvm/lib/ExecutionEngine/Orc/OrcMCJITReplacement.h
+++ b/llvm/lib/ExecutionEngine/Orc/OrcMCJITReplacement.h
@@ -253,10 +253,10 @@
       object::Archive *A = OB.getBinary();
       // Look for our symbols in each Archive
       object::Archive::child_iterator ChildIt = A->findSym(Name);
-      if (*ChildIt && ChildIt != A->child_end()) {
+      if (ChildIt != A->child_end()) {
         // FIXME: Support nested archives?
         ErrorOr<std::unique_ptr<object::Binary>> ChildBinOrErr =
-          (*ChildIt)->getAsBinary();
+            ChildIt->getAsBinary();
         if (ChildBinOrErr.getError())
           continue;
         std::unique_ptr<object::Binary> &ChildBin = ChildBinOrErr.get();