swiftlang · JDevlieghere · May 4, 2021 · Apr 22, 2021
diff --git a/lldb/source/API/SBFrame.cpp b/lldb/source/API/SBFrame.cpp
@@ -54,8 +54,7 @@
 #include "llvm/Support/PrettyStackTrace.h"
 
 // BEGIN SWIFT
-#include "lldb/Target/LanguageRuntime.h"
-#include "lldb/Target/SwiftLanguageRuntime.h"
+#include "Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.h"
 // END SWIFT
 
 using namespace lldb;

diff --git a/lldb/source/Core/Mangled.cpp b/lldb/source/Core/Mangled.cpp
@@ -24,7 +24,7 @@
 #include "llvm/Support/Compiler.h"
 
 #ifdef LLDB_ENABLE_SWIFT
-#include "lldb/Target/SwiftLanguageRuntime.h"
+#include "Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.h"
 #include "llvm/ADT/DenseMap.h"
 #include "swift/Demangling/Demangle.h"
 #endif // LLDB_ENABLE_SWIFT

diff --git a/lldb/source/Core/Module.cpp b/lldb/source/Core/Module.cpp
@@ -55,7 +55,7 @@
 
 #ifdef LLDB_ENABLE_SWIFT
 #include "Plugins/TypeSystem/Swift/SwiftASTContext.h"
-#include "lldb/Target/SwiftLanguageRuntime.h"
+#include "Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.h"
 #endif // LLDB_ENABLE_SWIFT
 
 #include "llvm/ADT/STLExtras.h"

diff --git a/lldb/source/Expression/DWARFExpression.cpp b/lldb/source/Expression/DWARFExpression.cpp
@@ -37,7 +37,7 @@
 #include "lldb/Target/Thread.h"
 
 #ifdef LLDB_ENABLE_SWIFT
-#include "lldb/Target/SwiftLanguageRuntime.h"
+#include "Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.h"
 #endif
 
 #include "Plugins/SymbolFile/DWARF/DWARFUnit.h"

