[cfe-commits] r145110 - in /cfe/trunk: lib/Serialization/ASTWriterDecl.cpp test/Index/annotate-toplevel-in-objccontainer.m test/Index/annotate-toplevel-in-objccontainer.m.h

[Argyrios Kyrtzidis]

Author: akirtzidis
Date: Wed Nov 23 15:11:23 2011
New Revision: 145110

URL: http://llvm.org/viewvc/llvm-project?rev=145110&view=rev
Log:
[PCH] Check for isTopLevelDeclInObjCContainer when picking abbreviations.

Modified:
    cfe/trunk/lib/Serialization/ASTWriterDecl.cpp
    cfe/trunk/test/Index/annotate-toplevel-in-objccontainer.m
    cfe/trunk/test/Index/annotate-toplevel-in-objccontainer.m.h

Modified: cfe/trunk/lib/Serialization/ASTWriterDecl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTWriterDecl.cpp?rev=145110&r1=145109&r2=145110&view=diff
==============================================================================
--- cfe/trunk/lib/Serialization/ASTWriterDecl.cpp (original)
+++ cfe/trunk/lib/Serialization/ASTWriterDecl.cpp Wed Nov 23 15:11:23 2011
@@ -184,6 +184,7 @@
       D->RedeclLink.getNext() == D &&
       !D->isInvalidDecl() &&
       !D->isReferenced() &&
+      !D->isTopLevelDeclInObjCContainer() &&
       D->getAccess() == AS_none &&
       !D->isModulePrivate() &&
       D->getDeclName().getNameKind() == DeclarationName::Identifier)
@@ -234,6 +235,7 @@
       D->RedeclLink.getNext() == D &&
       !D->isInvalidDecl() &&
       !D->isReferenced() &&
+      !D->isTopLevelDeclInObjCContainer() &&
       D->getAccess() == AS_none &&
       !D->isModulePrivate() &&
       !CXXRecordDecl::classofKind(D->getKind()) &&
@@ -257,6 +259,7 @@
       D->RedeclLink.getNext() == D &&
       !D->isInvalidDecl() &&
       !D->isReferenced() &&
+      !D->isTopLevelDeclInObjCContainer() &&
       D->getAccess() == AS_none &&
       !D->isModulePrivate() &&
       !CXXRecordDecl::classofKind(D->getKind()) &&
@@ -627,6 +630,7 @@
       !D->isUsed(false) &&
       !D->isInvalidDecl() &&
       !D->isReferenced() &&
+      !D->isTopLevelDeclInObjCContainer() &&
       !D->isModulePrivate() &&
       !D->getBitWidth() &&
       !D->hasInClassInitializer() &&
@@ -679,6 +683,7 @@
       !D->isUsed(false) &&
       !D->isInvalidDecl() &&
       !D->isReferenced() &&
+      !D->isTopLevelDeclInObjCContainer() &&
       D->getAccess() == AS_none &&
       !D->isModulePrivate() &&
       D->getDeclName().getNameKind() == DeclarationName::Identifier &&

Modified: cfe/trunk/test/Index/annotate-toplevel-in-objccontainer.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/annotate-toplevel-in-objccontainer.m?rev=145110&r1=145109&r2=145110&view=diff
==============================================================================
--- cfe/trunk/test/Index/annotate-toplevel-in-objccontainer.m (original)
+++ cfe/trunk/test/Index/annotate-toplevel-in-objccontainer.m Wed Nov 23 15:11:23 2011
@@ -27,7 +27,7 @@
 // CHECK-IMPL: Identifier: "meth1" [14:8 - 14:13] ObjCInstanceMethodDecl=meth1:14:1 (Definition)
 // CHECK-IMPL: Identifier: "meth2" [15:8 - 15:13] ObjCInstanceMethodDecl=meth2:15:1 (Definition)
 
-// RUN: c-index-test -test-annotate-tokens=%s.h:5:1:7:1 %s -include %t.h \
+// RUN: c-index-test -test-annotate-tokens=%s.h:7:1:9:1 %s -include %t.h \
 // RUN:     | FileCheck -check-prefix=PCH %s
-// CHECK-PCH: Identifier: "meth1" [5:8 - 5:13] ObjCInstanceMethodDecl=meth1:5:1
-// CHECK-PCH: Identifier: "meth2" [6:8 - 6:13] ObjCInstanceMethodDecl=meth2:6:1
+// CHECK-PCH: Identifier: "meth1" [7:8 - 7:13] ObjCInstanceMethodDecl=meth1:7:1
+// CHECK-PCH: Identifier: "meth2" [8:8 - 8:13] ObjCInstanceMethodDecl=meth2:8:1

Modified: cfe/trunk/test/Index/annotate-toplevel-in-objccontainer.m.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/annotate-toplevel-in-objccontainer.m.h?rev=145110&r1=145109&r2=145110&view=diff
==============================================================================
--- cfe/trunk/test/Index/annotate-toplevel-in-objccontainer.m.h (original)
+++ cfe/trunk/test/Index/annotate-toplevel-in-objccontainer.m.h Wed Nov 23 15:11:23 2011
@@ -2,6 +2,8 @@
 void funcPCH1(int);
 void funcPCH2(int);
 
+enum E { Cake };
+
 -(void)meth1;
 -(void)meth2;
 @end