Author: Duncan P. N. Exon Smith Date: 2019-11-21T19:07:00-08:00 New Revision: f7170d17a846cd67d70884ba168fd0fad63549ea
URL: https://github.com/llvm/llvm-project/commit/f7170d17a846cd67d70884ba168fd0fad63549ea DIFF: https://github.com/llvm/llvm-project/commit/f7170d17a846cd67d70884ba168fd0fad63549ea.diff LOG: clang/Modules: Move Serialization/Module.{h,cpp} to ModuleFile, NFC Remove some cognitive load by renaming clang/Serialization/Module.h to clang/Serialization/ModuleFile.h, since it declares the ModuleFile class. This also makes editing a bit easier, since the basename of the file no long conflicts with clang/Basic/Module.h, which declares the Module class. Also move lib/Serialization/Module.cpp to lib/Serialization/ModuleFile.cpp. Added: clang/include/clang/Serialization/ModuleFile.h clang/lib/Serialization/ModuleFile.cpp Modified: clang/include/clang/Serialization/ASTReader.h clang/include/clang/Serialization/ModuleManager.h clang/lib/Frontend/ASTUnit.cpp clang/lib/Frontend/Rewrite/FrontendActions.cpp clang/lib/Serialization/ASTReader.cpp clang/lib/Serialization/ASTReaderDecl.cpp clang/lib/Serialization/ASTWriter.cpp clang/lib/Serialization/CMakeLists.txt clang/lib/Serialization/GlobalModuleIndex.cpp clang/lib/Serialization/ModuleManager.cpp Removed: clang/include/clang/Serialization/Module.h clang/lib/Serialization/Module.cpp ################################################################################ diff --git a/clang/include/clang/Serialization/ASTReader.h b/clang/include/clang/Serialization/ASTReader.h index 2b2010f583d5..f0b5e9933823 100644 --- a/clang/include/clang/Serialization/ASTReader.h +++ b/clang/include/clang/Serialization/ASTReader.h @@ -36,7 +36,7 @@ #include "clang/Sema/IdentifierResolver.h" #include "clang/Serialization/ASTBitCodes.h" #include "clang/Serialization/ContinuousRangeMap.h" -#include "clang/Serialization/Module.h" +#include "clang/Serialization/ModuleFile.h" #include "clang/Serialization/ModuleFileExtension.h" #include "clang/Serialization/ModuleManager.h" #include "llvm/ADT/APFloat.h" diff --git a/clang/include/clang/Serialization/Module.h b/clang/include/clang/Serialization/ModuleFile.h similarity index 98% rename from clang/include/clang/Serialization/Module.h rename to clang/include/clang/Serialization/ModuleFile.h index b5afdf90c6af..8f3eb0220637 100644 --- a/clang/include/clang/Serialization/Module.h +++ b/clang/include/clang/Serialization/ModuleFile.h @@ -1,4 +1,4 @@ -//===- Module.h - Module description ----------------------------*- C++ -*-===// +//===- ModuleFile.h - Module file description -------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -11,8 +11,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_SERIALIZATION_MODULE_H -#define LLVM_CLANG_SERIALIZATION_MODULE_H +#ifndef LLVM_CLANG_SERIALIZATION_MODULEFILE_H +#define LLVM_CLANG_SERIALIZATION_MODULEFILE_H #include "clang/Basic/Module.h" #include "clang/Basic/SourceLocation.h" @@ -489,4 +489,4 @@ class ModuleFile { } // namespace clang -#endif // LLVM_CLANG_SERIALIZATION_MODULE_H +#endif // LLVM_CLANG_SERIALIZATION_MODULEFILE_H diff --git a/clang/include/clang/Serialization/ModuleManager.h b/clang/include/clang/Serialization/ModuleManager.h index 5f20fd7d2eca..15ddb9875ff1 100644 --- a/clang/include/clang/Serialization/ModuleManager.h +++ b/clang/include/clang/Serialization/ModuleManager.h @@ -17,7 +17,7 @@ #include "clang/Basic/LLVM.h" #include "clang/Basic/Module.h" #include "clang/Basic/SourceLocation.h" -#include "clang/Serialization/Module.h" +#include "clang/Serialization/ModuleFile.h" #include "llvm/ADT/DenseMap.h" #include "llvm/ADT/IntrusiveRefCntPtr.h" #include "llvm/ADT/STLExtras.h" diff --git a/clang/lib/Frontend/ASTUnit.cpp b/clang/lib/Frontend/ASTUnit.cpp index f5e291b7fe17..20f71ed1c411 100644 --- a/clang/lib/Frontend/ASTUnit.cpp +++ b/clang/lib/Frontend/ASTUnit.cpp @@ -61,7 +61,7 @@ #include "clang/Serialization/ASTWriter.h" #include "clang/Serialization/ContinuousRangeMap.h" #include "clang/Serialization/InMemoryModuleCache.h" -#include "clang/Serialization/Module.h" +#include "clang/Serialization/ModuleFile.h" #include "clang/Serialization/PCHContainerOperations.h" #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/DenseMap.h" diff --git a/clang/lib/Frontend/Rewrite/FrontendActions.cpp b/clang/lib/Frontend/Rewrite/FrontendActions.cpp index 549b86edebcd..6b6a60869ccc 100644 --- a/clang/lib/Frontend/Rewrite/FrontendActions.cpp +++ b/clang/lib/Frontend/Rewrite/FrontendActions.cpp @@ -21,7 +21,7 @@ #include "clang/Rewrite/Frontend/FixItRewriter.h" #include "clang/Rewrite/Frontend/Rewriters.h" #include "clang/Serialization/ASTReader.h" -#include "clang/Serialization/Module.h" +#include "clang/Serialization/ModuleFile.h" #include "clang/Serialization/ModuleManager.h" #include "llvm/ADT/DenseSet.h" #include "llvm/Support/CrashRecoveryContext.h" diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp index 36c2952346a7..0e5a3870109c 100644 --- a/clang/lib/Serialization/ASTReader.cpp +++ b/clang/lib/Serialization/ASTReader.cpp @@ -76,7 +76,7 @@ #include "clang/Serialization/ContinuousRangeMap.h" #include "clang/Serialization/GlobalModuleIndex.h" #include "clang/Serialization/InMemoryModuleCache.h" -#include "clang/Serialization/Module.h" +#include "clang/Serialization/ModuleFile.h" #include "clang/Serialization/ModuleFileExtension.h" #include "clang/Serialization/ModuleManager.h" #include "clang/Serialization/PCHContainerOperations.h" diff --git a/clang/lib/Serialization/ASTReaderDecl.cpp b/clang/lib/Serialization/ASTReaderDecl.cpp index 9f799e3646d5..8991a39a7067 100644 --- a/clang/lib/Serialization/ASTReaderDecl.cpp +++ b/clang/lib/Serialization/ASTReaderDecl.cpp @@ -50,7 +50,7 @@ #include "clang/Serialization/ASTBitCodes.h" #include "clang/Serialization/ASTReader.h" #include "clang/Serialization/ContinuousRangeMap.h" -#include "clang/Serialization/Module.h" +#include "clang/Serialization/ModuleFile.h" #include "llvm/ADT/DenseMap.h" #include "llvm/ADT/FoldingSet.h" #include "llvm/ADT/STLExtras.h" diff --git a/clang/lib/Serialization/ASTWriter.cpp b/clang/lib/Serialization/ASTWriter.cpp index 28affedbbb30..4c186629b59b 100644 --- a/clang/lib/Serialization/ASTWriter.cpp +++ b/clang/lib/Serialization/ASTWriter.cpp @@ -65,7 +65,7 @@ #include "clang/Sema/Weak.h" #include "clang/Serialization/ASTReader.h" #include "clang/Serialization/InMemoryModuleCache.h" -#include "clang/Serialization/Module.h" +#include "clang/Serialization/ModuleFile.h" #include "clang/Serialization/ModuleFileExtension.h" #include "clang/Serialization/SerializationDiagnostic.h" #include "llvm/ADT/APFloat.h" diff --git a/clang/lib/Serialization/CMakeLists.txt b/clang/lib/Serialization/CMakeLists.txt index ab90635d2b64..1f05117bb5fd 100644 --- a/clang/lib/Serialization/CMakeLists.txt +++ b/clang/lib/Serialization/CMakeLists.txt @@ -16,7 +16,7 @@ add_clang_library(clangSerialization GeneratePCH.cpp GlobalModuleIndex.cpp InMemoryModuleCache.cpp - Module.cpp + ModuleFile.cpp ModuleFileExtension.cpp ModuleManager.cpp PCHContainerOperations.cpp diff --git a/clang/lib/Serialization/GlobalModuleIndex.cpp b/clang/lib/Serialization/GlobalModuleIndex.cpp index 54ab17681ee9..dddee771da34 100644 --- a/clang/lib/Serialization/GlobalModuleIndex.cpp +++ b/clang/lib/Serialization/GlobalModuleIndex.cpp @@ -10,12 +10,12 @@ // //===----------------------------------------------------------------------===// +#include "clang/Serialization/GlobalModuleIndex.h" #include "ASTReaderInternals.h" #include "clang/Basic/FileManager.h" #include "clang/Lex/HeaderSearch.h" #include "clang/Serialization/ASTBitCodes.h" -#include "clang/Serialization/GlobalModuleIndex.h" -#include "clang/Serialization/Module.h" +#include "clang/Serialization/ModuleFile.h" #include "clang/Serialization/PCHContainerOperations.h" #include "llvm/ADT/DenseMap.h" #include "llvm/ADT/MapVector.h" diff --git a/clang/lib/Serialization/Module.cpp b/clang/lib/Serialization/ModuleFile.cpp similarity index 94% rename from clang/lib/Serialization/Module.cpp rename to clang/lib/Serialization/ModuleFile.cpp index 2b6c9211beaf..db896fd36115 100644 --- a/clang/lib/Serialization/Module.cpp +++ b/clang/lib/Serialization/ModuleFile.cpp @@ -1,4 +1,4 @@ -//===- Module.cpp - Module description ------------------------------------===// +//===- ModuleFile.cpp - Module description --------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// // -// This file implements the Module class, which describes a module that has -// been loaded from an AST file. +// This file implements the ModuleFile class, which describes a module that +// has been loaded from an AST file. // //===----------------------------------------------------------------------===// -#include "clang/Serialization/Module.h" +#include "clang/Serialization/ModuleFile.h" #include "ASTReaderInternals.h" #include "clang/Serialization/ContinuousRangeMap.h" #include "llvm/ADT/StringRef.h" diff --git a/clang/lib/Serialization/ModuleManager.cpp b/clang/lib/Serialization/ModuleManager.cpp index 669ab901731f..daef502cdcb5 100644 --- a/clang/lib/Serialization/ModuleManager.cpp +++ b/clang/lib/Serialization/ModuleManager.cpp @@ -18,7 +18,7 @@ #include "clang/Lex/ModuleMap.h" #include "clang/Serialization/GlobalModuleIndex.h" #include "clang/Serialization/InMemoryModuleCache.h" -#include "clang/Serialization/Module.h" +#include "clang/Serialization/ModuleFile.h" #include "clang/Serialization/PCHContainerOperations.h" #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/SetVector.h" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
