From 243a4c46d887b148195e06d6c6ecfd94727a1424 Mon Sep 17 00:00:00 2001
From: David Blaikie <dblaikie@gmail.com>
Date: Tue, 24 Jan 2012 04:29:23 +0000
Subject: [PATCH] Support undefined dependent bases.

llvm-svn: 148775
---
 clang/lib/Analysis/CFG.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/clang/lib/Analysis/CFG.cpp b/clang/lib/Analysis/CFG.cpp
index 7b84710b5944..c760d49899d6 100644
--- a/clang/lib/Analysis/CFG.cpp
+++ b/clang/lib/Analysis/CFG.cpp
@@ -750,13 +750,12 @@ void CFGBuilder::addImplicitDtorsForDestructor(const CXXDestructorDecl *DD) {
   // Before virtual bases destroy direct base objects.
   for (CXXRecordDecl::base_class_const_iterator BI = RD->bases_begin(),
       BE = RD->bases_end(); BI != BE; ++BI) {
-    if (!BI->isVirtual()) {
-      const CXXRecordDecl *CD = BI->getType()->getAsCXXRecordDecl();
-      if (!CD->hasTrivialDestructor()) {
-        autoCreateBlock();
-        appendBaseDtor(Block, BI);
-      }
-    }
+    if (!BI->isVirtual())
+      if (const CXXRecordDecl *CD = BI->getType()->getAsCXXRecordDecl())
+        if (!CD->hasTrivialDestructor()) {
+          autoCreateBlock();
+          appendBaseDtor(Block, BI);
+        }
   }
 
   // First destroy member objects.