From: David Blaikie <dblaikie@gmail.com>
Date: Wed, 17 Sep 2014 22:17:59 +0000 (+0000)
Subject: Revert "Fix -Wnon-virtual-dtor warning introduced in r217982."
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f8b9ec99b881707380ab51f3577cd46639e7143b;p=oota-llvm.git

Revert "Fix -Wnon-virtual-dtor warning introduced in r217982."

An alternative fix was already committed.

This reverts commit r217988.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@217989 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/llvm/Transforms/Utils/SimplifyLibCalls.h b/include/llvm/Transforms/Utils/SimplifyLibCalls.h
index 3b99a8cdcf1..c7f5bb026c6 100644
--- a/include/llvm/Transforms/Utils/SimplifyLibCalls.h
+++ b/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/lib/Transforms/InstCombine/InstructionCombining.cpp b/lib/Transforms/InstCombine/InstructionCombining.cpp
index ac0c01e3c7b..26f243cb150 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 final : public LibCallSimplifier {
+class InstCombinerLibCallSimplifier : public LibCallSimplifier {
   InstCombiner *IC;
 public:
   InstCombinerLibCallSimplifier(const DataLayout *DL,