[cfe-commits] r130104 - in /cfe/trunk: lib/Serialization/ASTCommon.h lib/Serialization/ASTReaderDecl.cpp lib/Serialization/ASTWriterDecl.cpp test/PCH/chain-late-anonymous-namespace.cpp

[Sebastian Redl]

Author: cornedbee
Date: Sun Apr 24 11:28:13 2011
New Revision: 130104

URL: http://llvm.org/viewvc/llvm-project?rev=130104&view=rev
Log:
Fix adding an anonymous namespace in a chained PCH to a namespace from a previous PCH.
Fix anonymous namespaces in PCH.

Added:
    cfe/trunk/test/PCH/chain-late-anonymous-namespace.cpp
Modified:
    cfe/trunk/lib/Serialization/ASTCommon.h
    cfe/trunk/lib/Serialization/ASTReaderDecl.cpp
    cfe/trunk/lib/Serialization/ASTWriterDecl.cpp

Modified: cfe/trunk/lib/Serialization/ASTCommon.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTCommon.h?rev=130104&r1=130103&r2=130104&view=diff
==============================================================================
--- cfe/trunk/lib/Serialization/ASTCommon.h (original)
+++ cfe/trunk/lib/Serialization/ASTCommon.h Sun Apr 24 11:28:13 2011
@@ -23,7 +23,8 @@
 enum DeclUpdateKind {
   UPD_CXX_SET_DEFINITIONDATA,
   UPD_CXX_ADDED_IMPLICIT_MEMBER,
-  UPD_CXX_ADDED_TEMPLATE_SPECIALIZATION
+  UPD_CXX_ADDED_TEMPLATE_SPECIALIZATION,
+  UPD_CXX_ADDED_ANONYMOUS_NAMESPACE
 };
 
 TypeIdx TypeIdxFromBuiltin(const BuiltinType *BT);

Modified: cfe/trunk/lib/Serialization/ASTReaderDecl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTReaderDecl.cpp?rev=130104&r1=130103&r2=130104&view=diff
==============================================================================
--- cfe/trunk/lib/Serialization/ASTReaderDecl.cpp (original)
+++ cfe/trunk/lib/Serialization/ASTReaderDecl.cpp Sun Apr 24 11:28:13 2011
@@ -1737,6 +1737,16 @@
     case UPD_CXX_ADDED_TEMPLATE_SPECIALIZATION:
       // It will be added to the template's specializations set when loaded.
       Reader.GetDecl(Record[Idx++]);
+      break;
+
+    case UPD_CXX_ADDED_ANONYMOUS_NAMESPACE: {
+      NamespaceDecl *Anon = cast<NamespaceDecl>(Reader.GetDecl(Record[Idx++]));
+      if (TranslationUnitDecl *TU = dyn_cast<TranslationUnitDecl>(D))
+        TU->setAnonymousNamespace(Anon);
+      else
+        cast<NamespaceDecl>(D)->OrigOrAnonNamespace.setPointer(Anon);
+      break;
+    }
     }
   }
 }

Modified: cfe/trunk/lib/Serialization/ASTWriterDecl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTWriterDecl.cpp?rev=130104&r1=130103&r2=130104&view=diff
==============================================================================
--- cfe/trunk/lib/Serialization/ASTWriterDecl.cpp (original)
+++ cfe/trunk/lib/Serialization/ASTWriterDecl.cpp Sun Apr 24 11:28:13 2011
@@ -12,6 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang/Serialization/ASTWriter.h"
+#include "ASTCommon.h"
 #include "clang/AST/DeclVisitor.h"
 #include "clang/AST/DeclCXX.h"
 #include "clang/AST/DeclTemplate.h"
@@ -21,6 +22,7 @@
 #include "llvm/Bitcode/BitstreamWriter.h"
 #include "llvm/Support/ErrorHandling.h"
 using namespace clang;
+using namespace serialization;
 
 //===----------------------------------------------------------------------===//
 // Declaration serialization
@@ -705,6 +707,18 @@
       }
     }
   }
+
+  if (Writer.hasChain() && D->isOriginalNamespace() &&
+      D->isAnonymousNamespace()) {
+    // This is an original anonymous namespace. If its parent is in a previous
+    // PCH (or is the TU), mark that parent for update.
+    Decl *Parent = cast<Decl>(D->getParent()->getPrimaryContext());
+    if (Parent->getPCHLevel() > 0) {
+      ASTWriter::UpdateRecord &Record = Writer.DeclUpdates[Parent];
+      Record.push_back(UPD_CXX_ADDED_ANONYMOUS_NAMESPACE);
+      Writer.AddDeclRef(D, Record);
+    }
+  }
 }
 
 void ASTDeclWriter::VisitNamespaceAliasDecl(NamespaceAliasDecl *D) {

Added: cfe/trunk/test/PCH/chain-late-anonymous-namespace.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/PCH/chain-late-anonymous-namespace.cpp?rev=130104&view=auto
==============================================================================
--- cfe/trunk/test/PCH/chain-late-anonymous-namespace.cpp (added)
+++ cfe/trunk/test/PCH/chain-late-anonymous-namespace.cpp Sun Apr 24 11:28:13 2011
@@ -0,0 +1,41 @@
+// no PCH
+// RUN: %clang_cc1 -include %s -include %s -fsyntax-only %s
+// with PCH
+// RUN: %clang_cc1 -chain-include %s -chain-include %s -fsyntax-only %s
+#if !defined(PASS1)
+#define PASS1
+
+namespace ns {}
+
+#elif !defined(PASS2)
+#define PASS2
+
+namespace ns {
+  namespace {
+    extern int x;
+  }
+}
+
+namespace {
+  extern int y;
+}
+
+#else
+
+namespace ns {
+  namespace {
+    int x;
+  }
+  void test() {
+    (void)x;
+  }
+}
+
+namespace {
+  int y;
+}
+void test() {
+  (void)y;
+}
+
+#endif