Skip to content

[KeyInstr] Fix DILocation AtomGroup/Rank bitfield packing for MSVC #138292

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.

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
May 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion llvm/include/llvm/IR/DebugInfoMetadata.h
Original file line number Diff line number Diff line change
Expand Up @@ -2237,7 +2237,7 @@ class DILocation : public MDNode {
friend class MDNode;
#ifdef EXPERIMENTAL_KEY_INSTRUCTIONS
uint64_t AtomGroup : 61;
uint8_t AtomRank : 3;
uint64_t AtomRank : 3;
#endif

DILocation(LLVMContext &C, StorageType Storage, unsigned Line,
Expand Down
4 changes: 2 additions & 2 deletions llvm/lib/IR/LLVMContextImpl.h
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ template <> struct MDNodeKeyImpl<DILocation> {
Metadata *InlinedAt;
bool ImplicitCode;
uint64_t AtomGroup : 61;
uint8_t AtomRank : 3;
uint64_t AtomRank : 3;

MDNodeKeyImpl(unsigned Line, unsigned Column, Metadata *Scope,
Metadata *InlinedAt, bool ImplicitCode, uint64_t AtomGroup,
Expand All @@ -338,7 +338,7 @@ template <> struct MDNodeKeyImpl<DILocation> {

unsigned getHashValue() const {
return hash_combine(Line, Column, Scope, InlinedAt, ImplicitCode, AtomGroup,
AtomRank);
(uint8_t)AtomRank);
}
};

Expand Down