Skip to content

Prepare to reapply "[MC] Use a variant to hold MCCFIInstruction state… #747

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

Open
slinder1 wants to merge 1 commit into
base: amd-staging
Choose a base branch
from
Open

Prepare to reapply "[MC] Use a variant to hold MCCFIInstruction state… #747

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
18 changes: 14 additions & 4 deletions llvm/include/llvm/MC/MCDwarf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,10 +538,20 @@ class MCCFIInstruction {

// Held in ExtraFields for most common OpTypes, exceptions follow.
struct CommonFields {
unsigned Register = std::numeric_limits<unsigned>::max();
int64_t Offset = 0;
unsigned Register2 = std::numeric_limits<unsigned>::max();
unsigned AddressSpace = 0;
unsigned Register;
int64_t Offset;
unsigned Register2;
unsigned AddressSpace;
// FIXME: Workaround for GCC7 bug with nested class used as std::variant
// alternative where the compiler really wants a user-defined default
// constructor. Once we no longer support GCC7 these constructors can be
// replaced with default member initializers and aggregate initialization.
CommonFields(unsigned Reg, int64_t Off = 0,
unsigned Reg2 = std::numeric_limits<unsigned>::max(),
unsigned AddrSpace = 0)
: Register(Reg), Offset(Off), Register2(Reg2), AddressSpace(AddrSpace) {
}
CommonFields() : CommonFields(std::numeric_limits<unsigned>::max()) {}
};
// Held in ExtraFields when OpEscape.
struct EscapeFields {
Expand Down
Loading