summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Blaikie <dblaikie@gmail.com>2015-06-04 20:41:51 +0000
committerDavid Blaikie <dblaikie@gmail.com>2015-06-04 20:41:51 +0000
commitd8445a5617d6af05883721afef4c32458923b7e3 (patch)
tree995d3e9e5f25cd5e39859f68f28e43f4def809da
parent8207641251706ea808df6d2a1ea8f87b8ee04c6d (diff)
downloadbcm5719-llvm-d8445a5617d6af05883721afef4c32458923b7e3.tar.gz
bcm5719-llvm-d8445a5617d6af05883721afef4c32458923b7e3.zip
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
-rw-r--r--llvm/include/llvm/DebugInfo/DIContext.h2
-rw-r--r--llvm/include/llvm/ExecutionEngine/RuntimeDyld.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/llvm/include/llvm/DebugInfo/DIContext.h b/llvm/include/llvm/DebugInfo/DIContext.h
index 7be795f9a43..d8830da56b5 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 ac0151aa7ec..1d75346fee3 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<object::ObjectFile>
getObjectForDebug(const object::ObjectFile &Obj) const = 0;
OpenPOWER on IntegriCloud