Revert "[RuntimeDyld][Windows] Allocate space for dllimport things." (l…

…lvm#106954) Looks like I missed an `override` (maybe that warning was enabled recently?). Will revert and fix. Reverts llvm#102586
SpencerAbson · Sep 2, 2024 · 87d9048 · 87d9048
1 parent eaea4d1
commit 87d9048
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 31 deletions.
diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
@@ -690,12 +690,9 @@ unsigned RuntimeDyldImpl::computeSectionStubBufSize(const ObjectFile &Obj,
     if (!(RelSecI == Section))
       continue;
 
-    for (const RelocationRef &Reloc : SI->relocations()) {
+    for (const RelocationRef &Reloc : SI->relocations())
       if (relocationNeedsStub(Reloc))
         StubBufSize += StubSize;
-      if (relocationNeedsDLLImportStub(Reloc))
-        StubBufSize = sizeAfterAddingDLLImportStub(StubBufSize);
-    }
   }
 
   // Get section data size and alignment

diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldCOFF.cpp b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldCOFF.cpp
@@ -119,14 +119,4 @@ bool RuntimeDyldCOFF::isCompatibleFile(const object::ObjectFile &Obj) const {
   return Obj.isCOFF();
 }
 
-bool RuntimeDyldCOFF::relocationNeedsDLLImportStub(
-    const RelocationRef &R) const {
-  object::symbol_iterator Symbol = R.getSymbol();
-  Expected<StringRef> TargetNameOrErr = Symbol->getName();
-  if (!TargetNameOrErr)
-    return false;
-
-  return TargetNameOrErr->starts_with(getImportSymbolPrefix());
-}
-
 } // namespace llvm
diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldCOFF.h b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldCOFF.h
@@ -14,7 +14,6 @@
 #define LLVM_RUNTIME_DYLD_COFF_H
 
 #include "RuntimeDyldImpl.h"
-#include "llvm/Support/MathExtras.h"
 
 namespace llvm {
 
@@ -46,12 +45,6 @@ class RuntimeDyldCOFF : public RuntimeDyldImpl {
 
   static constexpr StringRef getImportSymbolPrefix() { return "__imp_"; }
 
-  bool relocationNeedsDLLImportStub(const RelocationRef &R) const;
-
-  unsigned sizeAfterAddingDLLImportStub(unsigned Size) const {
-    return alignTo(Size, PointerSize) + PointerSize;
-  }
-
 private:
   unsigned PointerSize;
   uint32_t PointerReloc;

diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h
@@ -455,16 +455,6 @@ class RuntimeDyldImpl {
     return true;    // Conservative answer
   }
 
-  // Return true if the relocation R may require allocating a DLL import stub.
-  virtual bool relocationNeedsDLLImportStub(const RelocationRef &R) const {
-    return false;
-  }
-
-  // Add the size of a DLL import stub to the buffer size
-  virtual unsigned sizeAfterAddingDLLImportStub(unsigned Size) const {
-    return Size;
-  }
-
 public:
   RuntimeDyldImpl(RuntimeDyld::MemoryManager &MemMgr,
                   JITSymbolResolver &Resolver)