Reintroduce the serialization library, with fixed dependencies.

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

diff --git a/clang.xcodeproj/project.pbxproj b/clang.xcodeproj/project.pbxproj
index 009818daa07bd1d0b5ec3f76337d6c8b9fdc478e..519cc86bc2014c615727c46a73b624751cac05f4 100644 (file)
--- a/clang.xcodeproj/project.pbxproj
+++ b/clang.xcodeproj/project.pbxproj
@@ -14,9 +14,6 @@
                1A2A54B90FD1DD1C00F4CE45 /* DependencyFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A2A54A80FD1DD1C00F4CE45 /* DependencyFile.cpp */; };
                1A2A54BA0FD1DD1C00F4CE45 /* DiagChecker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A2A54A90FD1DD1C00F4CE45 /* DiagChecker.cpp */; };
                1A2A54BB0FD1DD1C00F4CE45 /* DocumentXML.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A2A54AA0FD1DD1C00F4CE45 /* DocumentXML.cpp */; };
-               1A2A54BC0FD1DD1C00F4CE45 /* GeneratePCH.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A2A54AB0FD1DD1C00F4CE45 /* GeneratePCH.cpp */; };
-               1A2A54BD0FD1DD1C00F4CE45 /* HTMLPrint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A2A54AC0FD1DD1C00F4CE45 /* HTMLPrint.cpp */; };
-               1A2A54BE0FD1DD1C00F4CE45 /* PrintParserCallbacks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A2A54AD0FD1DD1C00F4CE45 /* PrintParserCallbacks.cpp */; };
                1A2A54BF0FD1DD1C00F4CE45 /* PrintPreprocessedOutput.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A2A54AE0FD1DD1C00F4CE45 /* PrintPreprocessedOutput.cpp */; };
                1A2A54C40FD1DD1C00F4CE45 /* StmtXML.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A2A54B30FD1DD1C00F4CE45 /* StmtXML.cpp */; };
                1A2A54C50FD1DD1C00F4CE45 /* Warnings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A2A54B40FD1DD1C00F4CE45 /* Warnings.cpp */; };
@@ -92,12 +89,9 @@
                1ADF47AF0F782C3200E48A8A /* SemaTemplateInstantiateDecl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1ADF47AE0F782C3200E48A8A /* SemaTemplateInstantiateDecl.cpp */; };
                1AF1B50F109A4FB800AFAFAC /* CGException.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AF1B50E109A4FB800AFAFAC /* CGException.cpp */; };
                1AFDD8721161085D00AE030A /* ASTMerge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AFDD8701161085D00AE030A /* ASTMerge.cpp */; };
-               1AFDD8731161085D00AE030A /* CodeGenAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AFDD8711161085D00AE030A /* CodeGenAction.cpp */; };
                1AFF8AE31012BFC900D248DA /* CGRecordLayoutBuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AFF8AE11012BFC900D248DA /* CGRecordLayoutBuilder.cpp */; };
                3507E4C20E27FE2D00FB7B57 /* CheckObjCInstMethSignature.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3507E4C10E27FE2D00FB7B57 /* CheckObjCInstMethSignature.cpp */; };
-               352246E70F5C6BE000D0D279 /* HTMLDiagnostics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 352246E10F5C6BE000D0D279 /* HTMLDiagnostics.cpp */; };
                352246E80F5C6BE000D0D279 /* InitHeaderSearch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 352246E20F5C6BE000D0D279 /* InitHeaderSearch.cpp */; };
-               352246EA0F5C6BE000D0D279 /* PlistDiagnostics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 352246E40F5C6BE000D0D279 /* PlistDiagnostics.cpp */; };
                352246EB0F5C6BE000D0D279 /* TextDiagnosticBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 352246E50F5C6BE000D0D279 /* TextDiagnosticBuffer.cpp */; };
                352246EC0F5C6BE000D0D279 /* TextDiagnosticPrinter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 352246E60F5C6BE000D0D279 /* TextDiagnosticPrinter.cpp */; };
                352712510DAFE54700C76352 /* IdentifierResolver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 352712500DAFE54700C76352 /* IdentifierResolver.cpp */; };
@@ -141,6 +135,14 @@
                35EFEFB60DB67ED60020783D /* GRTransferFuncs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 35EFEFB50DB67ED60020783D /* GRTransferFuncs.cpp */; };
                35F2A01E0E36AFF100D17527 /* CheckObjCUnusedIVars.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 35F2A01D0E36AFF100D17527 /* CheckObjCUnusedIVars.cpp */; };
                35F8D0D60D9B82CD00D91C5E /* BasicObjCFoundationChecks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 35F8D0D50D9B82CD00D91C5E /* BasicObjCFoundationChecks.cpp */; };
+               57EB566A121B034300ECA335 /* GeneratePCH.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57EB5662121B034300ECA335 /* GeneratePCH.cpp */; };
+               57EB566B121B034300ECA335 /* Makefile in Sources */ = {isa = PBXBuildFile; fileRef = 57EB5663121B034300ECA335 /* Makefile */; };
+               57EB566C121B034300ECA335 /* PCHReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57EB5664121B034300ECA335 /* PCHReader.cpp */; };
+               57EB566D121B034300ECA335 /* PCHReaderDecl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57EB5665121B034300ECA335 /* PCHReaderDecl.cpp */; };
+               57EB566E121B034300ECA335 /* PCHReaderStmt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57EB5666121B034300ECA335 /* PCHReaderStmt.cpp */; };
+               57EB566F121B034300ECA335 /* PCHWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57EB5667121B034300ECA335 /* PCHWriter.cpp */; };
+               57EB5670121B034300ECA335 /* PCHWriterDecl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57EB5668121B034300ECA335 /* PCHWriterDecl.cpp */; };
+               57EB5671121B034300ECA335 /* PCHWriterStmt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57EB5669121B034300ECA335 /* PCHWriterStmt.cpp */; };
                72D16C1F0D9975C400E6DA4A /* HTMLRewrite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72D16C1E0D9975C400E6DA4A /* HTMLRewrite.cpp */; };
                84AF36A10CB17A3B00C820A5 /* DeclObjC.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84AF36A00CB17A3B00C820A5 /* DeclObjC.h */; };
                84D9A8880C1A57E100AC7ABC /* AttributeList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84D9A8870C1A57E100AC7ABC /* AttributeList.cpp */; };
@@ -275,10 +277,6 @@
                DECAB0D00DB3C84200E13CCB /* RewriteRope.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DECAB0CF0DB3C84200E13CCB /* RewriteRope.cpp */; };
                DECB6D650F9AE26600F5FBC7 /* JumpDiagnostics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DECB6D640F9AE26600F5FBC7 /* JumpDiagnostics.cpp */; };
                DECB6F070F9D93A800F5FBC7 /* InitPreprocessor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DECB6F060F9D93A800F5FBC7 /* InitPreprocessor.cpp */; };
