From d8445a5617d6af05883721afef4c32458923b7e3 Mon Sep 17 00:00:00 2001 From: David Blaikie Date: Thu, 4 Jun 2015 20:41:51 +0000 Subject: [PATCH] Retry defaulting the virtual dtor in LoadedObjectInfo Originally committed in r237975, GCC 4.7 gave a compilation error regarding "looser throw specification" though it seemed to be pointing to a virtual defaulted dtor in a base class and an override defaulted dtor in a derived class - so I'm not quite sure why/how they could end up with different throw specifications. To simplify and reduce the risk of this, I've just removed the pointless override in the derived class, the base class's should be sufficient. *fingers crossed* llvm-svn: 239088 --- llvm/include/llvm/DebugInfo/DIContext.h | 2 +- llvm/include/llvm/ExecutionEngine/RuntimeDyld.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/llvm/include/llvm/DebugInfo/DIContext.h b/llvm/include/llvm/DebugInfo/DIContext.h index 7be795f..d8830da 100644 --- a/llvm/include/llvm/DebugInfo/DIContext.h +++ b/llvm/include/llvm/DebugInfo/DIContext.h @@ -141,7 +141,7 @@ private: /// on the fly. class LoadedObjectInfo { public: - virtual ~LoadedObjectInfo() {} + virtual ~LoadedObjectInfo() = default; /// Obtain the Load Address of a section by Name. /// diff --git a/llvm/include/llvm/ExecutionEngine/RuntimeDyld.h b/llvm/include/llvm/ExecutionEngine/RuntimeDyld.h index ac0151a..1d75346 100644 --- a/llvm/include/llvm/ExecutionEngine/RuntimeDyld.h +++ b/llvm/include/llvm/ExecutionEngine/RuntimeDyld.h @@ -62,8 +62,6 @@ public: unsigned EndIdx) : RTDyld(RTDyld), BeginIdx(BeginIdx), EndIdx(EndIdx) { } - virtual ~LoadedObjectInfo() = default; - virtual object::OwningBinary getObjectForDebug(const object::ObjectFile &Obj) const = 0; -- 2.7.4