Make name resolution in ORC skip extra symbols

[save-buffer]

Summary

Currently, assertion fails if an object file's symbol table has more symbols than is requested by the materialization unit. This is incorrect because some formats add extra symbols. For example, when COFF object file is generated, some symbols get inserted (for example, if a float is added, it adds a symbol __real@<HEX OF FLOAT>. This caused issues down the line because more symbols were being resolved than asked for in the query. This change makes symbol resolution skip these extra symbols.

[lhames]

Hi Sasha,

I’ve added the code to enable symbol-flags overrides for LLJIT in r367712. If you’re using LLJIT please let me know whether it fixes your issue. If not I’m happy to dig in further, but I’m afraid I don’t have access to a Windows machine to test this myself.

Cheers,
Lang.

[save-buffer]

Hi!
I was using a custom JIT, but it did fix the problem for me. Thanks so much for your help!

llvm/lib/ExecutionEngine/Orc/Core.cpp

 
 void MaterializationResponsibility::notifyResolved(const SymbolMap &Symbols) {
   LLVM_DEBUG({
     dbgs() << "In " << JD.getName() << " resolving " << Symbols << "\n";
   });
 #ifndef NDEBUG
   for (auto &KV : Symbols) {
     auto I = SymbolFlags.find(KV.first);
-    assert(I != SymbolFlags.end() &&
-           "Resolving symbol outside this responsibility set");
+    // Certain file formats like COFF add symbols to the symbol table
+    // that don't exist in the IR. Therefore, we just ignore it if
+    // there are extra symbols.
+    if (I == SymbolFlags.end())
+      continue;
+
     // Mask out Exported for compatibility with COFF
     constexpr auto Mask = ~JITSymbolFlags::Exported;
     if (I->second.isWeak())
       assert((I->second & Mask) == ((KV.second.getFlags() | JITSymbolFlags::Weak) & Mask) &&
              "Resolving symbol with incorrect flags");
     else
       assert((I->second & Mask) == (KV.second.getFlags() & Mask) &&
              "Resolving symbol with incorrect flags");
void JITDylib::resolve(const SymbolMap &Resolved) {
   auto CompletedQueries = ES.runSessionLocked([&, this]() {
     AsynchronousSymbolQuerySet CompletedQueries;
     for (const auto &KV : Resolved) {
       auto &Name = KV.first;
       auto Sym = KV.second;
 
       auto I = Symbols.find(Name);
 
-      assert(I != Symbols.end() && "Symbol not found");
+      // Certain file formats like COFF add symbols to the symbol table
+      // that don't exist in the IR. Therefore, we just ignore it if
+      // there are extra symbols.
+      if (I == Symbols.end())
+        continue;
+
       assert(!I->second.hasMaterializerAttached() &&
              "Resolving symbol with materializer attached?");
       assert(I->second.getState() == SymbolState::Materializing &&
              "Symbol should be materializing");
       assert(I->second.getAddress() == 0 && "Symbol has already been resolved");
 
       // Mask out Exported flag for compatibility with COFF
       constexpr auto Mask = ~(JITSymbolFlags::Weak | JITSymbolFlags::Exported);