From 87fc5f8695d9b1ef6ae807e79680bdcf7c94f546 Mon Sep 17 00:00:00 2001 From: Tobias Grosser Date: Fri, 22 May 2015 06:01:04 +0000 Subject: Revert "Fix Clang -Wmissing-override warning" This reverts commit r237975. This seems also to break with gcc 4.7 llvm-svn: 238004 --- llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldCOFF.cpp | 7 ++++--- llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp | 7 ++++--- llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp | 7 ++++--- 3 files changed, 12 insertions(+), 9 deletions(-) (limited to 'llvm/lib/ExecutionEngine/RuntimeDyld') diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldCOFF.cpp b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldCOFF.cpp index c8d3d22966d..0cb1d7bcf1d 100644 --- a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldCOFF.cpp +++ b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldCOFF.cpp @@ -24,17 +24,18 @@ using namespace llvm::object; namespace { -class LoadedCOFFObjectInfo - : public RuntimeDyld::LoadedObjectInfoHelper { +class LoadedCOFFObjectInfo : public RuntimeDyld::LoadedObjectInfo { public: LoadedCOFFObjectInfo(RuntimeDyldImpl &RTDyld, unsigned BeginIdx, unsigned EndIdx) - : LoadedObjectInfoHelper(RTDyld, BeginIdx, EndIdx) {} + : RuntimeDyld::LoadedObjectInfo(RTDyld, BeginIdx, EndIdx) {} OwningBinary getObjectForDebug(const ObjectFile &Obj) const override { return OwningBinary(); } + + RuntimeDyld::LoadedObjectInfo *clone() const { return new LoadedCOFFObjectInfo(*this); } }; } diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp index 95421b35db5..c22636cc6b3 100644 --- a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp +++ b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp @@ -104,15 +104,16 @@ void DyldELFObject::updateSymbolAddress(const SymbolRef &SymRef, sym->st_value = static_cast(Addr); } -class LoadedELFObjectInfo - : public RuntimeDyld::LoadedObjectInfoHelper { +class LoadedELFObjectInfo : public RuntimeDyld::LoadedObjectInfo { public: LoadedELFObjectInfo(RuntimeDyldImpl &RTDyld, unsigned BeginIdx, unsigned EndIdx) - : LoadedObjectInfoHelper(RTDyld, BeginIdx, EndIdx) {} + : RuntimeDyld::LoadedObjectInfo(RTDyld, BeginIdx, EndIdx) {} OwningBinary getObjectForDebug(const ObjectFile &Obj) const override; + + RuntimeDyld::LoadedObjectInfo *clone() const { return new LoadedELFObjectInfo(*this); } }; template diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp index d4a680d749a..796a69cc836 100644 --- a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp +++ b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp @@ -26,17 +26,18 @@ using namespace llvm::object; namespace { -class LoadedMachOObjectInfo - : public RuntimeDyld::LoadedObjectInfoHelper { +class LoadedMachOObjectInfo : public RuntimeDyld::LoadedObjectInfo { public: LoadedMachOObjectInfo(RuntimeDyldImpl &RTDyld, unsigned BeginIdx, unsigned EndIdx) - : LoadedObjectInfoHelper(RTDyld, BeginIdx, EndIdx) {} + : RuntimeDyld::LoadedObjectInfo(RTDyld, BeginIdx, EndIdx) {} OwningBinary getObjectForDebug(const ObjectFile &Obj) const override { return OwningBinary(); } + + RuntimeDyld::LoadedObjectInfo *clone() const { return new LoadedMachOObjectInfo(*this); } }; } -- cgit v1.2.3