Re-apply "[ORC] Add optional context string to duplicate symbol definition..."

This reapplies b0979b8, which was reverted in 370aecb due to bot
failures. The failures were caused by typos in the testcase that are fixed in
this patch.

Author: lhames

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

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

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

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

llvm/test/ExecutionEngine/JITLink/Generic/Inputs/main-ret-42.ll

@@ -0,0 +1,4 @@
+define i32 @main(i32 %argc, i8**  %argv)  {
+entry:
+  ret i32 42
+}

llvm/test/ExecutionEngine/JITLink/Generic/duplicate-definition-error.test

@@ -0,0 +1,10 @@
+# RUN: rm -rf %t && mkdir %t
+# RUN: llc -filetype=obj -o %t/main-ret-0.o %S/Inputs/main-ret-0.ll
+# RUN: llc -filetype=obj -o %t/main-ret-42.o %S/Inputs/main-ret-42.ll
+# RUN: not llvm-jitlink -noexec %t/main-ret-0.o %t/main-ret-42.o 2>&1 \
+# RUN:    | FileCheck %s
+#
+# Trigger a duplicate definition error by trying to link two main functions,
+# check that the error message includes the file that introduced the duplicate.
+#
+# CHECK: In {{.*}}main-ret-42.o, duplicate definition of {{.*}}main