[llvm] r217989 - Revert "Fix -Wnon-virtual-dtor warning introduced in r217982."

[David Blaikie]

Author: dblaikie
Date: Wed Sep 17 17:17:59 2014
New Revision: 217989

URL: http://llvm.org/viewvc/llvm-project?rev=217989&view=rev
Log:
Revert "Fix -Wnon-virtual-dtor warning introduced in r217982."

An alternative fix was already committed.

This reverts commit r217988.

Modified:
    llvm/trunk/include/llvm/Transforms/Utils/SimplifyLibCalls.h
    llvm/trunk/lib/Transforms/InstCombine/InstructionCombining.cpp

Modified: llvm/trunk/include/llvm/Transforms/Utils/SimplifyLibCalls.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Transforms/Utils/SimplifyLibCalls.h?rev=217989&r1=217988&r2=217989&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Transforms/Utils/SimplifyLibCalls.h (original)
+++ llvm/trunk/include/llvm/Transforms/Utils/SimplifyLibCalls.h Wed Sep 17 17:17:59 2014
@@ -36,9 +36,6 @@ private:
   const TargetLibraryInfo *TLI;
   bool UnsafeFPShrink;
 
-protected:
-  ~LibCallSimplifier() {}
-
 public:
   LibCallSimplifier(const DataLayout *TD, const TargetLibraryInfo *TLI,
                     bool UnsafeFPShrink);

Modified: llvm/trunk/lib/Transforms/InstCombine/InstructionCombining.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/InstCombine/InstructionCombining.cpp?rev=217989&r1=217988&r2=217989&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/InstCombine/InstructionCombining.cpp (original)
+++ llvm/trunk/lib/Transforms/InstCombine/InstructionCombining.cpp Wed Sep 17 17:17:59 2014
@@ -2908,7 +2908,7 @@ bool InstCombiner::DoOneIteration(Functi
 }
 
 namespace {
-class InstCombinerLibCallSimplifier final : public LibCallSimplifier {
+class InstCombinerLibCallSimplifier : public LibCallSimplifier {
   InstCombiner *IC;
 public:
   InstCombinerLibCallSimplifier(const DataLayout *DL,