diff --git a/clang/Driver/ASTConsumers.cpp b/clang/Driver/ASTConsumers.cpp
index d58eca5d35a4..0ae88dd0c8ef 100644
--- a/clang/Driver/ASTConsumers.cpp
+++ b/clang/Driver/ASTConsumers.cpp
@@ -652,6 +652,9 @@ ASTConsumer* clang::CreateGRSimpleVals(Diagnostic &Diags,
 
 void GRSimpleValsVisitor::VisitCFG(CFG& C, Decl& CD) {
   
+  if (Diags.hasErrorOccurred())
+    return;
+  
   SourceLocation Loc = CD.getLocation();
 
   if (!Loc.isFileID() ||