-               DECB77130FA5752300F5FBC7 /* PCHReaderStmt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DECB77120FA5752300F5FBC7 /* PCHReaderStmt.cpp */; };
-               DECB77790FA579B000F5FBC7 /* PCHReaderDecl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DECB77780FA579B000F5FBC7 /* PCHReaderDecl.cpp */; };
-               DECB77F70FA5850200F5FBC7 /* PCHWriterDecl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DECB77F60FA5850200F5FBC7 /* PCHWriterDecl.cpp */; };
-               DECB78170FA5882F00F5FBC7 /* PCHWriterStmt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DECB78160FA5882F00F5FBC7 /* PCHWriterStmt.cpp */; };
                DED626C90AE0C065001E80A4 /* TargetInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DED626C80AE0C065001E80A4 /* TargetInfo.cpp */; };
                DED7D7410A524295003AD0FB /* Diagnostic.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = DED7D7310A524295003AD0FB /* Diagnostic.h */; };
                DED7D7430A524295003AD0FB /* FileManager.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = DED7D7330A524295003AD0FB /* FileManager.h */; };
@@ -321,9 +319,6 @@
                DEEBBD440C19C5D200A9FE82 /* TODO.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = DEEBBD430C19C5D200A9FE82 /* TODO.txt */; };
                DEEBC3BA0C2363B800A9FE82 /* CodeGenTypes.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = DEEBC3B90C2363B800A9FE82 /* CodeGenTypes.h */; };
                DEEBC3BC0C2363BC00A9FE82 /* CodeGenTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DEEBC3BB0C2363BC00A9FE82 /* CodeGenTypes.cpp */; };
-               DEF165710F8FB34D0098507F /* PCHWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DEF165700F8FB34D0098507F /* PCHWriter.cpp */; };
-               DEF165750F8FB3510098507F /* PCHReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DEF165740F8FB3510098507F /* PCHReader.cpp */; };
-               DEF168400F9548DC0098507F /* FixItRewriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DEF1683F0F9548DC0098507F /* FixItRewriter.cpp */; };
                DEF2E95F0C5FBD74000C4259 /* InternalsManual.html in CopyFiles */ = {isa = PBXBuildFile; fileRef = DEF2E95E0C5FBD74000C4259 /* InternalsManual.html */; };
                DEF2EFF30C6CDD74000C4259 /* CGExprAgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DEF2EFF20C6CDD74000C4259 /* CGExprAgg.cpp */; };
                DEF2F0100C6CFED5000C4259 /* SemaChecking.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DEF2F00F0C6CFED5000C4259 /* SemaChecking.cpp */; };
