Teach 'ExecutionContinues' (part of BugReporter's diagnostic generation) about BlockDecls.

llvm-svn: 90584

1 files changed, 13 insertions, 4 deletions

diff --git a/clang/lib/Analysis/BugReporter.cpp b/clang/lib/Analysis/BugReporter.cpp
index c26a60af9c8..e6482698dd4 100644
--- a/clang/lib/Analysis/BugReporter.cpp
+++ b/clang/lib/Analysis/BugReporter.cpp
@@ -204,10 +204,19 @@ PathDiagnosticBuilder::ExecutionContinues(llvm::raw_string_ostream& os,
     os << "Execution continues on line "
        << getSourceManager().getInstantiationLineNumber(Loc.asLocation())
        << '.';
-  else
-    os << "Execution jumps to the end of the "
-       << (isa<ObjCMethodDecl>(N->getLocationContext()->getDecl()) ?
-             "method" : "function") << '.';
+  else {
+    os << "Execution jumps to the end of the ";
+    const Decl *D = N->getLocationContext()->getDecl();
+    if (isa<ObjCMethodDecl>(D))
+      os << "method";
+    else if (isa<FunctionDecl>(D))
+      os << "function";
+    else {
+      assert(isa<BlockDecl>(D));
+      os << "anonymous block";
+    }
+    os << '.';
+  }
 
   return Loc;
 }