[cfe-commits] r144766 - in /cfe/trunk: lib/Frontend/ASTUnit.cpp lib/Parse/ParseObjc.cpp test/Index/invalid-code-rdar10451854.m

[Argyrios Kyrtzidis]

Author: akirtzidis
Date: Tue Nov 15 20:35:10 2011
New Revision: 144766

URL: http://llvm.org/viewvc/llvm-project?rev=144766&view=rev
Log:
[libclang] Fix crash on invalid code. Fixes rdar://10451854

Added:
    cfe/trunk/test/Index/invalid-code-rdar10451854.m
Modified:
    cfe/trunk/lib/Frontend/ASTUnit.cpp
    cfe/trunk/lib/Parse/ParseObjc.cpp

Modified: cfe/trunk/lib/Frontend/ASTUnit.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/ASTUnit.cpp?rev=144766&r1=144765&r2=144766&view=diff
==============================================================================
--- cfe/trunk/lib/Frontend/ASTUnit.cpp (original)
+++ cfe/trunk/lib/Frontend/ASTUnit.cpp Tue Nov 15 20:35:10 2011
@@ -853,6 +853,9 @@
   }
 
   void handleTopLevelDecl(Decl *D) {
+    if (!D)
+      return;
+
     // FIXME: Currently ObjC method declarations are incorrectly being
     // reported as top-level declarations, even though their DeclContext
     // is the containing ObjC @interface/@implementation.  This is a

Modified: cfe/trunk/lib/Parse/ParseObjc.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseObjc.cpp?rev=144766&r1=144765&r2=144766&view=diff
==============================================================================
--- cfe/trunk/lib/Parse/ParseObjc.cpp (original)
+++ cfe/trunk/lib/Parse/ParseObjc.cpp Tue Nov 15 20:35:10 2011
@@ -1487,7 +1487,8 @@
   Actions.DefaultSynthesizeProperties(getCurScope(), ObjCImpDecl);
   for (size_t i = 0; i < LateParsedObjCMethods.size(); ++i) {
     Decl *D = ParseLexedObjCMethodDefs(*LateParsedObjCMethods[i]);
-    DeclsInGroup.push_back(D);
+    if (D)
+      DeclsInGroup.push_back(D);
   }
   DeclsInGroup.push_back(ObjCImpDecl);
   

Added: cfe/trunk/test/Index/invalid-code-rdar10451854.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/invalid-code-rdar10451854.m?rev=144766&view=auto
==============================================================================
--- cfe/trunk/test/Index/invalid-code-rdar10451854.m (added)
+++ cfe/trunk/test/Index/invalid-code-rdar10451854.m Tue Nov 15 20:35:10 2011
@@ -0,0 +1,15 @@
+struct {
+
+ at implementation Foo
+
+- (void)finalize {
+  NSLog(@"bar");
+}
+
+- (NSArray *)graphics {
+}
+
+ at end
+
+// Test that we don't crash
+// RUN: c-index-test -test-load-source-reparse 3 local %s