From 71088d1af241ad114294ec3fe03cd9baea39ee08 Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Fri, 9 Dec 2011 01:55:54 +0000 Subject: [PATCH] Move ChainedIncludesSource into the Frontend library. This never really belonged in the Serialization library, it's setting up a compilation, not just deserializing. This should fix PR11512, making Serialization actually be layered below Frontend, a long standing layering violation in Clang. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@146233 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../{Serialization => Frontend}/ChainedIncludesSource.h | 0 lib/Frontend/CMakeLists.txt | 1 + lib/{Serialization => Frontend}/ChainedIncludesSource.cpp | 6 +++--- lib/Frontend/FrontendAction.cpp | 2 +- lib/Serialization/CMakeLists.txt | 1 - 5 files changed, 5 insertions(+), 5 deletions(-) rename include/clang/{Serialization => Frontend}/ChainedIncludesSource.h (100%) rename lib/{Serialization => Frontend}/ChainedIncludesSource.cpp (99%) diff --git a/include/clang/Serialization/ChainedIncludesSource.h b/include/clang/Frontend/ChainedIncludesSource.h similarity index 100% rename from include/clang/Serialization/ChainedIncludesSource.h rename to include/clang/Frontend/ChainedIncludesSource.h diff --git a/lib/Frontend/CMakeLists.txt b/lib/Frontend/CMakeLists.txt index cbeb69d12b..f76b79566c 100644 --- a/lib/Frontend/CMakeLists.txt +++ b/lib/Frontend/CMakeLists.txt @@ -13,6 +13,7 @@ add_clang_library(clangFrontend ASTMerge.cpp ASTUnit.cpp CacheTokens.cpp + ChainedIncludesSource.cpp CompilerInstance.cpp CompilerInvocation.cpp CreateInvocationFromCommandLine.cpp diff --git a/lib/Serialization/ChainedIncludesSource.cpp b/lib/Frontend/ChainedIncludesSource.cpp similarity index 99% rename from lib/Serialization/ChainedIncludesSource.cpp rename to lib/Frontend/ChainedIncludesSource.cpp index 90c71140be..f1aa8a1d05 100644 --- a/lib/Serialization/ChainedIncludesSource.cpp +++ b/lib/Frontend/ChainedIncludesSource.cpp @@ -12,12 +12,12 @@ // //===----------------------------------------------------------------------===// -#include "clang/Serialization/ChainedIncludesSource.h" -#include "clang/Serialization/ASTReader.h" -#include "clang/Serialization/ASTWriter.h" +#include "clang/Frontend/ChainedIncludesSource.h" #include "clang/Frontend/TextDiagnosticPrinter.h" #include "clang/Frontend/CompilerInstance.h" #include "clang/Frontend/ASTUnit.h" +#include "clang/Serialization/ASTReader.h" +#include "clang/Serialization/ASTWriter.h" #include "clang/Parse/ParseAST.h" #include "clang/Lex/Preprocessor.h" #include "clang/Basic/TargetInfo.h" diff --git a/lib/Frontend/FrontendAction.cpp b/lib/Frontend/FrontendAction.cpp index b5284d8022..439a124f3b 100644 --- a/lib/Frontend/FrontendAction.cpp +++ b/lib/Frontend/FrontendAction.cpp @@ -14,6 +14,7 @@ #include "clang/Lex/HeaderSearch.h" #include "clang/Lex/Preprocessor.h" #include "clang/Frontend/ASTUnit.h" +#include "clang/Frontend/ChainedIncludesSource.h" #include "clang/Frontend/CompilerInstance.h" #include "clang/Frontend/FrontendDiagnostic.h" #include "clang/Frontend/FrontendPluginRegistry.h" @@ -21,7 +22,6 @@ #include "clang/Parse/ParseAST.h" #include "clang/Serialization/ASTDeserializationListener.h" #include "clang/Serialization/ASTReader.h" -#include "clang/Serialization/ChainedIncludesSource.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/Timer.h" #include "llvm/Support/ErrorHandling.h" diff --git a/lib/Serialization/CMakeLists.txt b/lib/Serialization/CMakeLists.txt index 62991a9f55..71f28ff587 100644 --- a/lib/Serialization/CMakeLists.txt +++ b/lib/Serialization/CMakeLists.txt @@ -11,7 +11,6 @@ add_clang_library(clangSerialization ASTWriter.cpp ASTWriterDecl.cpp ASTWriterStmt.cpp - ChainedIncludesSource.cpp GeneratePCH.cpp Module.cpp ModuleManager.cpp -- 2.40.0