From d8978ec085f2603bb0c5b783d4a88fac7dec8d94 Mon Sep 17 00:00:00 2001 From: David Blaikie Date: Wed, 17 Sep 2014 22:17:59 +0000 Subject: [PATCH] Revert "Fix -Wnon-virtual-dtor warning introduced in r217982." An alternative fix was already committed. This reverts commit r217988. llvm-svn: 217989 --- llvm/include/llvm/Transforms/Utils/SimplifyLibCalls.h | 3 --- llvm/lib/Transforms/InstCombine/InstructionCombining.cpp | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/llvm/include/llvm/Transforms/Utils/SimplifyLibCalls.h b/llvm/include/llvm/Transforms/Utils/SimplifyLibCalls.h index 3b99a8cdcf1d..c7f5bb026c65 100644 --- a/llvm/include/llvm/Transforms/Utils/SimplifyLibCalls.h +++ b/llvm/include/llvm/Transforms/Utils/SimplifyLibCalls.h @@ -36,9 +36,6 @@ private: const TargetLibraryInfo *TLI; bool UnsafeFPShrink; -protected: - ~LibCallSimplifier() {} - public: LibCallSimplifier(const DataLayout *TD, const TargetLibraryInfo *TLI, bool UnsafeFPShrink); diff --git a/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp b/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp index ac0c01e3c7b4..26f243cb1506 100644 --- a/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp +++ b/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp @@ -2908,7 +2908,7 @@ bool InstCombiner::DoOneIteration(Function &F, unsigned Iteration) { } namespace { -class InstCombinerLibCallSimplifier final : public LibCallSimplifier { +class InstCombinerLibCallSimplifier : public LibCallSimplifier { InstCombiner *IC; public: InstCombinerLibCallSimplifier(const DataLayout *DL,