Revert "[ORC] Add optional context string to duplicate symbol definition errors."

Broke buildbots: https://lab.llvm.org/buildbot/#/builders/10/builds/5025

This reverts commit b0979b8.

Author: jplehr

llvm/include/llvm/ExecutionEngine/Orc/Shared/OrcError.h

@@ -48,16 +48,12 @@ class DuplicateDefinition : public ErrorInfo<DuplicateDefinition> {
 public:
   static char ID;
 
-  DuplicateDefinition(std::string SymbolName,
-                      std::optional<std::string> Context = {});
+  DuplicateDefinition(std::string SymbolName);
   std::error_code convertToErrorCode() const override;
   void log(raw_ostream &OS) const override;
   const std::string &getSymbolName() const;
-  const std::optional<std::string> &getContext() const;
-
 private:
   std::string SymbolName;
-  std::optional<std::string> Context;
 };
 
 class JITSymbolNotFound : public ErrorInfo<JITSymbolNotFound> {

llvm/lib/ExecutionEngine/Orc/Core.cpp

@@ -731,8 +731,7 @@ JITDylib::defineMaterializing(MaterializationResponsibility &FromMR,
             Symbols.erase(Symbols.find_as(S));
 
           // FIXME: Return all duplicates.
-          return make_error<DuplicateDefinition>(
-              std::string(*Name), "defineMaterializing operation");
+          return make_error<DuplicateDefinition>(std::string(*Name));
         }
 
         // Otherwise just make a note to discard this symbol after the loop.
@@ -1425,8 +1424,7 @@ Error JITDylib::defineImpl(MaterializationUnit &MU) {
   if (!Duplicates.empty()) {
     LLVM_DEBUG(
         { dbgs() << "  Error: Duplicate symbols " << Duplicates << "\n"; });
-    return make_error<DuplicateDefinition>(std::string(**Duplicates.begin()),
-                                           MU.getName().str());
+    return make_error<DuplicateDefinition>(std::string(**Duplicates.begin()));
   }
 
   // Discard any overridden defs in this MU.

llvm/lib/ExecutionEngine/Orc/Shared/OrcError.cpp

@@ -86,28 +86,21 @@ std::error_code orcError(OrcErrorCode ErrCode) {
   return std::error_code(static_cast<UT>(ErrCode), getOrcErrCat());
 }
 
-DuplicateDefinition::DuplicateDefinition(std::string SymbolName,
-                                         std::optional<std::string> Context)
-    : SymbolName(std::move(SymbolName)), Context(std::move(Context)) {}
+DuplicateDefinition::DuplicateDefinition(std::string SymbolName)
+    : SymbolName(std::move(SymbolName)) {}
 
 std::error_code DuplicateDefinition::convertToErrorCode() const {
   return orcError(OrcErrorCode::DuplicateDefinition);
 }
 
 void DuplicateDefinition::log(raw_ostream &OS) const {
-  if (Context)
-    OS << "In " << *Context << ", ";
-  OS << "duplicate definition of symbol '" << SymbolName << "'";
+  OS << "Duplicate definition of symbol '" << SymbolName << "'";
 }
 
 const std::string &DuplicateDefinition::getSymbolName() const {
   return SymbolName;
 }
 
-const std::optional<std::string> &DuplicateDefinition::getContext() const {
-  return Context;
-}
-
 JITSymbolNotFound::JITSymbolNotFound(std::string SymbolName)
     : SymbolName(std::move(SymbolName)) {}