[lldb] Adapt lldb to upstream's layering violation check

augusto2112 · augusto2112 · commit ff488ebcd39a · 2025-07-21T13:48:35.000-07:00
d33eec8 added a layering violation check, where we can explicitly mark some layering violations as tolerated until fixed.
diff --git a/lldb/source/Plugins/ExpressionParser/Swift/CMakeLists.txt b/lldb/source/Plugins/ExpressionParser/Swift/CMakeLists.txt
@@ -2,6 +2,11 @@ if(NOT LLDB_BUILT_STANDALONE)
   set(tablegen_deps intrinsics_gen)
 endif()
 
+set_property(DIRECTORY PROPERTY LLDB_TOLERATED_PLUGIN_DEPENDENCIES 
+  LanguageRuntime 
+  TypeSystem
+)
+
 add_lldb_library(lldbPluginExpressionParserSwift PLUGIN
   SwiftASTManipulator.cpp
   SwiftExpressionParser.cpp
diff --git a/lldb/source/Plugins/LanguageRuntime/Swift/CMakeLists.txt b/lldb/source/Plugins/LanguageRuntime/Swift/CMakeLists.txt
@@ -1,3 +1,5 @@
+set_property(DIRECTORY PROPERTY LLDB_TOLERATED_PLUGIN_DEPENDENCIES Language)
+
 add_lldb_library(lldbPluginSwiftLanguageRuntime PLUGIN
   LLDBMemoryReader.cpp
   ReflectionContext.cpp
diff --git a/lldb/source/Plugins/OperatingSystem/SwiftTasks/CMakeLists.txt b/lldb/source/Plugins/OperatingSystem/SwiftTasks/CMakeLists.txt
@@ -1,3 +1,5 @@
+set_property(DIRECTORY PROPERTY LLDB_TOLERATED_PLUGIN_DEPENDENCIES LanguageRuntime)
+
 add_lldb_library(lldbPluginOperatingSystemSwiftTasks PLUGIN
   OperatingSystemSwiftTasks.cpp
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+set_property(DIRECTORY PROPERTY LLDB_TOLERATED_PLUGIN_DEPENDENCIES Language)`
	`2`	`+`
`1`	`3`	`add_lldb_library(lldbPluginSwiftLanguageRuntime PLUGIN`
`2`	`4`	`LLDBMemoryReader.cpp`
`3`	`5`	`ReflectionContext.cpp`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+set_property(DIRECTORY PROPERTY LLDB_TOLERATED_PLUGIN_DEPENDENCIES LanguageRuntime)`
	`2`	`+`
`1`	`3`	`add_lldb_library(lldbPluginOperatingSystemSwiftTasks PLUGIN`
`2`	`4`	`OperatingSystemSwiftTasks.cpp`
`3`	`5`