Speculative workaround for apparent libstdc++ bug exposed by r203534.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@203536 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Serialization/Module.h b/include/clang/Serialization/Module.h
index caa2c286c4fb3411d19996ae80684b60e7775576..33bfe22091819757f00215c61c34a05166521f02 100644 (file)
--- a/include/clang/Serialization/Module.h
+++ b/include/clang/Serialization/Module.h
@@ -53,8 +53,7 @@ struct NameLookupTableDataDeleter {
 
 /// \brief Information about the contents of a DeclContext.
 struct DeclContextInfo {
-  DeclContextInfo()
-      : NameLookupTableData(), LexicalDecls(), NumLexicalDecls() {}
+  DeclContextInfo();
 
   /// An ASTDeclContextNameLookupTable.
   std::unique_ptr<OnDiskChainedHashTable<reader::ASTDeclContextNameLookupTrait>,

diff --git a/lib/Serialization/ASTReader.cpp b/lib/Serialization/ASTReader.cpp
index 487283c421cd71159e3f55bac1cb2399b866a762..b35a27c27ff3d87f0f606d7326bf2b1d54b038ed 100644 (file)
--- a/lib/Serialization/ASTReader.cpp
+++ b/lib/Serialization/ASTReader.cpp
@@ -457,6 +457,9 @@ ASTReader::setDeserializationListener(ASTDeserializationListener *Listener) {
 }
 
 
+DeclContextInfo::DeclContextInfo()
+    : NameLookupTableData(), LexicalDecls(), NumLexicalDecls() {}
+
 void NameLookupTableDataDeleter::
 operator()(ASTDeclContextNameLookupTable *Ptr) const {
   delete Ptr;