@@ -410,9 +405,6 @@
                1A2A54A80FD1DD1C00F4CE45 /* DependencyFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DependencyFile.cpp; path = lib/Frontend/DependencyFile.cpp; sourceTree = "<group>"; };
                1A2A54A90FD1DD1C00F4CE45 /* DiagChecker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DiagChecker.cpp; path = lib/Frontend/DiagChecker.cpp; sourceTree = "<group>"; };
                1A2A54AA0FD1DD1C00F4CE45 /* DocumentXML.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DocumentXML.cpp; path = lib/Frontend/DocumentXML.cpp; sourceTree = "<group>"; };
-               1A2A54AB0FD1DD1C00F4CE45 /* GeneratePCH.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GeneratePCH.cpp; path = lib/Frontend/GeneratePCH.cpp; sourceTree = "<group>"; };
-               1A2A54AC0FD1DD1C00F4CE45 /* HTMLPrint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = HTMLPrint.cpp; path = lib/Frontend/HTMLPrint.cpp; sourceTree = "<group>"; };
-               1A2A54AD0FD1DD1C00F4CE45 /* PrintParserCallbacks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PrintParserCallbacks.cpp; path = lib/Frontend/PrintParserCallbacks.cpp; sourceTree = "<group>"; };
                1A2A54AE0FD1DD1C00F4CE45 /* PrintPreprocessedOutput.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PrintPreprocessedOutput.cpp; path = lib/Frontend/PrintPreprocessedOutput.cpp; sourceTree = "<group>"; };
                1A2A54B30FD1DD1C00F4CE45 /* StmtXML.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StmtXML.cpp; path = lib/Frontend/StmtXML.cpp; sourceTree = "<group>"; };
                1A2A54B40FD1DD1C00F4CE45 /* Warnings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Warnings.cpp; path = lib/Frontend/Warnings.cpp; sourceTree = "<group>"; };
@@ -513,15 +505,11 @@
                1AE4EE3B103B89CA00888A23 /* TreeTransform.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = TreeTransform.h; path = lib/Sema/TreeTransform.h; sourceTree = "<group>"; tabWidth = 2; };
                1AF1B50E109A4FB800AFAFAC /* CGException.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = CGException.cpp; path = lib/CodeGen/CGException.cpp; sourceTree = "<group>"; tabWidth = 2; };
                1AFDD8701161085D00AE030A /* ASTMerge.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ASTMerge.cpp; path = lib/Frontend/ASTMerge.cpp; sourceTree = "<group>"; };
-               1AFDD8711161085D00AE030A /* CodeGenAction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CodeGenAction.cpp; path = lib/Frontend/CodeGenAction.cpp; sourceTree = "<group>"; };
                1AFF8AE11012BFC900D248DA /* CGRecordLayoutBuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = CGRecordLayoutBuilder.cpp; path = lib/CodeGen/CGRecordLayoutBuilder.cpp; sourceTree = "<group>"; tabWidth = 2; };
                3507E4C10E27FE2D00FB7B57 /* CheckObjCInstMethSignature.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CheckObjCInstMethSignature.cpp; path = lib/Analysis/CheckObjCInstMethSignature.cpp; sourceTree = "<group>"; };
-               352246E10F5C6BE000D0D279 /* HTMLDiagnostics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = HTMLDiagnostics.cpp; path = lib/Frontend/HTMLDiagnostics.cpp; sourceTree = "<group>"; };
                352246E20F5C6BE000D0D279 /* InitHeaderSearch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = InitHeaderSearch.cpp; path = lib/Frontend/InitHeaderSearch.cpp; sourceTree = "<group>"; };
-               352246E40F5C6BE000D0D279 /* PlistDiagnostics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PlistDiagnostics.cpp; path = lib/Frontend/PlistDiagnostics.cpp; sourceTree = "<group>"; };
                352246E50F5C6BE000D0D279 /* TextDiagnosticBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TextDiagnosticBuffer.cpp; path = lib/Frontend/TextDiagnosticBuffer.cpp; sourceTree = "<group>"; };
                352246E60F5C6BE000D0D279 /* TextDiagnosticPrinter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TextDiagnosticPrinter.cpp; path = lib/Frontend/TextDiagnosticPrinter.cpp; sourceTree = "<group>"; };
-               3527124F0DAFE54700C76352 /* IdentifierResolver.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = IdentifierResolver.h; path = lib/Sema/IdentifierResolver.h; sourceTree = "<group>"; tabWidth = 2; };
                352712500DAFE54700C76352 /* IdentifierResolver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = IdentifierResolver.cpp; path = lib/Sema/IdentifierResolver.cpp; sourceTree = "<group>"; tabWidth = 2; };
                352C19DC0CA321C80045DB98 /* CFGRecStmtDeclVisitor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CFGRecStmtDeclVisitor.h; path = clang/Analysis/Visitors/CFGRecStmtDeclVisitor.h; sourceTree = "<group>"; };
                352C19DD0CA321C80045DB98 /* CFGRecStmtVisitor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CFGRecStmtVisitor.h; path = clang/Analysis/Visitors/CFGRecStmtVisitor.h; sourceTree = "<group>"; };
@@ -604,6 +592,19 @@
                35F8D0D50D9B82CD00D91C5E /* BasicObjCFoundationChecks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BasicObjCFoundationChecks.cpp; path = lib/Analysis/BasicObjCFoundationChecks.cpp; sourceTree = "<group>"; };
                35F9B1550D1C6B2E00DDFDAE /* LiveVariables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LiveVariables.h; path = clang/Analysis/Analyses/LiveVariables.h; sourceTree = "<group>"; };
                35F9B1560D1C6B2E00DDFDAE /* UninitializedValues.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UninitializedValues.h; path = clang/Analysis/Analyses/UninitializedValues.h; sourceTree = "<group>"; };
+               57EB565C121B02FC00ECA335 /* PCHBitCodes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PCHBitCodes.h; path = clang/Serialization/PCHBitCodes.h; sourceTree = "<group>"; };
+               57EB565D121B02FC00ECA335 /* PCHDeserializationListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PCHDeserializationListener.h; path = clang/Serialization/PCHDeserializationListener.h; sourceTree = "<group>"; };
+               57EB565E121B02FC00ECA335 /* PCHReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PCHReader.h; path = clang/Serialization/PCHReader.h; sourceTree = "<group>"; };
+               57EB565F121B02FC00ECA335 /* PCHWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PCHWriter.h; path = clang/Serialization/PCHWriter.h; sourceTree = "<group>"; };
+               57EB5661121B034300ECA335 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
+               57EB5662121B034300ECA335 /* GeneratePCH.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GeneratePCH.cpp; sourceTree = "<group>"; };
+               57EB5663121B034300ECA335 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
+               57EB5664121B034300ECA335 /* PCHReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PCHReader.cpp; sourceTree = "<group>"; };
+               57EB5665121B034300ECA335 /* PCHReaderDecl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PCHReaderDecl.cpp; sourceTree = "<group>"; };
+               57EB5666121B034300ECA335 /* PCHReaderStmt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PCHReaderStmt.cpp; sourceTree = "<group>"; };
+               57EB5667121B034300ECA335 /* PCHWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PCHWriter.cpp; sourceTree = "<group>"; };
+               57EB5668121B034300ECA335 /* PCHWriterDecl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PCHWriterDecl.cpp; sourceTree = "<group>"; };
+               57EB5669121B034300ECA335 /* PCHWriterStmt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PCHWriterStmt.cpp; sourceTree = "<group>"; };
                72D16C1E0D9975C400E6DA4A /* HTMLRewrite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = HTMLRewrite.cpp; path = lib/Rewrite/HTMLRewrite.cpp; sourceTree = "<group>"; };
                7F270AFE107A90010031B377 /* CodeCompleteConsumer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CodeCompleteConsumer.h; path = clang/Sema/CodeCompleteConsumer.h; sourceTree = "<group>"; };
                84AF36A00CB17A3B00C820A5 /* DeclObjC.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = DeclObjC.h; path = clang/AST/DeclObjC.h; sourceTree = "<group>"; tabWidth = 2; };
@@ -835,14 +836,9 @@
                DEC8D9A30A94346E00353FCA /* AST.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = AST.h; path = clang/AST/AST.h; sourceTree = "<group>"; tabWidth = 2; };
                DECAB0CF0DB3C84200E13CCB /* RewriteRope.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RewriteRope.cpp; path = lib/Rewrite/RewriteRope.cpp; sourceTree = "<group>"; };
                DECB6D640F9AE26600F5FBC7 /* JumpDiagnostics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = JumpDiagnostics.cpp; path = lib/Sema/JumpDiagnostics.cpp; sourceTree = "<group>"; tabWidth = 2; };
-               DECB6F030F9D939A00F5FBC7 /* InitPreprocessor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = InitPreprocessor.h; path = clang/Frontend/InitPreprocessor.h; sourceTree = "<group>"; };
                DECB6F060F9D93A800F5FBC7 /* InitPreprocessor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = InitPreprocessor.cpp; path = lib/Frontend/InitPreprocessor.cpp; sourceTree = "<group>"; };
                DECB734E0FA3ED8400F5FBC7 /* StmtObjC.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = StmtObjC.h; path = clang/AST/StmtObjC.h; sourceTree = "<group>"; tabWidth = 2; };
                DECB73550FA3EE5A00F5FBC7 /* StmtCXX.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = StmtCXX.h; path = clang/AST/StmtCXX.h; sourceTree = "<group>"; tabWidth = 2; };
-               DECB77120FA5752300F5FBC7 /* PCHReaderStmt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = PCHReaderStmt.cpp; path = lib/Frontend/PCHReaderStmt.cpp; sourceTree = "<group>"; tabWidth = 2; };
-               DECB77780FA579B000F5FBC7 /* PCHReaderDecl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PCHReaderDecl.cpp; path = lib/Frontend/PCHReaderDecl.cpp; sourceTree = "<group>"; };
-               DECB77F60FA5850200F5FBC7 /* PCHWriterDecl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PCHWriterDecl.cpp; path = lib/Frontend/PCHWriterDecl.cpp; sourceTree = "<group>"; };
-               DECB78160FA5882F00F5FBC7 /* PCHWriterStmt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PCHWriterStmt.cpp; path = lib/Frontend/PCHWriterStmt.cpp; sourceTree = "<group>"; };
                DED626C80AE0C065001E80A4 /* TargetInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; path = TargetInfo.cpp; sourceTree = "<group>"; tabWidth = 2; };
                DED7D7310A524295003AD0FB /* Diagnostic.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = Diagnostic.h; sourceTree = "<group>"; tabWidth = 2; };
                DED7D7330A524295003AD0FB /* FileManager.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = FileManager.h; sourceTree = "<group>"; tabWidth = 2; };
@@ -893,11 +889,7 @@
                DEEBBD430C19C5D200A9FE82 /* TODO.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = TODO.txt; sourceTree = "<group>"; };
                DEEBC3B90C2363B800A9FE82 /* CodeGenTypes.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = CodeGenTypes.h; path = lib/CodeGen/CodeGenTypes.h; sourceTree = "<group>"; tabWidth = 2; };
                DEEBC3BB0C2363BC00A9FE82 /* CodeGenTypes.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = CodeGenTypes.cpp; path = lib/CodeGen/CodeGenTypes.cpp; sourceTree = "<group>"; tabWidth = 2; };
-               DEF1615E0F65C81C0098507F /* InitHeaderSearch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = InitHeaderSearch.h; path = clang/Frontend/InitHeaderSearch.h; sourceTree = "<group>"; };
-               DEF1615F0F65C81C0098507F /* ManagerRegistry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ManagerRegistry.h; path = clang/Frontend/ManagerRegistry.h; sourceTree = "<group>"; };
                DEF161600F65C81C0098507F /* TextDiagnosticBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TextDiagnosticBuffer.h; path = clang/Frontend/TextDiagnosticBuffer.h; sourceTree = "<group>"; };
-               DEF161610F65C81C0098507F /* PathDiagnosticClients.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PathDiagnosticClients.h; path = clang/Frontend/PathDiagnosticClients.h; sourceTree = "<group>"; };
-               DEF161620F65C81C0098507F /* CompileOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CompileOptions.h; path = clang/Frontend/CompileOptions.h; sourceTree = "<group>"; };
                DEF161630F65C81C0098507F /* TextDiagnosticPrinter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TextDiagnosticPrinter.h; path = clang/Frontend/TextDiagnosticPrinter.h; sourceTree = "<group>"; };
                DEF165140F8D46980098507F /* Tool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Tool.h; path = clang/Driver/Tool.h; sourceTree = "<group>"; };
                DEF165150F8D46980098507F /* Types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Types.h; path = clang/Driver/Types.h; sourceTree = "<group>"; };
@@ -915,13 +907,6 @@
                DEF165220F8D46980098507F /* Util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Util.h; path = clang/Driver/Util.h; sourceTree = "<group>"; };
                DEF165230F8D46980098507F /* Phases.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Phases.h; path = clang/Driver/Phases.h; sourceTree = "<group>"; };
                DEF165240F8D46980098507F /* DriverDiagnostic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DriverDiagnostic.h; path = clang/Driver/DriverDiagnostic.h; sourceTree = "<group>"; };
-               DEF165700F8FB34D0098507F /* PCHWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = PCHWriter.cpp; path = lib/Frontend/PCHWriter.cpp; sourceTree = "<group>"; tabWidth = 2; };
-               DEF165740F8FB3510098507F /* PCHReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = PCHReader.cpp; path = lib/Frontend/PCHReader.cpp; sourceTree = "<group>"; tabWidth = 2; };
-               DEF165780F8FB3690098507F /* PCHWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PCHWriter.h; path = clang/Frontend/PCHWriter.h; sourceTree = "<group>"; };
-               DEF1657B0F8FB36E0098507F /* PCHReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PCHReader.h; path = clang/Frontend/PCHReader.h; sourceTree = "<group>"; };
-               DEF1657E0F8FB3730098507F /* PCHBitCodes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PCHBitCodes.h; path = clang/Frontend/PCHBitCodes.h; sourceTree = "<group>"; };
-               DEF1683F0F9548DC0098507F /* FixItRewriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FixItRewriter.cpp; path = lib/Frontend/FixItRewriter.cpp; sourceTree = "<group>"; };
-               DEF168620F9549250098507F /* FixItRewriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FixItRewriter.h; path = clang/Frontend/FixItRewriter.h; sourceTree = "<group>"; };
                DEF169220F9645960098507F /* FrontendDiagnostic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FrontendDiagnostic.h; path = clang/Frontend/FrontendDiagnostic.h; sourceTree = "<group>"; };
                DEF1692C0F9645BF0098507F /* AnalysisDiagnostic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AnalysisDiagnostic.h; path = clang/Analysis/AnalysisDiagnostic.h; sourceTree = "<group>"; };
                DEF16BE40FA13A5B0098507F /* TypeNodes.def */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = text; name = TypeNodes.def; path = clang/AST/TypeNodes.def; sourceTree = "<group>"; tabWidth = 2; };
