[lldb] Re-arrange some Apple-only code to prevent merge conflicts

There are some Apple-only changes that add an extra parameter to
`TypeSystemMap::GetTypeSystemForLanguage`. Add a separate method instead
(similar to `TypeSystem::CreateInstance`) and surround the code in
`BEGIN/END APPLE` blocks to make it clear they are Apple-only changes.

This also fixes compilation failures in
`lldb/unittests/Symbol/TestTypeSystem.cpp` since that can now use the
regular method instead.

Author: bnbarham

lldb/include/lldb/Symbol/TypeSystem.h

@@ -80,11 +80,13 @@ class TypeSystem : public PluginInterface {
                                            Module *module);
 
   static lldb::TypeSystemSP CreateInstance(lldb::LanguageType language,
-                                           Target *target,
-                                           const char *compiler_options);
+                                           Target *target);
 
+  // BEGIN APPLE
   static lldb::TypeSystemSP CreateInstance(lldb::LanguageType language,
-                                           Target *target);
+                                           Target *target,
+                                           const char *compiler_options);
+  // END APPLE
 
   // Free up any resources associated with this TypeSystem.  Done before
   // removing all the TypeSystems from the TypeSystemMap.
@@ -556,16 +558,22 @@ class TypeSystemMap {
   // callback to keep iterating, false to stop iterating.
   void ForEach(std::function<bool(TypeSystem *)> const &callback);
 
-  void RemoveTypeSystemsForLanguage(lldb::LanguageType language);
-
   llvm::Expected<TypeSystem &>
   GetTypeSystemForLanguage(lldb::LanguageType language, Module *module,
                            bool can_create);
 
+  llvm::Expected<TypeSystem &>
+  GetTypeSystemForLanguage(lldb::LanguageType language, Target *target,
+                           bool can_create);
+
+  // BEGIN SWIFT
   llvm::Expected<TypeSystem &>
   GetTypeSystemForLanguage(lldb::LanguageType language, Target *target,
                            bool can_create, const char *compiler_options);
 
+  void RemoveTypeSystemsForLanguage(lldb::LanguageType language);
+  // END SWIFT
+
 protected:
   typedef std::map<lldb::LanguageType, lldb::TypeSystemSP> collection;
   mutable std::mutex m_mutex; ///< A mutex to keep this object happy in

lldb/source/Symbol/TypeSystem.cpp

@@ -60,14 +60,14 @@ lldb::TypeSystemSP TypeSystem::CreateInstance(lldb::LanguageType language,
 }
 
 lldb::TypeSystemSP TypeSystem::CreateInstance(lldb::LanguageType language,
-                                              Target *target,
-                                              const char *compiler_options) {
-  return CreateInstanceHelper(language, nullptr, target, compiler_options);
+                                              Target *target) {
+  return CreateInstanceHelper(language, nullptr, target, nullptr);
 }
 
 lldb::TypeSystemSP TypeSystem::CreateInstance(lldb::LanguageType language,
-                                              Target *target) {
-  return CreateInstanceHelper(language, nullptr, target, nullptr);
+                                              Target *target,
+                                              const char *compiler_options) {
+  return CreateInstanceHelper(language, nullptr, target, compiler_options);
 }
 
 #ifndef NDEBUG
@@ -299,29 +299,38 @@ llvm::Expected<TypeSystem &> TypeSystemMap::GetTypeSystemForLanguage(
 
 llvm::Expected<TypeSystem &>
 TypeSystemMap::GetTypeSystemForLanguage(lldb::LanguageType language,
-                                        Target *target, bool can_create,
-// BEGIN: SWIFT
-                                        const char *compiler_options) {
-// END: SWIFT
+                                        Module *module, bool can_create) {
   if (can_create) {
     return GetTypeSystemForLanguage(
-        language, llvm::Optional<CreateCallback>([language, target,
-// BEGIN SWIFT
-                                                  compiler_options]() {
-          return TypeSystem::CreateInstance(language, target, compiler_options);
-// END SWIFT
+        language, llvm::Optional<CreateCallback>([language, module]() {
+          return TypeSystem::CreateInstance(language, module);
         }));
   }
   return GetTypeSystemForLanguage(language);
 }
 
 llvm::Expected<TypeSystem &>
 TypeSystemMap::GetTypeSystemForLanguage(lldb::LanguageType language,
-                                        Module *module, bool can_create) {
+                                        Target *target, bool can_create) {
   if (can_create) {
     return GetTypeSystemForLanguage(
-        language, llvm::Optional<CreateCallback>([language, module]() {
-          return TypeSystem::CreateInstance(language, module);
+        language, llvm::Optional<CreateCallback>([language, target]() {
+          return TypeSystem::CreateInstance(language, target);
+        }));
+  }
+  return GetTypeSystemForLanguage(language);
+}
+
+// BEGIN SWIFT
+llvm::Expected<TypeSystem &>
+TypeSystemMap::GetTypeSystemForLanguage(lldb::LanguageType language,
+                                        Target *target, bool can_create,
+                                        const char *compiler_options) {
+  if (can_create) {
+    return GetTypeSystemForLanguage(
+        language, llvm::Optional<CreateCallback>([language, target,
+                                                  compiler_options]() {
+          return TypeSystem::CreateInstance(language, target, compiler_options);
         }));
   }
   return GetTypeSystemForLanguage(language);
@@ -337,4 +346,4 @@ void TypeSystemMap::RemoveTypeSystemsForLanguage(lldb::LanguageType language) {
       m_map.erase(pos);
   }
 }
-
+// END SWIFT