diff --git a/clang/lib/Sema/AnalysisBasedWarnings.cpp b/clang/lib/Sema/AnalysisBasedWarnings.cpp
index 355e114746c3dffc0157a0097687066b58704a2d..3e6cd81b7601082f0290e5c9212fd6bea69d0716 100644
--- a/clang/lib/Sema/AnalysisBasedWarnings.cpp
+++ b/clang/lib/Sema/AnalysisBasedWarnings.cpp
@@ -519,7 +519,24 @@ AnalysisBasedWarnings::IssueWarnings(sema::AnalysisBasedWarnings::Policy P,
   
   if (Diags.getDiagnosticLevel(diag::warn_uninit_var, D->getLocStart())
       != Diagnostic::Ignored) {
-    if (CFG *cfg = AC.getCFG()) {
+    ASTContext &ctx = D->getASTContext();
+    llvm::OwningPtr<CFG> tmpCFG;
+    bool useAlternateCFG = false;
+    if (ctx.getLangOptions().CPlusPlus) {
+      // Temporary workaround: implicit dtors in the CFG can confuse
+      // the path-sensitivity in the uninitialized values analysis.
+      // For now create (if necessary) a separate CFG without implicit dtors.
+      // FIXME: We should not need to do this, as it results in multiple
+      // CFGs getting constructed.
+      CFG::BuildOptions B;
+      B.AddEHEdges = false;
+      B.AddImplicitDtors = false;
+      B.AddInitializers = true;
+      tmpCFG.reset(CFG::buildCFG(D, AC.getBody(), &ctx, B));
+      useAlternateCFG = true;
+    }
+    CFG *cfg = useAlternateCFG ? tmpCFG.get() : AC.getCFG();
+    if (cfg) {
       UninitValsDiagReporter reporter(S);
       runUninitializedVariablesAnalysis(*cast<DeclContext>(D), *cfg, AC,
                                         reporter);