Merge pull request #7659 from augusto2112/add-sym-static-lib

augusto2112 · web-flow · commit 4e80af9f3444 · 2023-10-26T13:46:51.000-07:00
[lldb] Check for 2nd symbol in IsStaticSwiftRuntime
diff --git a/lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.cpp b/lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.cpp
@@ -120,8 +120,8 @@ enum class RuntimeKind { Swift, ObjC };
 
 /// Detect a statically linked Swift runtime by looking for a well-known symbol.
 static bool IsStaticSwiftRuntime(Module &image) {
-  static ConstString swift_release_dealloc_sym("_swift_release_dealloc");
-  return image.FindFirstSymbolWithNameAndType(swift_release_dealloc_sym);
+  static ConstString swift_reflection_version_sym("swift_release");
+  return image.FindFirstSymbolWithNameAndType(swift_reflection_version_sym);
 }
 
 /// \return the Swift or Objective-C runtime found in the loaded images.

Original file line number	Diff line number	Diff line change
`@@ -120,8 +120,8 @@ enum class RuntimeKind { Swift, ObjC };`
`120`	`120`
`121`	`121`	`/// Detect a statically linked Swift runtime by looking for a well-known symbol.`
`122`	`122`	`static bool IsStaticSwiftRuntime(Module &image) {`
`123`		`- static ConstString swift_release_dealloc_sym("_swift_release_dealloc");`
`124`		`- return image.FindFirstSymbolWithNameAndType(swift_release_dealloc_sym);`
	`123`	`+ static ConstString swift_reflection_version_sym("swift_release");`
	`124`	`+ return image.FindFirstSymbolWithNameAndType(swift_reflection_version_sym);`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`/// \return the Swift or Objective-C runtime found in the loaded images.`