From 59b0bfef0df93d5e0f67c44dce999aa91d26f13f Mon Sep 17 00:00:00 2001 From: Rui Ueyama Date: Sat, 4 Apr 2015 02:59:52 +0000 Subject: [PATCH] ELF: Return TargetRelocationHandler instead of TargetRelocationHandler. getRelocationHandler is a public interface to get an instance of TargetRelocationHandler. We don't use any member function other than applyRelocations to a returned instance. Returning a base class instance suffices here. (If a return type is a derived class, it looks like we were using derived classes features.) llvm-svn: 234081 --- lld/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h | 2 +- lld/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.h | 2 +- lld/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h | 2 +- lld/lib/ReaderWriter/ELF/X86/X86TargetHandler.h | 2 +- lld/lib/ReaderWriter/ELF/X86_64/X86_64TargetHandler.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lld/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h b/lld/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h index 6f6dce0626b7..f1ddc81bc1c3 100644 --- a/lld/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h +++ b/lld/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h @@ -27,7 +27,7 @@ class AArch64TargetHandler final : public TargetHandler { public: AArch64TargetHandler(AArch64LinkingContext &ctx); - const AArch64TargetRelocationHandler &getRelocationHandler() const override { + const TargetRelocationHandler &getRelocationHandler() const override { return *_relocationHandler; } diff --git a/lld/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.h b/lld/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.h index 0f3064728730..7817fd7ae27e 100644 --- a/lld/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.h +++ b/lld/lib/ReaderWriter/ELF/ARM/ARMTargetHandler.h @@ -67,7 +67,7 @@ class ARMTargetHandler final : public TargetHandler { public: ARMTargetHandler(ARMLinkingContext &ctx); - const ARMTargetRelocationHandler &getRelocationHandler() const override { + const TargetRelocationHandler &getRelocationHandler() const override { return *_relocationHandler; } diff --git a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h index b51d6e92d273..31bd9633d1c5 100644 --- a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h +++ b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h @@ -107,7 +107,7 @@ class HexagonTargetHandler final : public TargetHandler { public: HexagonTargetHandler(HexagonLinkingContext &targetInfo); - const HexagonTargetRelocationHandler &getRelocationHandler() const override { + const TargetRelocationHandler &getRelocationHandler() const override { return *_relocationHandler; } diff --git a/lld/lib/ReaderWriter/ELF/X86/X86TargetHandler.h b/lld/lib/ReaderWriter/ELF/X86/X86TargetHandler.h index fbb549d5faee..42bc9b4d8e5c 100644 --- a/lld/lib/ReaderWriter/ELF/X86/X86TargetHandler.h +++ b/lld/lib/ReaderWriter/ELF/X86/X86TargetHandler.h @@ -27,7 +27,7 @@ class X86TargetHandler final : public TargetHandler { public: X86TargetHandler(X86LinkingContext &ctx); - const X86TargetRelocationHandler &getRelocationHandler() const override { + const TargetRelocationHandler &getRelocationHandler() const override { return *_relocationHandler; } diff --git a/lld/lib/ReaderWriter/ELF/X86_64/X86_64TargetHandler.h b/lld/lib/ReaderWriter/ELF/X86_64/X86_64TargetHandler.h index 9b417b093922..9c190bfced76 100644 --- a/lld/lib/ReaderWriter/ELF/X86_64/X86_64TargetHandler.h +++ b/lld/lib/ReaderWriter/ELF/X86_64/X86_64TargetHandler.h @@ -65,7 +65,7 @@ class X86_64TargetHandler : public TargetHandler { public: X86_64TargetHandler(X86_64LinkingContext &ctx); - const X86_64TargetRelocationHandler &getRelocationHandler() const override { + const TargetRelocationHandler &getRelocationHandler() const override { return *_relocationHandler; }