diff options
author | Tobias Grosser <tobias@grosser.es> | 2015-05-22 06:01:04 +0000 |
---|---|---|
committer | Tobias Grosser <tobias@grosser.es> | 2015-05-22 06:01:04 +0000 |
commit | 87fc5f8695d9b1ef6ae807e79680bdcf7c94f546 (patch) | |
tree | 771c793e1f85b7141c2f209da87f7c375fe23de3 /llvm/lib/ExecutionEngine/RuntimeDyld | |
parent | 9b139800a70d86682bda6c23cbd0da3aba71a217 (diff) | |
download | bcm5719-llvm-87fc5f8695d9b1ef6ae807e79680bdcf7c94f546.tar.gz bcm5719-llvm-87fc5f8695d9b1ef6ae807e79680bdcf7c94f546.zip |
Revert "Fix Clang -Wmissing-override warning"
This reverts commit r237975. This seems also to break with gcc 4.7
llvm-svn: 238004
Diffstat (limited to 'llvm/lib/ExecutionEngine/RuntimeDyld')
3 files changed, 12 insertions, 9 deletions
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<LoadedCOFFObjectInfo> { +class LoadedCOFFObjectInfo : public RuntimeDyld::LoadedObjectInfo { public: LoadedCOFFObjectInfo(RuntimeDyldImpl &RTDyld, unsigned BeginIdx, unsigned EndIdx) - : LoadedObjectInfoHelper(RTDyld, BeginIdx, EndIdx) {} + : RuntimeDyld::LoadedObjectInfo(RTDyld, BeginIdx, EndIdx) {} OwningBinary<ObjectFile> getObjectForDebug(const ObjectFile &Obj) const override { return OwningBinary<ObjectFile>(); } + + 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<ELFT>::updateSymbolAddress(const SymbolRef &SymRef, sym->st_value = static_cast<addr_type>(Addr); } -class LoadedELFObjectInfo - : public RuntimeDyld::LoadedObjectInfoHelper<LoadedELFObjectInfo> { +class LoadedELFObjectInfo : public RuntimeDyld::LoadedObjectInfo { public: LoadedELFObjectInfo(RuntimeDyldImpl &RTDyld, unsigned BeginIdx, unsigned EndIdx) - : LoadedObjectInfoHelper(RTDyld, BeginIdx, EndIdx) {} + : RuntimeDyld::LoadedObjectInfo(RTDyld, BeginIdx, EndIdx) {} OwningBinary<ObjectFile> getObjectForDebug(const ObjectFile &Obj) const override; + + RuntimeDyld::LoadedObjectInfo *clone() const { return new LoadedELFObjectInfo(*this); } }; template <typename ELFT> 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<LoadedMachOObjectInfo> { +class LoadedMachOObjectInfo : public RuntimeDyld::LoadedObjectInfo { public: LoadedMachOObjectInfo(RuntimeDyldImpl &RTDyld, unsigned BeginIdx, unsigned EndIdx) - : LoadedObjectInfoHelper(RTDyld, BeginIdx, EndIdx) {} + : RuntimeDyld::LoadedObjectInfo(RTDyld, BeginIdx, EndIdx) {} OwningBinary<ObjectFile> getObjectForDebug(const ObjectFile &Obj) const override { return OwningBinary<ObjectFile>(); } + + RuntimeDyld::LoadedObjectInfo *clone() const { return new LoadedMachOObjectInfo(*this); } }; } |