Backing out commit r250906 as it broke lld.

llvm-svn: 250908

Author: enderby

llvm/include/llvm/Object/Archive.h

@@ -65,10 +65,7 @@ class Archive : public Binary {
     bool isThinMember() const;
 
   public:
-    Child(const Archive *Parent, const char *Start,
-          std::error_code *EC);
-    static ErrorOr<std::unique_ptr<Child>> create(const Archive *Parent,
-                                                  const char *Start);
+    Child(const Archive *Parent, const char *Start);
 
     bool operator ==(const Child &other) const {
       assert(Parent == other.Parent);
@@ -80,7 +77,7 @@ class Archive : public Binary {
     }
 
     const Archive *getParent() const { return Parent; }
-    ErrorOr<Child> getNext() const;
+    Child getNext() const;
 
     ErrorOr<StringRef> getName() const;
     StringRef getRawName() const { return getHeader()->getName(); }
@@ -96,9 +93,9 @@ class Archive : public Binary {
       return getHeader()->getAccessMode();
     }
     /// \return the size of the archive member without the header or padding.
-    ErrorOr<uint64_t> getSize() const;
+    uint64_t getSize() const;
     /// \return the size in the archive header for this member.
-    ErrorOr<uint64_t> getRawSize() const;
+    uint64_t getRawSize() const;
 
     ErrorOr<StringRef> getBuffer() const;
     uint64_t getChildOffset() const;
@@ -110,35 +107,28 @@ class Archive : public Binary {
   };
 
   class child_iterator {
-    ErrorOr<Child> child;
+    Child child;
 
   public:
-    child_iterator() : child(Child(nullptr, nullptr, nullptr)) {}
+    child_iterator() : child(Child(nullptr, nullptr)) {}
     child_iterator(const Child &c) : child(c) {}
-    child_iterator(std::error_code EC) : child(EC) {}
-    const ErrorOr<Child> *operator->() const { return &child; }
-    const ErrorOr<Child> &operator*() const { return child; }
+    const Child *operator->() const { return &child; }
+    const Child &operator*() const { return child; }
 
     bool operator==(const child_iterator &other) const {
-      if ((*this)->getError())
-        return false;
-      if (other->getError())
-        return false;
-      return (*this)->get() == other->get();
+      return child == other.child;
     }
 
     bool operator!=(const child_iterator &other) const {
       return !(*this == other);
     }
 
-    // No operator< as we can't do less than compares with iterators that
-    // contain errors.
+    bool operator<(const child_iterator &other) const {
+      return child < other.child;
+    }
 
-    // Code in loops with child_iterators must check for errors on each loop
-    // iteration.  And if there is an error break out of the loop.
     child_iterator &operator++() { // Preincrement
-      assert(child && "Can't increment iterator with error");
-      child = child->getNext();
+      child = child.getNext();
       return *this;
     }
   };
@@ -222,7 +212,7 @@ class Archive : public Binary {
   StringRef getSymbolTable() const {
     // We know that the symbol table is not an external file,
     // so we just assert there is no error.
-    return *(*SymbolTable)->getBuffer();
+    return *SymbolTable->getBuffer();
   }
   uint32_t getNumberOfSymbols() const;
 

llvm/include/llvm/Support/ErrorOr.h

@@ -91,7 +91,6 @@ class ErrorOr {
   typedef typename std::remove_reference<T>::type &reference;
   typedef const typename std::remove_reference<T>::type &const_reference;
   typedef typename std::remove_reference<T>::type *pointer;
-  typedef const typename std::remove_reference<T>::type *const_pointer;
 
 public:
   template <class E>
@@ -184,18 +183,10 @@ class ErrorOr {
     return toPointer(getStorage());
   }
 
-  const_pointer operator ->() const {
-    return toPointer(getStorage());
-  }
-
   reference operator *() {
     return *getStorage();
   }
 
-  const_reference operator *() const {
-    return *getStorage();
-  }
-
 private:
   template <class OtherT>
   void copyConstruct(const ErrorOr<OtherT> &Other) {
@@ -255,19 +246,10 @@ class ErrorOr {
     return Val;
   }
 
-  const_pointer toPointer(const_pointer Val) const {
-    return Val;
-  }
-
   pointer toPointer(wrap *Val) {
     return &Val->get();
   }
 
-  const_pointer toPointer(const wrap *Val) const {
-    return &Val->get();
-  }
-
-
   storage_type *getStorage() {
     assert(!HasError && "Cannot get value when an error exists!");
     return reinterpret_cast<storage_type*>(TStorage.buffer);

llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp

@@ -318,10 +318,10 @@ RuntimeDyld::SymbolInfo MCJIT::findSymbol(const std::string &Name,
     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

@@ -253,10 +253,10 @@ class OrcMCJITReplacement : public ExecutionEngine {
       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();