diff --git a/lib/AST/DeclCXX.cpp b/lib/AST/DeclCXX.cpp
index 174e8b6..e3a0f48 100644
--- a/lib/AST/DeclCXX.cpp
+++ b/lib/AST/DeclCXX.cpp
@@ -529,6 +529,8 @@
   
   for (CXXRecordDecl::base_class_iterator VBase = ClassDecl->vbases_begin(),
        E = ClassDecl->vbases_end(); VBase != E; ++VBase) {
+    if (VBase->getType()->isDependentType())
+      continue;
     // Skip over virtual bases which have trivial destructors.
     CXXRecordDecl *BaseClassDecl
       = cast<CXXRecordDecl>(VBase->getType()->getAs<RecordType>()->getDecl());
@@ -543,6 +545,8 @@
        E = ClassDecl->bases_end(); Base != E; ++Base) {
     if (Base->isVirtual())
       continue;
+    if (Base->getType()->isDependentType())
+      continue;
     // Skip over virtual bases which have trivial destructors.
     CXXRecordDecl *BaseClassDecl
       = cast<CXXRecordDecl>(Base->getType()->getAs<RecordType>()->getDecl());
diff --git a/test/SemaTemplate/destructor-template.cpp b/test/SemaTemplate/destructor-template.cpp
new file mode 100644
index 0000000..a7c8d24
--- /dev/null
+++ b/test/SemaTemplate/destructor-template.cpp
@@ -0,0 +1,12 @@
+// RUN: clang-cc -fsyntax-only -verify %s
+
+template<typename A> class s0 {
+
+  template<typename B> class s1 : public s0<A> {
+    ~s1() {}
+    s0<A> ms0;
+  };
+
+};
+
+