From 52675f31e50af98a30d5407d2cf564026294f82f Mon Sep 17 00:00:00 2001 From: David Blaikie Date: Wed, 17 Sep 2014 22:27:36 +0000 Subject: [PATCH] Reapply fix in r217988 (reverted in r217989) and remove the alternative fix committed in r217987. This type isn't owned polymorphically (as demonstrated by making the dtor protected and everything still compiling) so just address the warning by protecting the base dtor and making the derived class final. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@217990 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Transforms/Utils/SimplifyLibCalls.h | 7 +++---- lib/Transforms/InstCombine/InstructionCombining.cpp | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/include/llvm/Transforms/Utils/SimplifyLibCalls.h b/include/llvm/Transforms/Utils/SimplifyLibCalls.h index c7f5bb026c6..0780c74429e 100644 --- a/include/llvm/Transforms/Utils/SimplifyLibCalls.h +++ b/include/llvm/Transforms/Utils/SimplifyLibCalls.h @@ -36,14 +36,13 @@ private: const TargetLibraryInfo *TLI; bool UnsafeFPShrink; +protected: + ~LibCallSimplifier() {} + public: LibCallSimplifier(const DataLayout *TD, const TargetLibraryInfo *TLI, bool UnsafeFPShrink); - /// ~LibCallSimplifier - Adding the virtual destructor back in to satisfy - /// -Wnon-virtual-dtor. This class is used polymorphically by InstCombine. - virtual ~LibCallSimplifier() {} - /// optimizeCall - Take the given call instruction and return a more /// optimal value to replace the instruction with or 0 if a more /// optimal form can't be found. Note that the returned value may diff --git a/lib/Transforms/InstCombine/InstructionCombining.cpp b/lib/Transforms/InstCombine/InstructionCombining.cpp index 26f243cb150..ac0c01e3c7b 100644 --- a/lib/Transforms/InstCombine/InstructionCombining.cpp +++ b/lib/Transforms/InstCombine/InstructionCombining.cpp @@ -2908,7 +2908,7 @@ bool InstCombiner::DoOneIteration(Function &F, unsigned Iteration) { } namespace { -class InstCombinerLibCallSimplifier : public LibCallSimplifier { +class InstCombinerLibCallSimplifier final : public LibCallSimplifier { InstCombiner *IC; public: InstCombinerLibCallSimplifier(const DataLayout *DL, -- 2.34.1