@@ -971,6 +956,7 @@
                08FB7795FE84155DC02AAC07 /* Libraries */ = {
                        isa = PBXGroup;
                        children = (
+                               57EB5660121B034300ECA335 /* Serialization */,
                                BFE2F67911DA95590007EDC0 /* Rewrite */,
                                90FD6D6C103C3D2D005F5B73 /* Index */,
                                DED7D7500A5242C7003AD0FB /* Basic */,
@@ -1052,7 +1038,6 @@
                                1AFDD8701161085D00AE030A /* ASTMerge.cpp */,
                                9012911C1048068D0083456D /* ASTUnit.cpp */,
                                1A2A54A50FD1DD1C00F4CE45 /* ASTConsumers.cpp */,
-                               1AFDD8711161085D00AE030A /* CodeGenAction.cpp */,
                                1A2A54A70FD1DD1C00F4CE45 /* CacheTokens.cpp */,
                                1ACB57DB1105820D0047B991 /* CompilerInstance.cpp */,
                                1ACB57DC1105820D0047B991 /* CompilerInvocation.cpp */,
@@ -1060,24 +1045,12 @@
                                1A2A54A80FD1DD1C00F4CE45 /* DependencyFile.cpp */,
                                1A2A54A90FD1DD1C00F4CE45 /* DiagChecker.cpp */,
                                1A2A54AA0FD1DD1C00F4CE45 /* DocumentXML.cpp */,
-                               DEF1683F0F9548DC0098507F /* FixItRewriter.cpp */,
                                1ACB57DE1105820D0047B991 /* FrontendAction.cpp */,
                                1ACB57DF1105820D0047B991 /* FrontendActions.cpp */,
                                1ACB57E01105820D0047B991 /* FrontendOptions.cpp */,
-                               1A2A54AB0FD1DD1C00F4CE45 /* GeneratePCH.cpp */,
-                               352246E10F5C6BE000D0D279 /* HTMLDiagnostics.cpp */,
-                               1A2A54AC0FD1DD1C00F4CE45 /* HTMLPrint.cpp */,
                                352246E20F5C6BE000D0D279 /* InitHeaderSearch.cpp */,
                                DECB6F060F9D93A800F5FBC7 /* InitPreprocessor.cpp */,
                                1ACB57E11105820D0047B991 /* LangStandards.cpp */,
-                               DEF165740F8FB3510098507F /* PCHReader.cpp */,
-                               DECB77780FA579B000F5FBC7 /* PCHReaderDecl.cpp */,
-                               DECB77120FA5752300F5FBC7 /* PCHReaderStmt.cpp */,
-                               DEF165700F8FB34D0098507F /* PCHWriter.cpp */,
-                               DECB77F60FA5850200F5FBC7 /* PCHWriterDecl.cpp */,
-                               DECB78160FA5882F00F5FBC7 /* PCHWriterStmt.cpp */,
-                               352246E40F5C6BE000D0D279 /* PlistDiagnostics.cpp */,
-                               1A2A54AD0FD1DD1C00F4CE45 /* PrintParserCallbacks.cpp */,
                                1A2A54AE0FD1DD1C00F4CE45 /* PrintPreprocessedOutput.cpp */,
                                352246E50F5C6BE000D0D279 /* TextDiagnosticBuffer.cpp */,
                                352246E60F5C6BE000D0D279 /* TextDiagnosticPrinter.cpp */,
@@ -1195,6 +1168,34 @@
                        name = Analyses;
                        sourceTree = "<group>";
                };
+               57EB5654121B023900ECA335 /* Serialization */ = {
+                       isa = PBXGroup;
+                       children = (
+                               57EB565C121B02FC00ECA335 /* PCHBitCodes.h */,
+                               57EB565D121B02FC00ECA335 /* PCHDeserializationListener.h */,
+                               57EB565E121B02FC00ECA335 /* PCHReader.h */,
+                               57EB565F121B02FC00ECA335 /* PCHWriter.h */,
+                       );
+                       name = Serialization;
+                       sourceTree = "<group>";
+               };
+               57EB5660121B034300ECA335 /* Serialization */ = {
+                       isa = PBXGroup;
+                       children = (
+                               57EB5661121B034300ECA335 /* CMakeLists.txt */,
+                               57EB5662121B034300ECA335 /* GeneratePCH.cpp */,
+                               57EB5663121B034300ECA335 /* Makefile */,
+                               57EB5664121B034300ECA335 /* PCHReader.cpp */,
+                               57EB5665121B034300ECA335 /* PCHReaderDecl.cpp */,
+                               57EB5666121B034300ECA335 /* PCHReaderStmt.cpp */,
+                               57EB5667121B034300ECA335 /* PCHWriter.cpp */,
+                               57EB5668121B034300ECA335 /* PCHWriterDecl.cpp */,
+                               57EB5669121B034300ECA335 /* PCHWriterStmt.cpp */,
+                       );
+                       name = Serialization;
+                       path = lib/Serialization;
+                       sourceTree = "<group>";
+               };
                9012911210470FAF0083456D /* clang-c */ = {
                        isa = PBXGroup;
                        children = (
@@ -1415,7 +1416,6 @@
                        children = (
                                BF89C3E111595818001C2D68 /* AnalysisBasedWarnings.cpp */,
                                1A6B6CD110693FC900BB4A8F /* CodeCompleteConsumer.cpp */,
-                               3527124F0DAFE54700C76352 /* IdentifierResolver.h */,
                                352712500DAFE54700C76352 /* IdentifierResolver.cpp */,
                                DECB6D640F9AE26600F5FBC7 /* JumpDiagnostics.cpp */,
                                DE67E7190C020F4F00F66BC5 /* ParseAST.cpp */,
@@ -1649,6 +1649,7 @@
                                DE67E7260C02108300F66BC5 /* Sema */,
                                DE928B140C05659A00231DA4 /* CodeGen */,
                                356EF9AF0C8F7DA4006650F5 /* Analysis */,
+                               57EB5654121B023900ECA335 /* Serialization */,
                                90FD6D5E103C3D03005F5B73 /* Index */,
                                DEF7D9F40C9C8B020001F598 /* Rewrite */,
                                DEF1615D0F65C7FC0098507F /* Frontend */,
@@ -1829,16 +1830,7 @@
                                90FD6D8F103C3D80005F5B73 /* StmtXML.def */,
                                90FD6D90103C3D80005F5B73 /* TypeXML.def */,
                                90FD6D91103C3D80005F5B73 /* Utils.h */,
-                               DEF161620F65C81C0098507F /* CompileOptions.h */,
-                               DEF168620F9549250098507F /* FixItRewriter.h */,
                                DEF169220F9645960098507F /* FrontendDiagnostic.h */,
-                               DEF1615E0F65C81C0098507F /* InitHeaderSearch.h */,
-                               DECB6F030F9D939A00F5FBC7 /* InitPreprocessor.h */,
-                               DEF1615F0F65C81C0098507F /* ManagerRegistry.h */,
-                               DEF1657E0F8FB3730098507F /* PCHBitCodes.h */,
-                               DEF1657B0F8FB36E0098507F /* PCHReader.h */,
-                               DEF165780F8FB3690098507F /* PCHWriter.h */,
-                               DEF161610F65C81C0098507F /* PathDiagnosticClients.h */,
                                DEF161600F65C81C0098507F /* TextDiagnosticBuffer.h */,
                                DEF161630F65C81C0098507F /* TextDiagnosticPrinter.h */,
                        );
@@ -2051,9 +2043,7 @@
                                DEB077990F44F97800F5A2BE /* TokenConcatenation.cpp in Sources */,
                                1A2193CE0F45EEB700C0713D /* Mangle.cpp in Sources */,
                                DEB07AC80F4A427E00F5A2BE /* SemaAttr.cpp in Sources */,
-                               352246E70F5C6BE000D0D279 /* HTMLDiagnostics.cpp in Sources */,
                                352246E80F5C6BE000D0D279 /* InitHeaderSearch.cpp in Sources */,
-                               352246EA0F5C6BE000D0D279 /* PlistDiagnostics.cpp in Sources */,
                                352246EB0F5C6BE000D0D279 /* TextDiagnosticBuffer.cpp in Sources */,
                                352246EC0F5C6BE000D0D279 /* TextDiagnosticPrinter.cpp in Sources */,
                                35544B880F5C7FD700D92AA9 /* RangeConstraintManager.cpp in Sources */,
@@ -2078,23 +2068,13 @@
                                DEDFE6680F7B3B830035BD10 /* Driver.cpp in Sources */,
                                1A701B640F7C8FE400FEC4D1 /* SemaAccess.cpp in Sources */,
                                906BF4B00F83BA2E001071FA /* ConvertUTF.c in Sources */,
-                               DEF165710F8FB34D0098507F /* PCHWriter.cpp in Sources */,
-                               DEF165750F8FB3510098507F /* PCHReader.cpp in Sources */,
-                               DEF168400F9548DC0098507F /* FixItRewriter.cpp in Sources */,
                                DECB6D650F9AE26600F5FBC7 /* JumpDiagnostics.cpp in Sources */,
                                DECB6F070F9D93A800F5FBC7 /* InitPreprocessor.cpp in Sources */,
-                               DECB77130FA5752300F5FBC7 /* PCHReaderStmt.cpp in Sources */,
-                               DECB77790FA579B000F5FBC7 /* PCHReaderDecl.cpp in Sources */,
-                               DECB77F70FA5850200F5FBC7 /* PCHWriterDecl.cpp in Sources */,
-                               DECB78170FA5882F00F5FBC7 /* PCHWriterStmt.cpp in Sources */,
                                1A2A54B60FD1DD1C00F4CE45 /* ASTConsumers.cpp in Sources */,
                                1A2A54B80FD1DD1C00F4CE45 /* CacheTokens.cpp in Sources */,
                                1A2A54B90FD1DD1C00F4CE45 /* DependencyFile.cpp in Sources */,
                                1A2A54BA0FD1DD1C00F4CE45 /* DiagChecker.cpp in Sources */,
                                1A2A54BB0FD1DD1C00F4CE45 /* DocumentXML.cpp in Sources */,
-                               1A2A54BC0FD1DD1C00F4CE45 /* GeneratePCH.cpp in Sources */,
-                               1A2A54BD0FD1DD1C00F4CE45 /* HTMLPrint.cpp in Sources */,
-                               1A2A54BE0FD1DD1C00F4CE45 /* PrintParserCallbacks.cpp in Sources */,
                                1A2A54BF0FD1DD1C00F4CE45 /* PrintPreprocessedOutput.cpp in Sources */,
                                1A2A54C40FD1DD1C00F4CE45 /* StmtXML.cpp in Sources */,
                                1A2A54C50FD1DD1C00F4CE45 /* Warnings.cpp in Sources */,
@@ -2147,7 +2127,6 @@
                                BF89C3FB11595A37001C2D68 /* SemaCodeComplete.cpp in Sources */,
                                BF89C3FD11595A5D001C2D68 /* SemaExceptionSpec.cpp in Sources */,
                                1AFDD8721161085D00AE030A /* ASTMerge.cpp in Sources */,
-                               1AFDD8731161085D00AE030A /* CodeGenAction.cpp in Sources */,
                                1ABD23D61182449800A48E65 /* APValue.cpp in Sources */,
                                1ABD23D71182449800A48E65 /* ASTConsumer.cpp in Sources */,
                                1ABD23D81182449800A48E65 /* ASTContext.cpp in Sources */,
@@ -2209,6 +2188,14 @@
                                BFE2F6D411DA955A0007EDC0 /* RewriteRope.cpp in Sources */,
                                BFE2F6D511DA955A0007EDC0 /* RewriteTest.cpp in Sources */,
                                BFE2F6D611DA955A0007EDC0 /* TokenRewriter.cpp in Sources */,
+                               57EB566A121B034300ECA335 /* GeneratePCH.cpp in Sources */,
+                               57EB566B121B034300ECA335 /* Makefile in Sources */,
+                               57EB566C121B034300ECA335 /* PCHReader.cpp in Sources */,
+                               57EB566D121B034300ECA335 /* PCHReaderDecl.cpp in Sources */,
+                               57EB566E121B034300ECA335 /* PCHReaderStmt.cpp in Sources */,
+                               57EB566F121B034300ECA335 /* PCHWriter.cpp in Sources */,
+                               57EB5670121B034300ECA335 /* PCHWriterDecl.cpp in Sources */,
+                               57EB5671121B034300ECA335 /* PCHWriterStmt.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

diff --git a/include/clang/Frontend/ASTUnit.h b/include/clang/Frontend/ASTUnit.h
index 3426e433c5a2b765041554cd7e435d24c7a215ea..de10611314d5cd9d87698bce975f847de3123cb0 100644 (file)
--- a/include/clang/Frontend/ASTUnit.h
+++ b/include/clang/Frontend/ASTUnit.h
@@ -15,7 +15,7 @@
 #define LLVM_CLANG_FRONTEND_ASTUNIT_H
 
 #include "clang/Index/ASTLocation.h"
-#include "clang/Frontend/PCHBitCodes.h"
+#include "clang/Serialization/PCHBitCodes.h"
 #include "clang/Sema/Sema.h"
 #include "clang/Lex/PreprocessingRecord.h"
 #include "clang/Basic/SourceManager.h"

diff --git a/include/clang/Frontend/PCHBitCodes.h b/include/clang/Serialization/PCHBitCodes.h
similarity index 100%
rename from include/clang/Frontend/PCHBitCodes.h
rename to include/clang/Serialization/PCHBitCodes.h

diff --git a/include/clang/Frontend/PCHDeserializationListener.h b/include/clang/Serialization/PCHDeserializationListener.h
similarity index 97%
rename from include/clang/Frontend/PCHDeserializationListener.h
rename to include/clang/Serialization/PCHDeserializationListener.h
index a908687ffce8d728cdca5069435de4ceb3d0b3b3..4ba0cec550d336fb5cd16f4fff5ea5c0283867c7 100644 (file)
--- a/include/clang/Frontend/PCHDeserializationListener.h
+++ b/include/clang/Serialization/PCHDeserializationListener.h
@@ -15,7 +15,7 @@
 #ifndef LLVM_CLANG_FRONTEND_PCH_DESERIALIZATION_LISTENER_H
 #define LLVM_CLANG_FRONTEND_PCH_DESERIALIZATION_LISTENER_H
 
-#include "clang/Frontend/PCHBitCodes.h"
+#include "clang/Serialization/PCHBitCodes.h"
 
 namespace clang {
 

diff --git a/include/clang/Frontend/PCHReader.h b/include/clang/Serialization/PCHReader.h
similarity index 99%
rename from include/clang/Frontend/PCHReader.h
rename to include/clang/Serialization/PCHReader.h
index 5aa90b717faf660b9109f2f79e16de94cef408fc..38beaf3f934325a6517208f1a5dd70f8312592d7 100644 (file)
--- a/include/clang/Frontend/PCHReader.h
+++ b/include/clang/Serialization/PCHReader.h
@@ -14,7 +14,7 @@
 #ifndef LLVM_CLANG_FRONTEND_PCH_READER_H
 #define LLVM_CLANG_FRONTEND_PCH_READER_H
 
-#include "clang/Frontend/PCHBitCodes.h"
+#include "clang/Serialization/PCHBitCodes.h"
 #include "clang/AST/DeclarationName.h"
 #include "clang/Sema/ExternalSemaSource.h"
 #include "clang/AST/DeclObjC.h"

diff --git a/include/clang/Frontend/PCHWriter.h b/include/clang/Serialization/PCHWriter.h
similarity index 99%
rename from include/clang/Frontend/PCHWriter.h
rename to include/clang/Serialization/PCHWriter.h
index bb083eaf8f842e1aaeb3d01c12d780963ecaa60f..939ce43bcba1c1ec2412e4a7f2cdb863a88e349c 100644 (file)
--- a/include/clang/Frontend/PCHWriter.h
+++ b/include/clang/Serialization/PCHWriter.h
@@ -18,8 +18,8 @@
 #include "clang/AST/Decl.h"
 #include "clang/AST/DeclarationName.h"
 #include "clang/AST/TemplateBase.h"
-#include "clang/Frontend/PCHBitCodes.h"
-#include "clang/Frontend/PCHDeserializationListener.h"
+#include "clang/Serialization/PCHBitCodes.h"
+#include "clang/Serialization/PCHDeserializationListener.h"
 #include "clang/Sema/SemaConsumer.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/SmallPtrSet.h"

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index bc2cd460d92b1bce734f6f6dfdf65547c6202991..8ecfcbea29b28cb517415bbb6371b5faccff92b5 100644 (file)
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -8,6 +8,7 @@ add_subdirectory(CodeGen)
 add_subdirectory(Analysis)
 add_subdirectory(Rewrite)
 add_subdirectory(Driver)
+add_subdirectory(Serialization)
 add_subdirectory(Frontend)
 add_subdirectory(Index)
 add_subdirectory(Checker)

diff --git a/lib/Frontend/ASTUnit.cpp b/lib/Frontend/ASTUnit.cpp
index 428647f03f41eb7157a99edbdda3813062288199..019d25c131fc21c8cdbc833861a5efe9a5203186 100644 (file)
--- a/lib/Frontend/ASTUnit.cpp
+++ b/lib/Frontend/ASTUnit.cpp
@@ -12,7 +12,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang/Frontend/ASTUnit.h"
-#include "clang/Frontend/PCHWriter.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/ASTConsumer.h"
 #include "clang/AST/DeclVisitor.h"
@@ -26,7 +25,8 @@
 #include "clang/Frontend/FrontendActions.h"
 #include "clang/Frontend/FrontendDiagnostic.h"
 #include "clang/Frontend/FrontendOptions.h"
-#include "clang/Frontend/PCHReader.h"
+#include "clang/Serialization/PCHReader.h"
+#include "clang/Serialization/PCHWriter.h"
 #include "clang/Lex/HeaderSearch.h"
 #include "clang/Lex/Preprocessor.h"
 #include "clang/Basic/TargetOptions.h"

diff --git a/lib/Frontend/CMakeLists.txt b/lib/Frontend/CMakeLists.txt
index a3fd17fc8c29f0de46d580e27cc36f1c9ab1dc0e..fa20aff9657ffce78c87116ab2bf02e350836096 100644 (file)
--- a/lib/Frontend/CMakeLists.txt
+++ b/lib/Frontend/CMakeLists.txt
@@ -20,12 +20,6 @@ add_clang_library(clangFrontend
   InitHeaderSearch.cpp
   InitPreprocessor.cpp
   LangStandards.cpp
-  PCHReader.cpp
-  PCHReaderDecl.cpp
-  PCHReaderStmt.cpp
-  PCHWriter.cpp
-  PCHWriterDecl.cpp
-  PCHWriterStmt.cpp
   PrintPreprocessedOutput.cpp
   StmtXML.cpp
   TextDiagnosticBuffer.cpp

diff --git a/lib/Frontend/CompilerInstance.cpp b/lib/Frontend/CompilerInstance.cpp
index 8e1dbcb9d24954cef8b6512a961d12c40ce6c0f2..aaa67804cefd7cf15e9fd8aa8ce992ba770aa63b 100644 (file)
--- a/lib/Frontend/CompilerInstance.cpp
+++ b/lib/Frontend/CompilerInstance.cpp
@@ -21,11 +21,11 @@
 #include "clang/Lex/PTHManager.h"
 #include "clang/Frontend/ChainedDiagnosticClient.h"
 #include "clang/Frontend/FrontendAction.h"
-#include "clang/Frontend/PCHReader.h"
 #include "clang/Frontend/FrontendDiagnostic.h"
 #include "clang/Frontend/TextDiagnosticPrinter.h"
 #include "clang/Frontend/VerifyDiagnosticsClient.h"
 #include "clang/Frontend/Utils.h"
+#include "clang/Serialization/PCHReader.h"
 #include "clang/Sema/CodeCompleteConsumer.h"
 #include "llvm/LLVMContext.h"
 #include "llvm/Support/MemoryBuffer.h"

diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp
index 82cd75d18abf040cde74012085205147eae07962..68b384f48c23dc8060a6f5034f89a00c9946e6a1 100644 (file)
--- a/lib/Frontend/CompilerInvocation.cpp
+++ b/lib/Frontend/CompilerInvocation.cpp
@@ -18,7 +18,7 @@
 #include "clang/Driver/Option.h"
 #include "clang/Frontend/CompilerInvocation.h"
 #include "clang/Frontend/LangStandard.h"
-#include "clang/Frontend/PCHReader.h"
+#include "clang/Serialization/PCHReader.h"
 #include "llvm/ADT/OwningPtr.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringExtras.h"

diff --git a/lib/Frontend/FrontendActions.cpp b/lib/Frontend/FrontendActions.cpp
index 0a03ab4c847758f936cd4ccc99dbf4cab6417dfd..8599efb95eef42be3b010760f9398d7796768552 100644 (file)
--- a/lib/Frontend/FrontendActions.cpp
+++ b/lib/Frontend/FrontendActions.cpp
@@ -17,8 +17,8 @@
 #include "clang/Frontend/ASTUnit.h"
 #include "clang/Frontend/CompilerInstance.h"
 #include "clang/Frontend/FrontendDiagnostic.h"
-#include "clang/Frontend/PCHWriter.h"
 #include "clang/Frontend/Utils.h"
+#include "clang/Serialization/PCHWriter.h"
 #include "llvm/ADT/OwningPtr.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/raw_ostream.h"

diff --git a/lib/Makefile b/lib/Makefile
index 4fca6249ba3d30dd6498efbcd567759e94663547..843b5740bb185c9ddf2eb6559f765a0ebe48bc04 100755 (executable)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -9,7 +9,7 @@
 CLANG_LEVEL := ..
 
 PARALLEL_DIRS = Headers Basic Lex Parse AST Sema CodeGen Analysis \
-                Checker Rewrite Frontend Index Driver
+                Checker Rewrite Serialization Frontend Index Driver
 
 include $(CLANG_LEVEL)/Makefile
 

diff --git a/lib/Serialization/CMakeLists.txt b/lib/Serialization/CMakeLists.txt
new file mode 100644 (file)
index 0000000..a7cd4b5
--- /dev/null
+++ b/lib/Serialization/CMakeLists.txt
@@ -0,0 +1,19 @@
+set(LLVM_NO_RTTI 1)
+
+add_clang_library(clangSerialization
+  PCHReader.cpp
+  PCHReaderDecl.cpp
+  PCHReaderStmt.cpp
+  PCHWriter.cpp
+  PCHWriterDecl.cpp
+  PCHWriterStmt.cpp
+  )
+
+add_dependencies(clangSerialization
+  ClangAttrClasses
+  ClangAttrList
+  ClangDiagnosticFrontend
+  ClangDiagnosticLex
+  ClangDiagnosticSema
+  ClangDeclNodes
+  ClangStmtNodes)

diff --git a/lib/Frontend/GeneratePCH.cpp b/lib/Serialization/GeneratePCH.cpp
similarity index 97%
rename from lib/Frontend/GeneratePCH.cpp
rename to lib/Serialization/GeneratePCH.cpp
index 33f5ef56ae32c9967c8b829aa3216d894de6ec82..55eaa9c084047f15d6f8c66a93798f0e0dd92386 100644 (file)
--- a/lib/Frontend/GeneratePCH.cpp
+++ b/lib/Serialization/GeneratePCH.cpp
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang/Frontend/ASTConsumers.h"
-#include "clang/Frontend/PCHWriter.h"
+#include "clang/Serialization/PCHWriter.h"
 #include "clang/Sema/SemaConsumer.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/ASTConsumer.h"

diff --git a/lib/Serialization/Makefile b/lib/Serialization/Makefile
new file mode 100644 (file)
index 0000000..e89ddc3
--- /dev/null
+++ b/lib/Serialization/Makefile
@@ -0,0 +1,19 @@
+##===- clang/lib/Serialization/Makefile --------------------*- Makefile -*-===##
+# 
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+# 
+##===----------------------------------------------------------------------===##
+#
+#  This implements the semantic analyzer and AST builder library for the 
+#  C-Language front-end.
+#
+##===----------------------------------------------------------------------===##
+
+CLANG_LEVEL := ../..
+LIBRARYNAME := clangSerialization
+
+include $(CLANG_LEVEL)/Makefile
+

diff --git a/lib/Frontend/PCHReader.cpp b/lib/Serialization/PCHReader.cpp
similarity index 99%
rename from lib/Frontend/PCHReader.cpp
rename to lib/Serialization/PCHReader.cpp
index 949177079757c69dc311ecb96dfe5d8819fa88eb..852bbaf21aaf71b7f87d9eaa26a29f3338596d9e 100644 (file)
--- a/lib/Frontend/PCHReader.cpp
+++ b/lib/Serialization/PCHReader.cpp
@@ -11,9 +11,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Frontend/PCHReader.h"
+#include "clang/Serialization/PCHReader.h"
+#include "clang/Serialization/PCHDeserializationListener.h"
 #include "clang/Frontend/FrontendDiagnostic.h"
-#include "clang/Frontend/PCHDeserializationListener.h"
 #include "clang/Frontend/Utils.h"
 #include "clang/Sema/Sema.h"
 #include "clang/AST/ASTConsumer.h"

diff --git a/lib/Frontend/PCHReaderDecl.cpp b/lib/Serialization/PCHReaderDecl.cpp
similarity index 99%
rename from lib/Frontend/PCHReaderDecl.cpp
rename to lib/Serialization/PCHReaderDecl.cpp
index a581951da72ce11238f046ac785cb51e53d6e734..91c71611b7eab0cddba6fc551dfcdde614c015b4 100644 (file)
--- a/lib/Frontend/PCHReaderDecl.cpp
+++ b/lib/Serialization/PCHReaderDecl.cpp
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Frontend/PCHReader.h"
+#include "clang/Serialization/PCHReader.h"
 #include "clang/AST/ASTConsumer.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/DeclVisitor.h"

diff --git a/lib/Frontend/PCHReaderStmt.cpp b/lib/Serialization/PCHReaderStmt.cpp
similarity index 99%
rename from lib/Frontend/PCHReaderStmt.cpp
rename to lib/Serialization/PCHReaderStmt.cpp
index 41c8a9aedc27b8cd2a0d2a522b4a626196f9a384..727dce39d7c5060065c1e758ff96b637dc46fb73 100644 (file)
--- a/lib/Frontend/PCHReaderStmt.cpp
+++ b/lib/Serialization/PCHReaderStmt.cpp
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Frontend/PCHReader.h"
+#include "clang/Serialization/PCHReader.h"
 #include "clang/AST/DeclCXX.h"
 #include "clang/AST/StmtVisitor.h"
 using namespace clang;

diff --git a/lib/Frontend/PCHWriter.cpp b/lib/Serialization/PCHWriter.cpp
similarity index 99%
rename from lib/Frontend/PCHWriter.cpp
rename to lib/Serialization/PCHWriter.cpp
index ac30fd34ccc4dab3256247a85e66c933eb2fc5a6..2cb2758e9a8dde42a85a0f44e02b92bf74dbaea3 100644 (file)
--- a/lib/Frontend/PCHWriter.cpp
+++ b/lib/Serialization/PCHWriter.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Frontend/PCHWriter.h"
+#include "clang/Serialization/PCHWriter.h"
 #include "clang/Sema/Sema.h"
 #include "clang/Sema/IdentifierResolver.h"
 #include "clang/AST/ASTContext.h"
@@ -20,7 +20,7 @@
 #include "clang/AST/Expr.h"
 #include "clang/AST/Type.h"
 #include "clang/AST/TypeLocVisitor.h"
-#include "clang/Frontend/PCHReader.h"
+#include "clang/Serialization/PCHReader.h"
 #include "clang/Lex/MacroInfo.h"
 #include "clang/Lex/PreprocessingRecord.h"
 #include "clang/Lex/Preprocessor.h"

diff --git a/lib/Frontend/PCHWriterDecl.cpp b/lib/Serialization/PCHWriterDecl.cpp
similarity index 99%
rename from lib/Frontend/PCHWriterDecl.cpp
rename to lib/Serialization/PCHWriterDecl.cpp
index 9893d254e9eaa56cc0da4015495860914616cf90..a9ec5276e84bc8ee2ea22f9a4288473729fa3e28 100644 (file)
--- a/lib/Frontend/PCHWriterDecl.cpp
+++ b/lib/Serialization/PCHWriterDecl.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Frontend/PCHWriter.h"
+#include "clang/Serialization/PCHWriter.h"
 #include "clang/AST/DeclVisitor.h"
 #include "clang/AST/DeclCXX.h"
 #include "clang/AST/DeclTemplate.h"

diff --git a/lib/Frontend/PCHWriterStmt.cpp b/lib/Serialization/PCHWriterStmt.cpp
similarity index 99%
rename from lib/Frontend/PCHWriterStmt.cpp
rename to lib/Serialization/PCHWriterStmt.cpp
index 0c149f2c20fda8e54f4090ab87a55644c85c41ac..182a2726034451dd830936975ca813a9333b6a6b 100644 (file)
--- a/lib/Frontend/PCHWriterStmt.cpp
+++ b/lib/Serialization/PCHWriterStmt.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Frontend/PCHWriter.h"
+#include "clang/Serialization/PCHWriter.h"
 #include "clang/AST/DeclCXX.h"
 #include "clang/AST/DeclObjC.h"
 #include "clang/AST/StmtVisitor.h"

diff --git a/tools/c-index-test/CMakeLists.txt b/tools/c-index-test/CMakeLists.txt
index d965fd2b51e2bbe4edabc72d81befd1c9ad61425..9426899e7bcd80f6a9acb645ac56d71451cf4797 100644 (file)
--- a/tools/c-index-test/CMakeLists.txt
+++ b/tools/c-index-test/CMakeLists.txt
@@ -5,6 +5,7 @@ set( LLVM_USED_LIBS
   clangIndex
   clangFrontend
   clangDriver
+  clangSerialization
   clangSema
   clangAnalysis
   clangAST

diff --git a/tools/c-index-test/Makefile b/tools/c-index-test/Makefile
index d168df55365103f48868962aa09872ac45248408..516a298ab317c9a5aaa5b482fed365778095cd22 100644 (file)
--- a/tools/c-index-test/Makefile
+++ b/tools/c-index-test/Makefile
@@ -14,7 +14,8 @@ TOOLNAME = c-index-test
 TOOL_NO_EXPORTS = 1
 
 LINK_COMPONENTS := bitreader mc core
-USEDLIBS = clang.a clangIndex.a clangFrontend.a clangDriver.a clangSema.a \
-          clangAnalysis.a clangAST.a clangParse.a clangLex.a clangBasic.a
+USEDLIBS = clang.a clangIndex.a clangFrontend.a clangDriver.a \
+          clangSerialization.a clangSema.a clangAnalysis.a clangAST.a \
+          clangParse.a clangLex.a clangBasic.a
 
 include $(CLANG_LEVEL)/Makefile

diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt
index 045a82595e0101caec0f2b2c12163d163e4acedf..47345239e89cf8121e27aab3d39e0b629a31613b 100644 (file)
--- a/tools/driver/CMakeLists.txt
+++ b/tools/driver/CMakeLists.txt
@@ -3,6 +3,7 @@ set(LLVM_NO_RTTI 1)
 set( LLVM_USED_LIBS
   clangFrontend
   clangDriver
+  clangSerialization
   clangCodeGen
   clangSema
   clangChecker

diff --git a/tools/driver/Makefile b/tools/driver/Makefile
index 260f53fec9e0442a6f59a66eda89a208ad9ff7fc..8cb63607261b47fb38cfaa86390c66ca0ea16389 100644 (file)
--- a/tools/driver/Makefile
+++ b/tools/driver/Makefile
@@ -27,9 +27,9 @@ include $(CLANG_LEVEL)/../../Makefile.config
 
 LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader bitwriter codegen \
                    ipo selectiondag
-USEDLIBS = clangFrontend.a clangDriver.a clangCodeGen.a clangSema.a \
-           clangChecker.a clangAnalysis.a clangIndex.a clangRewrite.a  \
-          clangAST.a clangParse.a clangLex.a clangBasic.a
+USEDLIBS = clangFrontend.a clangDriver.a clangSerialization.a clangCodeGen.a \
+           clangSema.a clangChecker.a clangAnalysis.a clangIndex.a \
+          clangRewrite.a clangAST.a clangParse.a clangLex.a clangBasic.a
 
 include $(CLANG_LEVEL)/Makefile
 

diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt
index c339eedbb5ca350a6d82296ee513658048a16857..635fca35bd1aac3c16fd220e95ef32a812efe7ee 100644 (file)
--- a/tools/libclang/CMakeLists.txt
+++ b/tools/libclang/CMakeLists.txt
@@ -5,6 +5,7 @@ set(LLVM_NO_RTTI 1)
 set(LLVM_USED_LIBS
   clangFrontend
   clangDriver
+  clangSerialization
   clangSema
   clangAnalysis
   clangAST

diff --git a/tools/libclang/Makefile b/tools/libclang/Makefile
index 7a620c15a937470d135a10d30c9223683d221b00..f74df4f5867c3d9f303fbdcc00065e9b212357fb 100644 (file)
--- a/tools/libclang/Makefile
+++ b/tools/libclang/Makefile
@@ -16,7 +16,7 @@ LINK_LIBS_IN_SHARED = 1
 SHARED_LIBRARY = 1
 
 LINK_COMPONENTS := bitreader mc core
-USEDLIBS = clangFrontend.a clangDriver.a clangSema.a \
+USEDLIBS = clangFrontend.a clangDriver.a clangSerialization.a clangSema.a \
           clangAnalysis.a clangAST.a clangParse.a clangLex.a clangBasic.a
 
 include $(CLANG_LEVEL)/Makefile