Skip to content

Commit 59d88f0

Browse files
committed
make CanContainSwiftReflectionData conditional on LLDB_ENABLE_SWIFT
1 parent 3a4e37a commit 59d88f0

File tree

9 files changed

+21
-19
lines changed

9 files changed

+21
-19
lines changed

lldb/include/lldb/Symbol/ObjectFile.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,11 @@ class ObjectFile : public std::enable_shared_from_this<ObjectFile>,
690690
virtual llvm::StringRef
691691
GetReflectionSectionIdentifier(swift::ReflectionSectionKind section);
692692

693-
virtual bool CanContainSwiftReflectionData(const Section &section);
693+
#ifdef LLDB_ENABLE_SWIFT
694+
virtual bool CanContainSwiftReflectionData(const Section &section) {
695+
return false;
696+
}
697+
#endif // LLDB_ENABLE_SWIFT
694698

695699
/// Load binaries listed in a corefile
696700
///

lldb/source/Core/Section.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,11 @@ void Section::SetPermissions(uint32_t permissions) {
391391
}
392392

393393
bool Section::CanContainSwiftReflectionData() const {
394+
#ifdef LLDB_ENABLE_SWIFT
394395
return m_obj_file->CanContainSwiftReflectionData(*this);
396+
#else
397+
return false;
398+
#endif // LLDB_ENABLE_SWIFT
395399
}
396400

397401
lldb::offset_t Section::GetSectionData(void *dst, lldb::offset_t dst_len,

lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3430,12 +3430,10 @@ llvm::StringRef ObjectFileELF::GetReflectionSectionIdentifier(
34303430
#endif //LLDB_ENABLE_SWIFT
34313431
}
34323432

3433-
bool ObjectFileELF::CanContainSwiftReflectionData(const Section &section) {
34343433
#ifdef LLDB_ENABLE_SWIFT
3434+
bool ObjectFileELF::CanContainSwiftReflectionData(const Section &section) {
34353435
swift::SwiftObjectFileFormatELF file_format;
34363436
return file_format.sectionContainsReflectionData(
34373437
section.GetName().GetStringRef());
3438-
#else
3439-
llvm_unreachable("Swift support disabled");
3440-
#endif // LLDB_ENABLE_SWIFT
34413438
}
3439+
#endif // LLDB_ENABLE_SWIFT

lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -396,8 +396,10 @@ class ObjectFileELF : public lldb_private::ObjectFile {
396396
llvm::StringRef
397397
GetReflectionSectionIdentifier(swift::ReflectionSectionKind section) override;
398398

399+
#ifdef LLDB_ENABLE_SWIFT
399400
bool
400401
CanContainSwiftReflectionData(const lldb_private::Section &section) override;
402+
#endif // LLDB_ENABLE_SWIFT
401403
};
402404

403405
#endif // LLDB_SOURCE_PLUGINS_OBJECTFILE_ELF_OBJECTFILEELF_H

lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7019,8 +7019,8 @@ llvm::StringRef ObjectFileMachO::GetReflectionSectionIdentifier(
70197019
#endif //LLDB_ENABLE_SWIFT
70207020
}
70217021

7022-
bool ObjectFileMachO::CanContainSwiftReflectionData(const Section &section) {
70237022
#ifdef LLDB_ENABLE_SWIFT
7023+
bool ObjectFileMachO::CanContainSwiftReflectionData(const Section &section) {
70247024
swift::SwiftObjectFileFormatMachO file_format;
70257025
if (file_format.sectionContainsReflectionData(
70267026
section.GetName().GetStringRef()))
@@ -7033,10 +7033,8 @@ bool ObjectFileMachO::CanContainSwiftReflectionData(const Section &section) {
70337033
return file_format.sectionContainsReflectionData(segmentSectionName);
70347034
}
70357035
return false;
7036-
#else
7037-
llvm_unreachable("Swift support disabled");
7038-
#endif // LLDB_ENABLE_SWIFT
70397036
}
7037+
#endif // LLDB_ENABLE_SWIFT
70407038

70417039
ObjectFileMachO::MachOCorefileAllImageInfos
70427040
ObjectFileMachO::GetCorefileAllImageInfos() {

lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,10 @@ class ObjectFileMachO : public lldb_private::ObjectFile {
220220
llvm::StringRef
221221
GetReflectionSectionIdentifier(swift::ReflectionSectionKind section) override;
222222

223+
#ifdef LLDB_ENABLE_SWIFT
223224
bool
224225
CanContainSwiftReflectionData(const lldb_private::Section &section) override;
226+
#endif // LLDB_ENABLE_SWIFT
225227

226228
/// A corefile may include metadata about all of the binaries that were
227229
/// present in the process when the corefile was taken. This is only

lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1217,12 +1217,10 @@ llvm::StringRef ObjectFilePECOFF::GetReflectionSectionIdentifier(
12171217
#endif //LLDB_ENABLE_SWIFT
12181218
}
12191219

1220-
bool ObjectFilePECOFF::CanContainSwiftReflectionData(const Section &section) {
12211220
#ifdef LLDB_ENABLE_SWIFT
1221+
bool ObjectFilePECOFF::CanContainSwiftReflectionData(const Section &section) {
12221222
swift::SwiftObjectFileFormatCOFF file_format;
12231223
return file_format.sectionContainsReflectionData(
12241224
section.GetName().GetStringRef());
1225-
#else
1226-
llvm_unreachable("Swift support disabled");
1227-
#endif // LLDB_ENABLE_SWIFT
12281225
}
1226+
#endif // LLDB_ENABLE_SWIFT

lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,8 +288,10 @@ class ObjectFilePECOFF : public lldb_private::ObjectFile {
288288
llvm::StringRef
289289
GetReflectionSectionIdentifier(swift::ReflectionSectionKind section) override;
290290

291+
#ifdef LLDB_ENABLE_SWIFT
291292
bool
292293
CanContainSwiftReflectionData(const lldb_private::Section &section) override;
294+
#endif // LLDB_ENABLE_SWIFT
293295

294296
typedef std::vector<section_header_t> SectionHeaderColl;
295297
typedef SectionHeaderColl::iterator SectionHeaderCollIter;

lldb/source/Symbol/ObjectFile.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -725,9 +725,3 @@ llvm::StringRef ObjectFile::GetReflectionSectionIdentifier(
725725
"Base class's GetReflectionSectionIdentifier should not be called");
726726
return "";
727727
}
728-
729-
bool ObjectFile::CanContainSwiftReflectionData(const Section &section) {
730-
assert(false &&
731-
"Base class's CanContainSwiftReflectionData should not be called");
732-
return false;
733-
}

0 commit comments

Comments
 (0)