[analyzer] Fix a crash in templated code which uses blocks.

We should investigate why signature info is not set in this case.

llvm-svn: 156784

diff --git a/clang/include/clang/AST/RecursiveASTVisitor.h b/clang/include/clang/AST/RecursiveASTVisitor.h
index 41a6d8f..3d502d2 100644 (file)
--- a/clang/include/clang/AST/RecursiveASTVisitor.h
+++ b/clang/include/clang/AST/RecursiveASTVisitor.h
@@ -1241,7 +1241,9 @@ bool RecursiveASTVisitor<Derived>::Traverse##DECL (DECL *D) {   \
 DEF_TRAVERSE_DECL(AccessSpecDecl, { })
 
 DEF_TRAVERSE_DECL(BlockDecl, {
-    TRY_TO(TraverseTypeLoc(D->getSignatureAsWritten()->getTypeLoc()));
+    TypeSourceInfo *TInfo = D->getSignatureAsWritten();
+    if (TInfo)
+      TRY_TO(TraverseTypeLoc(TInfo->getTypeLoc()));
     TRY_TO(TraverseStmt(D->getBody()));
     // This return statement makes sure the traversal of nodes in
     // decls_begin()/decls_end() (done in the DEF_TRAVERSE_DECL macro)

diff --git a/clang/test/Analysis/templates.cpp b/clang/test/Analysis/templates.cpp
new file mode 100644 (file)
index 0000000..6add18c
--- /dev/null
+++ b/clang/test/Analysis/templates.cpp
@@ -0,0 +1,29 @@
+// RUN: %clang_cc1 -analyze -analyzer-checker=core -fblocks -verify %s
+
+// Do not crash on this templated code which uses a block.
+typedef void (^my_block)(void);
+static void useBlock(my_block block){}
+template<class T> class MyClass;
+typedef MyClass<float> Mf;
+
+template<class T>
+class MyClass
+{
+public:
+  MyClass() {}
+  MyClass(T a);
+  void I();
+private:
+ static const T one;
+};
+
+template<class T> const T MyClass<T>::one = static_cast<T>(1);
+template<class T> inline MyClass<T>::MyClass(T a){}
+template<class T> void MyClass<T>::I() {
+  static MyClass<T>* mPtr = 0;
+  useBlock(^{ mPtr = new MyClass<T> (MyClass<T>::one); });
+};
+int main(){
+  Mf m;
+  m.I();
+}