2 files changed, 13 insertions, 8 deletions
diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp
index 3165ad065b2..923aab291db 100644
--- a/clang/lib/AST/ASTContext.cpp
+++ b/clang/lib/AST/ASTContext.cpp
@@ -29,13 +29,7 @@ enum FloatingRank {
 ASTContext::~ASTContext() {
   // Deallocate all the types.
   while (!Types.empty()) {
-    if (FunctionTypeProto *FT = dyn_cast<FunctionTypeProto>(Types.back())) {
-      // Destroy the object, but don't call delete.  These are malloc'd.
-      FT->~FunctionTypeProto();
-      free(FT);
-    } else {
-      delete Types.back();
-    }
+    Types.back()->Destroy(*this);
     Types.pop_back();
   }
 }
diff --git a/clang/lib/AST/Type.cpp b/clang/lib/AST/Type.cpp
index 741d59bc766..e561a1074ce 100644
--- a/clang/lib/AST/Type.cpp
+++ b/clang/lib/AST/Type.cpp
@@ -22,7 +22,18 @@
 #include <sstream>
 using namespace clang;
 
-Type::~Type() {}
+void Type::Destroy(ASTContext& C) { delete this; }
+
+void FunctionTypeProto::Destroy(ASTContext& C) {
+  // Destroy the object, but don't call delete.  These are malloc'd.
+  this->~FunctionTypeProto();
+  free(this);  
+}
+
+void VariableArrayType::Destroy(ASTContext& C) {
+  SizeExpr->Destroy(C);
+  delete this;  
+}
 
 /// isVoidType - Helper method to determine if this is the 'void' type.
 bool Type::isVoidType() const {