Merge remote-tracking branch 'origin/master' into master-rebranch

Author: swift-ci

include/swift/AST/DiagnosticEngine.h

@@ -20,8 +20,8 @@
 
 #include "swift/AST/DeclNameLoc.h"
 #include "swift/AST/DiagnosticConsumer.h"
-#include "swift/AST/LocalizationFormat.h"
 #include "swift/AST/TypeLoc.h"
+#include "swift/Localization/LocalizationFormat.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/StringSet.h"
 #include "llvm/Support/Allocator.h"

include/swift/AST/LocalizationFormat.h renamed to include/swift/Localization/LocalizationFormat.h

@@ -57,7 +57,6 @@ add_swift_host_library(swiftAST STATIC
   IndexSubset.cpp
   InlinableText.cpp
   LayoutConstraint.cpp
-  LocalizationFormat.cpp
   Module.cpp
   ModuleDependencies.cpp
   ModuleLoader.cpp

lib/AST/CMakeLists.txt

@@ -20,14 +20,14 @@
 #include "swift/AST/ASTPrinter.h"
 #include "swift/AST/Decl.h"
 #include "swift/AST/DiagnosticSuppression.h"
-#include "swift/AST/LocalizationFormat.h"
 #include "swift/AST/Module.h"
 #include "swift/AST/Pattern.h"
 #include "swift/AST/PrintOptions.h"
 #include "swift/AST/SourceFile.h"
 #include "swift/AST/TypeRepr.h"
 #include "swift/Basic/SourceManager.h"
 #include "swift/Config.h"
+#include "swift/Localization/LocalizationFormat.h"
 #include "swift/Parse/Lexer.h" // bad dependency
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/Twine.h"

lib/AST/DiagnosticEngine.cpp

@@ -27,6 +27,7 @@ add_subdirectory(IDE)
 add_subdirectory(Immediate)
 add_subdirectory(IRGen)
 add_subdirectory(LLVMPasses)
+add_subdirectory(Localization)
 add_subdirectory(Markup)
 add_subdirectory(Migrator)
 add_subdirectory(Option)

lib/CMakeLists.txt

@@ -23,6 +23,7 @@ target_link_libraries(swiftFrontend PRIVATE
   swiftSILGen
   swiftSILOptimizer
   swiftIRGen
+  swiftLocalization
   swiftSema
   swiftSerialization
   swiftTBDGen)

lib/Frontend/CMakeLists.txt

@@ -0,0 +1,6 @@
+
+add_swift_host_library(swiftLocalization STATIC
+  LocalizationFormat.cpp
+
+  LLVM_LINK_COMPONENTS
+    support)

lib/Localization/CMakeLists.txt

@@ -14,7 +14,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "swift/AST/LocalizationFormat.h"
+#include "swift/Localization/LocalizationFormat.h"
 #include "llvm/ADT/Optional.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/StringRef.h"

lib/AST/LocalizationFormat.cpp renamed to lib/Localization/LocalizationFormat.cpp

@@ -2,6 +2,5 @@ add_swift_host_tool(swift-serialize-diagnostics
   swift-serialize-diagnostics.cpp
   SWIFT_COMPONENT tools
 )
-target_link_libraries(swift-serialize-diagnostics
-                      PRIVATE
-                        swiftAST)
+target_link_libraries(swift-serialize-diagnostics PRIVATE
+  swiftLocalization)

tools/swift-serialize-diagnostics/CMakeLists.txt

@@ -14,9 +14,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "swift/AST/LocalizationFormat.h"
 #include "swift/Basic/LLVMInitialize.h"
 #include "swift/Basic/STLExtras.h"
+#include "swift/Localization/LocalizationFormat.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/ADT/StringRef.h"