[llvm-branch-commits] [cfe-branch] r115434 - in /cfe/branches/Apple/whitney: include/clang/AST/DeclObjC.h test/PCH/Inputs/chain-selectors1.h test/PCH/Inputs/chain-selectors2.h test/PCH/chain-selectors.m

[Daniel Dunbar]

Author: ddunbar
Date: Sat Oct  2 18:23:57 2010
New Revision: 115434

URL: http://llvm.org/viewvc/llvm-project?rev=115434&view=rev
Log:
Merge r115421:
--
Author: Douglas Gregor <dgregor at apple.com>
Date:   Sat Oct 2 21:06:43 2010 +0000

    When we insert a category (or class extension) into an interface, mark
    the interface as having changed since it was originally
    serialized. This ensures that we see class extensions/categories in
    chained PCH files.

Modified:
    cfe/branches/Apple/whitney/include/clang/AST/DeclObjC.h
    cfe/branches/Apple/whitney/test/PCH/Inputs/chain-selectors1.h
    cfe/branches/Apple/whitney/test/PCH/Inputs/chain-selectors2.h
    cfe/branches/Apple/whitney/test/PCH/chain-selectors.m

Modified: cfe/branches/Apple/whitney/include/clang/AST/DeclObjC.h
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney/include/clang/AST/DeclObjC.h?rev=115434&r1=115433&r2=115434&view=diff
==============================================================================
--- cfe/branches/Apple/whitney/include/clang/AST/DeclObjC.h (original)
+++ cfe/branches/Apple/whitney/include/clang/AST/DeclObjC.h Sat Oct  2 18:23:57 2010
@@ -991,6 +991,7 @@
   void insertNextClassCategory() {
     NextClassCategory = ClassInterface->getCategoryList();
     ClassInterface->setCategoryList(this);
+    ClassInterface->setChangedSinceDeserialization(true);
   }
 
   bool IsClassExtension() const { return getIdentifier() == 0; }

Modified: cfe/branches/Apple/whitney/test/PCH/Inputs/chain-selectors1.h
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney/test/PCH/Inputs/chain-selectors1.h?rev=115434&r1=115433&r2=115434&view=diff
==============================================================================
--- cfe/branches/Apple/whitney/test/PCH/Inputs/chain-selectors1.h (original)
+++ cfe/branches/Apple/whitney/test/PCH/Inputs/chain-selectors1.h Sat Oct  2 18:23:57 2010
@@ -10,3 +10,7 @@
   //(void)@selector(x);
   (void)@selector(f);
 }
+
+ at interface X (Blah)
+- (void)blah_method;
+ at end

Modified: cfe/branches/Apple/whitney/test/PCH/Inputs/chain-selectors2.h
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney/test/PCH/Inputs/chain-selectors2.h?rev=115434&r1=115433&r2=115434&view=diff
==============================================================================
--- cfe/branches/Apple/whitney/test/PCH/Inputs/chain-selectors2.h (original)
+++ cfe/branches/Apple/whitney/test/PCH/Inputs/chain-selectors2.h Sat Oct  2 18:23:57 2010
@@ -9,3 +9,7 @@
   //(void)@selector(y);
   //(void)@selector(e);
 }
+
+ at interface X (Blarg)
+- (void)blarg_method;
+ at end

Modified: cfe/branches/Apple/whitney/test/PCH/chain-selectors.m
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney/test/PCH/chain-selectors.m?rev=115434&r1=115433&r2=115434&view=diff
==============================================================================
--- cfe/branches/Apple/whitney/test/PCH/chain-selectors.m (original)
+++ cfe/branches/Apple/whitney/test/PCH/chain-selectors.m Sat Oct  2 18:23:57 2010
@@ -22,3 +22,19 @@
   (void)@selector(y); // expected-warning {{unimplemented selector}}
   (void)@selector(e); // expected-warning {{unimplemented selector}}
 }
+
+ at implementation X (Blah)
+- (void)test_Blah {
+  [self blah_method];
+}
+
+- (void)blah_method { }
+ at end
+
+ at implementation X (Blarg)
+- (void)test_Blarg {
+  [self blarg_method];
+}
+
+- (void)blarg_method { }
+ at end