Skip to content

[lldb] Remove unconditional include of Swift header on generic code #11561

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 3, 2025
Merged

[lldb] Remove unconditional include of Swift header on generic code #11561

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions lldb/source/Plugins/SymbolFile/DWARF/DWARFDIE.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
#include "DWARFDebugInfoEntry.h"
#include "DWARFDeclContext.h"
#include "DWARFUnit.h"
#ifdef LLDB_ENABLE_SWIFT
#include "Plugins/TypeSystem/Swift/TypeSystemSwiftTypeRef.h"
#endif
#include "lldb/Symbol/Type.h"

#include "llvm/ADT/iterator.h"
Expand Down Expand Up @@ -393,8 +395,7 @@ static void GetDeclContextImpl(DWARFDIE die,

// Add this DIE's contribution at the end of the chain.
auto push_ctx = [&](CompilerContextKind kind, llvm::StringRef name) {
// BEGIN SWIFT
//
#ifdef LLDB_ENABLE_SWIFT
// FIXME: This layering violation works around a limitation in
// LLVM that prevents swiftc from emitting both DW_AT_name and
// DW_AT_linkage_name on forward declarations and typedefs.
Expand All @@ -409,7 +410,7 @@ static void GetDeclContextImpl(DWARFDIE die,
if (!base_name.empty())
name = base_name;
}
// END SWIFT
#endif
context.push_back({kind, ConstString(name)});
};
switch (die.Tag()) {
Expand Down