Skip to content

[llvm][MetadataLoader] Make sure we correctly load DW_APPLE_ENUM_KIND from bitcode #132374

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 5 commits into from
Mar 22, 2025
Merged

[llvm][MetadataLoader] Make sure we correctly load DW_APPLE_ENUM_KIND from bitcode #132374

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bf49ba3
[llvm][MetadataLoader] Make sure we correctly load DW_APPLE_ENUM_KIND…
Michael137 Mar 21, 2025
228d30a
fixup! remove clang dependency; roundtrip through llvm-dis/llvm-as in…
Michael137 Mar 21, 2025
404f3db
Merge branch 'main' into llvm/enum-kind-bitcode
Michael137 Mar 21, 2025
c8d308b
fixup! move rountrip test to Bitcode directory
Michael137 Mar 21, 2025
766a8a9
fixup! remove redundant whitespace
Michael137 Mar 21, 2025
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
4 changes: 2 additions & 2 deletions llvm/lib/Bitcode/Reader/MetadataLoader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1704,8 +1704,8 @@ Error MetadataLoader::MetadataLoaderImpl::parseOneMetadata(
}
}

if (Record.size() > 25 && Record[25] != dwarf::DW_APPLE_ENUM_KIND_invalid)
EnumKind = Record[25];
if (Record.size() > 24 && Record[24] != dwarf::DW_APPLE_ENUM_KIND_invalid)
EnumKind = Record[24];

DICompositeType *CT = nullptr;
if (Identifier)
Expand Down
4 changes: 4 additions & 0 deletions llvm/test/DebugInfo/AArch64/DW_AT_APPLE_enum_kind.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
; RUN: llc < %s -filetype=obj -o %t
; RUN: llvm-dwarfdump -v %t | FileCheck %s
;
; RUN: llvm-as < %s | llvm-dis | llvm-as | llvm-dis | FileCheck %s --check-prefix=CHECK-METADATA
Copy link
Collaborator

@adrian-prantl adrian-prantl Mar 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you hoist the round-trip part into tests/IR or BitCode?


; C++ source to regenerate:
; enum __attribute__((enum_extensibility(open))) OpenEnum {
Expand All @@ -12,6 +14,8 @@
;
; $ clang++ -O0 -g debug-info-enum-kind.cpp -c

; CHECK-METADATA: enumKind: DW_APPLE_ENUM_KIND_Open
; CHECK-METADATA: enumKind: DW_APPLE_ENUM_KIND_Closed

; CHECK: .debug_abbrev contents:

Expand Down