diff options
| author | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2012-03-12 18:34:26 +0000 |
|---|---|---|
| committer | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2012-03-12 18:34:26 +0000 |
| commit | 9a0b6b4e2bf6a9ef41d32b4e83f2911981d2d44d (patch) | |
| tree | 74c06e15b112b1129067fce2b824f3a490db26cb | |
| parent | d8b5ca14277e142506daed181ecff9151dfae32c (diff) | |
[Sema] -Add an invalid objc category to the DeclContext so that it can be
serialized
-Don't add methods of invalid objc containers to the global method pool.
This protects us from trying to serialize a method whose container was not
serialized.
Part of rdar://11007039.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@152566 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Sema/SemaDeclObjC.cpp | 5 | ||||
| -rw-r--r-- | test/Index/pch-with-errors.m | 28 |
2 files changed, 33 insertions, 0 deletions
diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp index 285ef015d7..27bdcd6c8c 100644 --- a/lib/Sema/SemaDeclObjC.cpp +++ b/lib/Sema/SemaDeclObjC.cpp @@ -766,6 +766,7 @@ ActOnStartCategoryInterface(SourceLocation AtInterfaceLoc, CDecl = ObjCCategoryDecl::Create(Context, CurContext, AtInterfaceLoc, ClassLoc, CategoryLoc, CategoryName,IDecl); CDecl->setInvalidDecl(); + CurContext->addDecl(CDecl); if (!IDecl) Diag(ClassLoc, diag::err_undef_interface) << ClassName; @@ -2018,6 +2019,10 @@ void Sema::ReadMethodPool(Selector Sel) { void Sema::AddMethodToGlobalPool(ObjCMethodDecl *Method, bool impl, bool instance) { + // Ignore methods of invalid containers. + if (cast<Decl>(Method->getDeclContext())->isInvalidDecl()) + return; + if (ExternalSource) ReadMethodPool(Method->getSelector()); diff --git a/test/Index/pch-with-errors.m b/test/Index/pch-with-errors.m new file mode 100644 index 0000000000..cc42cd3081 --- /dev/null +++ b/test/Index/pch-with-errors.m @@ -0,0 +1,28 @@ +#ifndef HEADER +#define HEADER + +@interface I(cat) +-(void)meth; +@end + +@interface I2 +-(void)meth; +@end + +#else + +void foo(I2 *i) { + [i meth]; +} + +#endif + +// RUN: c-index-test -write-pch %t.h.pch %s -Xclang -detailed-preprocessing-record +// RUN: c-index-test -test-load-source local %s -include %t.h -Xclang -detailed-preprocessing-record | FileCheck -check-prefix=CHECK-PARSE %s +// RUN: c-index-test -index-file %s -include %t.h -Xclang -detailed-preprocessing-record | FileCheck -check-prefix=CHECK-INDEX %s + +// CHECK-PARSE: pch-with-errors.m:{{.*}} FunctionDecl=foo +// CHECK-PARSE: pch-with-errors.m:{{.*}} ObjCMessageExpr=meth + +// CHECK-INDEX: [indexDeclaration]: kind: function | name: foo +// CHECK-INDEX: [indexEntityReference]: kind: objc-instance-method | name: meth |