diff --git a/lldb/source/Plugins/ExpressionParser/Swift/CMakeLists.txt b/lldb/source/Plugins/ExpressionParser/Swift/CMakeLists.txt
@@ -27,6 +27,7 @@ add_lldb_library(lldbPluginExpressionParserSwift PLUGIN
     lldbTarget
     lldbUtility
     lldbPluginTypeSystemSwift
+    lldbPluginSwiftLanguageRuntime
     swiftAST
     swiftBasic
     swiftClangImporter

diff --git a/lldb/source/Plugins/ExpressionParser/Swift/SwiftASTManipulator.cpp b/lldb/source/Plugins/ExpressionParser/Swift/SwiftASTManipulator.cpp
@@ -12,10 +12,10 @@
 
 #include "SwiftASTManipulator.h"
 
+#include "Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.h"
 #include "Plugins/TypeSystem/Swift/SwiftASTContext.h"
 #include "lldb/Expression/ExpressionParser.h"
 #include "lldb/Expression/ExpressionSourceCode.h"
-#include "lldb/Target/SwiftLanguageRuntime.h"
 #include "lldb/Target/Target.h"
 #include "lldb/Utility/ConstString.h"
 #include "lldb/Utility/Log.h"

diff --git a/lldb/source/Plugins/ExpressionParser/Swift/SwiftExpressionParser.cpp b/lldb/source/Plugins/ExpressionParser/Swift/SwiftExpressionParser.cpp
@@ -20,6 +20,7 @@
 
 #include "Plugins/ExpressionParser/Swift/SwiftDiagnostic.h"
 #include "Plugins/ExpressionParser/Swift/SwiftExpressionVariable.h"
+#include "Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.h"
 #include "lldb/Core/Module.h"
 #include "lldb/Core/ModuleList.h"
 #include "lldb/Core/ModuleSpec.h"
@@ -34,7 +35,6 @@
 #include "lldb/Symbol/VariableList.h"
 #include "lldb/Target/ExecutionContext.h"
 #include "lldb/Target/StackFrame.h"
-#include "lldb/Target/SwiftLanguageRuntime.h"
 #include "lldb/Target/Target.h"
 #include "lldb/Target/Thread.h"
 #include "lldb/Utility/Log.h"

diff --git a/lldb/source/Plugins/ExpressionParser/Swift/SwiftREPLMaterializer.cpp b/lldb/source/Plugins/ExpressionParser/Swift/SwiftREPLMaterializer.cpp
@@ -13,12 +13,12 @@
 #include "SwiftREPLMaterializer.h"
 #include "SwiftASTManipulator.h"
 
+#include "Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.h"
 #include "lldb/Core/DumpDataExtractor.h"
 #include "lldb/Core/ValueObjectConstResult.h"
 #include "lldb/Expression/IRExecutionUnit.h"
 #include "lldb/Expression/IRMemoryMap.h"
 #include "lldb/Target/Target.h"
-#include "lldb/Target/SwiftLanguageRuntime.h"
 #include "lldb/Utility/Log.h"
 
 #include "swift/Demangling/Demangle.h"

diff --git a/lldb/source/Plugins/ExpressionParser/Swift/SwiftUserExpression.cpp b/lldb/source/Plugins/ExpressionParser/Swift/SwiftUserExpression.cpp
@@ -19,6 +19,7 @@
 #include "SwiftREPLMaterializer.h"
 #include "SwiftExpressionSourceCode.h"
 
+#include "Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.h"
 #include "lldb/Core/Module.h"
 #include "lldb/Expression/DiagnosticManager.h"
 #include "lldb/Expression/ExpressionParser.h"
@@ -29,7 +30,6 @@
 #include "lldb/Symbol/Type.h"
 #include "lldb/Symbol/Variable.h"
 #include "lldb/Symbol/VariableList.h"
-#include "lldb/Target/SwiftLanguageRuntime.h"
 #include "lldb/Utility/LLDBAssert.h"
 #include "lldb/Utility/Log.h"
 

diff --git a/lldb/source/Plugins/Language/Swift/FoundationValueTypes.cpp b/lldb/source/Plugins/Language/Swift/FoundationValueTypes.cpp
@@ -16,11 +16,11 @@
 #include "llvm/ADT/STLExtras.h"
 
 #include "Plugins/LanguageRuntime/ObjC/ObjCLanguageRuntime.h"
+#include "Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.h"
 #include "Plugins/TypeSystem/Clang/TypeSystemClang.h"
 #include "lldb/Core/ValueObject.h"
 #include "lldb/DataFormatters/FormattersHelpers.h"
 #include "lldb/Target/Process.h"
-#include "lldb/Target/SwiftLanguageRuntime.h"
 #include "lldb/Target/Target.h"
 #include "lldb/Utility/DataExtractor.h"
 #include "lldb/Utility/Status.h"

diff --git a/lldb/source/Plugins/Language/Swift/SwiftArray.cpp b/lldb/source/Plugins/Language/Swift/SwiftArray.cpp
@@ -12,12 +12,12 @@
 
 #include "SwiftArray.h"
 
+#include "Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.h"
 #include "Plugins/TypeSystem/Clang/TypeSystemClang.h"
 #include "Plugins/TypeSystem/Swift/SwiftASTContext.h"
 #include "lldb/Core/ValueObjectConstResult.h"
 #include "lldb/DataFormatters/FormattersHelpers.h"
 #include "lldb/Target/Process.h"
-#include "lldb/Target/SwiftLanguageRuntime.h"
 #include "lldb/Target/Target.h"
 
 // FIXME: we should not need this

diff --git a/lldb/source/Plugins/Language/Swift/SwiftDictionary.cpp b/lldb/source/Plugins/Language/Swift/SwiftDictionary.cpp
@@ -12,11 +12,11 @@
 
 #include "SwiftDictionary.h"
 
+#include "Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.h"
 #include "Plugins/TypeSystem/Clang/TypeSystemClang.h"
 #include "Plugins/TypeSystem/Swift/SwiftASTContext.h"
 #include "lldb/DataFormatters/FormattersHelpers.h"
 #include "lldb/Target/Process.h"
-#include "lldb/Target/SwiftLanguageRuntime.h"
 
 #include "swift/AST/ASTContext.h"
 #include "llvm/ADT/StringRef.h"

diff --git a/lldb/source/Plugins/Language/Swift/SwiftFormatters.cpp b/lldb/source/Plugins/Language/Swift/SwiftFormatters.cpp
@@ -11,11 +11,11 @@
 //===----------------------------------------------------------------------===//
 
 #include "SwiftFormatters.h"
+#include "Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.h"
 #include "Plugins/TypeSystem/Clang/TypeSystemClang.h"
 #include "lldb/DataFormatters/FormattersHelpers.h"
 #include "lldb/DataFormatters/StringPrinter.h"
 #include "lldb/Target/Process.h"
-#include "lldb/Target/SwiftLanguageRuntime.h"
 #include "lldb/Utility/DataBufferHeap.h"
 #include "lldb/Utility/Status.h"
 #include "swift/AST/Types.h"

diff --git a/lldb/source/Plugins/Language/Swift/SwiftHashedContainer.cpp b/lldb/source/Plugins/Language/Swift/SwiftHashedContainer.cpp
@@ -13,12 +13,12 @@
 #include "SwiftHashedContainer.h"
 
 #include "Plugins/LanguageRuntime/ObjC/ObjCLanguageRuntime.h"
+#include "Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.h"
 #include "Plugins/TypeSystem/Clang/TypeSystemClang.h"
 #include "Plugins/TypeSystem/Swift/SwiftASTContext.h"
 #include "lldb/Core/ValueObjectConstResult.h"
 #include "lldb/DataFormatters/FormattersHelpers.h"
 #include "lldb/Target/Process.h"
-#include "lldb/Target/SwiftLanguageRuntime.h"
 #include "lldb/Utility/DataBufferHeap.h"
 
 #include "Plugins/Language/ObjC/NSDictionary.h"

diff --git a/lldb/source/Plugins/Language/Swift/SwiftLanguage.cpp b/lldb/source/Plugins/Language/Swift/SwiftLanguage.cpp
@@ -21,13 +21,13 @@
 #include "lldb/DataFormatters/FormattersHelpers.h"
 #include "lldb/DataFormatters/StringPrinter.h"
 
+#include "Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.h"
 #include "Plugins/TypeSystem/Clang/TypeSystemClang.h"
 #include "lldb/Symbol/CompileUnit.h"
 #include "lldb/Symbol/Function.h"
 #include "lldb/Symbol/Variable.h"
 #include "lldb/Symbol/VariableList.h"
 
-#include "lldb/Target/SwiftLanguageRuntime.h"
 
 #include "ObjCRuntimeSyntheticProvider.h"
 #include "SwiftFormatters.h"

diff --git a/lldb/source/Plugins/Language/Swift/SwiftMetatype.cpp b/lldb/source/Plugins/Language/Swift/SwiftMetatype.cpp
@@ -11,10 +11,10 @@
 //===----------------------------------------------------------------------===//
 
 #include "SwiftMetatype.h"
+#include "Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.h"
 #include "lldb/Core/Mangled.h"
 #include "lldb/Symbol/CompilerType.h"
 #include "lldb/Target/Process.h"
-#include "lldb/Target/SwiftLanguageRuntime.h"
 
 #include "swift/AST/Type.h"
 #include "swift/AST/Types.h"

diff --git a/lldb/source/Plugins/Language/Swift/SwiftOptional.cpp b/lldb/source/Plugins/Language/Swift/SwiftOptional.cpp
@@ -11,12 +11,12 @@
 //===----------------------------------------------------------------------===//
 
 #include "SwiftOptional.h"
+#include "Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.h"
 #include "Plugins/TypeSystem/Swift/SwiftASTContext.h"
 #include "lldb/DataFormatters/DataVisualization.h"
 #include "lldb/DataFormatters/TypeSummary.h"
 #include "lldb/DataFormatters/ValueObjectPrinter.h"
 #include "lldb/Target/Process.h"
-#include "lldb/Target/SwiftLanguageRuntime.h"
 #include "lldb/Utility/DataBufferHeap.h"
 #include "lldb/Utility/DataExtractor.h"
 

diff --git a/lldb/source/Plugins/Language/Swift/SwiftSet.cpp b/lldb/source/Plugins/Language/Swift/SwiftSet.cpp
@@ -12,11 +12,11 @@
 
 #include "SwiftSet.h"
 
+#include "Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.h"
 #include "Plugins/TypeSystem/Clang/TypeSystemClang.h"
 #include "Plugins/TypeSystem/Swift/SwiftASTContext.h"
 #include "lldb/DataFormatters/FormattersHelpers.h"
 #include "lldb/Target/Process.h"
-#include "lldb/Target/SwiftLanguageRuntime.h"
 
 #include "swift/AST/ASTContext.h"
 #include "llvm/ADT/StringRef.h"

diff --git a/lldb/source/Plugins/Language/Swift/SwiftUnsafeTypes.cpp b/lldb/source/Plugins/Language/Swift/SwiftUnsafeTypes.cpp
@@ -1,9 +1,9 @@
 #include "SwiftUnsafeTypes.h"
 #include "SwiftBasicTypes.h"
 
+#include "Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.h"
 #include "Plugins/TypeSystem/Swift/SwiftASTContext.h"
 #include "lldb/DataFormatters/TypeSynthetic.h"
-#include "lldb/Target/SwiftLanguageRuntime.h"
 #include "lldb/Utility/Log.h"
 #include "lldb/Utility/Logging.h"
 

diff --git a/lldb/source/Plugins/LanguageRuntime/CMakeLists.txt b/lldb/source/Plugins/LanguageRuntime/CMakeLists.txt
@@ -1,3 +1,6 @@
 add_subdirectory(CPlusPlus)
 add_subdirectory(ObjC)
 add_subdirectory(RenderScript)
+if (LLDB_ENABLE_SWIFT_SUPPORT)
+  add_subdirectory(Swift)
+endif()
diff --git a/lldb/source/Plugins/LanguageRuntime/Swift/CMakeLists.txt b/lldb/source/Plugins/LanguageRuntime/Swift/CMakeLists.txt
@@ -0,0 +1,19 @@
+add_lldb_library(lldbPluginSwiftLanguageRuntime PLUGIN
+  SwiftLanguageRuntime.cpp
+  SwiftLanguageRuntimeDynamicTypeResolution.cpp
+  SwiftLanguageRuntimeNames.cpp
+
+  LINK_LIBS
+    swiftAST
+    swiftBasic
+    swiftReflection
+    swiftRemoteAST
+    lldbCore
+    lldbExpression
+    lldbInterpreter
+    lldbTarget
+    lldbUtility
+    lldbPluginExpressionParserClang
+    lldbPluginProcessUtility
+    lldbPluginSwiftLanguage
+)
diff --git a/lldb/source/Target/SwiftLanguageRuntime.cpp → ...ageRuntime/Swift/SwiftLanguageRuntime.cpp b/lldb/source/Target/SwiftLanguageRuntime.cpp → ...ageRuntime/Swift/SwiftLanguageRuntime.cpp
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "lldb/Target/SwiftLanguageRuntime.h"
+#include "SwiftLanguageRuntime.h"
 #include "SwiftLanguageRuntimeImpl.h"
 
 #include "Plugins/Process/Utility/RegisterContext_x86.h"
@@ -54,6 +54,8 @@
 using namespace lldb;
 using namespace lldb_private;
 
+LLDB_PLUGIN_DEFINE(SwiftLanguageRuntime)
+
 namespace lldb_private {
 char SwiftLanguageRuntime::ID = 0;
 

diff --git a/...nclude/lldb/Target/SwiftLanguageRuntime.h → ...guageRuntime/Swift/SwiftLanguageRuntime.h b/...nclude/lldb/Target/SwiftLanguageRuntime.h → ...guageRuntime/Swift/SwiftLanguageRuntime.h
diff --git a/...tLanguageRuntimeDynamicTypeResolution.cpp → ...tLanguageRuntimeDynamicTypeResolution.cpp b/...tLanguageRuntimeDynamicTypeResolution.cpp → ...tLanguageRuntimeDynamicTypeResolution.cpp
@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "SwiftLanguageRuntimeImpl.h"
-#include "lldb/Target/SwiftLanguageRuntime.h"
+#include "SwiftLanguageRuntime.h"
 
 #include "Plugins/TypeSystem/Clang/TypeSystemClang.h"
 #include "Plugins/ExpressionParser/Clang/ClangUtil.h"

diff --git a/.../source/Target/SwiftLanguageRuntimeImpl.h → ...eRuntime/Swift/SwiftLanguageRuntimeImpl.h b/.../source/Target/SwiftLanguageRuntimeImpl.h → ...eRuntime/Swift/SwiftLanguageRuntimeImpl.h
@@ -13,7 +13,7 @@
 #ifndef liblldb_SwiftLanguageRuntimeImpl_h_
 #define liblldb_SwiftLanguageRuntimeImpl_h_
 
-#include "lldb/Target/SwiftLanguageRuntime.h"
+#include "SwiftLanguageRuntime.h"
 #include "swift/Reflection/TypeLowering.h"
 
 namespace swift {

diff --git a/...urce/Target/SwiftLanguageRuntimeNames.cpp → ...ntime/Swift/SwiftLanguageRuntimeNames.cpp b/...urce/Target/SwiftLanguageRuntimeNames.cpp → ...ntime/Swift/SwiftLanguageRuntimeNames.cpp
@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "SwiftLanguageRuntimeImpl.h"
-#include "lldb/Target/SwiftLanguageRuntime.h"
+#include "SwiftLanguageRuntime.h"
 
 #include "lldb/Breakpoint/StoppointCallbackContext.h"
 #include "lldb/Symbol/Block.h"

diff --git a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
@@ -48,7 +48,7 @@
 #include "ObjectFileMachO.h"
 #ifdef LLDB_ENABLE_SWIFT
 #include "swift/ABI/ObjectFile.h"
-#include "lldb/Target/SwiftLanguageRuntime.h"
+#include "Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.h"
 #endif //LLDB_ENABLE_SWIFT
 
 #if defined(__APPLE__)

diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserSwift.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserSwift.cpp
@@ -25,6 +25,7 @@
 
 #include "clang/AST/DeclObjC.h"
 
+#include "Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.h"
 #include "Plugins/TypeSystem/Clang/TypeSystemClang.h"
 #include "Plugins/TypeSystem/Swift/SwiftASTContext.h"
 #include "lldb/Core/Module.h"
@@ -34,7 +35,6 @@
 #include "lldb/Symbol/SymbolVendor.h"
 #include "lldb/Symbol/Type.h"
 #include "lldb/Symbol/TypeMap.h"
-#include "lldb/Target/SwiftLanguageRuntime.h"
 #include "lldb/Utility/Log.h"
 #include "lldb/Utility/Status.h"
 

diff --git a/lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp b/lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp
@@ -113,7 +113,6 @@
 #include "lldb/Symbol/VariableList.h"
 #include "lldb/Target/Platform.h"
 #include "lldb/Target/Process.h"
-#include "lldb/Target/SwiftLanguageRuntime.h"
 #include "lldb/Target/Target.h"
 #include "lldb/Utility/ArchSpec.h"
 #include "lldb/Utility/FileSpec.h"
@@ -125,6 +124,7 @@
 #include "lldb/Utility/ReproducerProvider.h"
 #include "llvm/ADT/ScopeExit.h"
 
+#include "Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.h"
 #include "Plugins/Platform/MacOSX/PlatformDarwin.h"
 #include "Plugins/SymbolFile/DWARF/DWARFASTParserClang.h"
 #include "Plugins/SymbolFile/DWARF/DWARFASTParserSwift.h"

diff --git a/lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwift.cpp b/lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwift.cpp
@@ -12,8 +12,8 @@
 
 #include "Plugins/TypeSystem/Swift/TypeSystemSwift.h"
 
+#include "Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.h"
 #include "lldb/Core/PluginManager.h"
-#include "lldb/Target/SwiftLanguageRuntime.h"
 #include <lldb/lldb-enumerations.h>
 #include <llvm/ADT/StringRef.h>
 

diff --git a/lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwiftTypeRef.cpp b/lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwiftTypeRef.cpp
@@ -13,11 +13,11 @@
 #include "Plugins/TypeSystem/Swift/TypeSystemSwiftTypeRef.h"
 #include "Plugins/TypeSystem/Swift/SwiftASTContext.h"
 
+#include "Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.h"
 #include "lldb/Core/DumpDataExtractor.h"
 #include "lldb/Symbol/CompileUnit.h"
 #include "lldb/Symbol/TypeList.h"
 #include "lldb/Symbol/TypeMap.h"
-#include "lldb/Target/SwiftLanguageRuntime.h"
 #include "lldb/Utility/Log.h"
 
 #include "Plugins/ExpressionParser/Clang/ClangExternalASTSourceCallbacks.h"

diff --git a/lldb/source/Symbol/Symtab.cpp b/lldb/source/Symbol/Symtab.cpp
@@ -25,7 +25,7 @@
 #include "llvm/ADT/StringRef.h"
 
 #ifdef LLDB_ENABLE_SWIFT
-#include "lldb/Target/SwiftLanguageRuntime.h"
+#include "Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.h"
 #endif // LLDB_ENABLE_SWIFT
 
 using namespace lldb;