diff --git a/include/llvm/Transforms/Utils/SimplifyLibCalls.h b/include/llvm/Transforms/Utils/SimplifyLibCalls.h
index 20c1cafc0f3..c7f5bb026c6 100644
--- a/include/llvm/Transforms/Utils/SimplifyLibCalls.h
+++ b/include/llvm/Transforms/Utils/SimplifyLibCalls.h
@@ -40,6 +40,10 @@ 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