Skip to content

[sil] Make ValueOwnershipKind(unsigned) explicit to prevent implicit … #19454

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
Sep 21, 2018
Merged

[sil] Make ValueOwnershipKind(unsigned) explicit to prevent implicit … #19454

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion include/swift/SIL/SILInstruction.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6094,7 +6094,8 @@ class UncheckedOwnershipConversionInst

public:
ValueOwnershipKind getConversionOwnershipKind() const {
return SILInstruction::Bits.UncheckedOwnershipConversionInst.Kind;
unsigned kind = SILInstruction::Bits.UncheckedOwnershipConversionInst.Kind;
return ValueOwnershipKind(kind);
}
};

Expand Down
2 changes: 1 addition & 1 deletion include/swift/SIL/SILValue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ struct ValueOwnershipKind {
"ownership value?!");

ValueOwnershipKind(innerty NewValue) : Value(NewValue) {}
ValueOwnershipKind(unsigned NewValue) : Value(innerty(NewValue)) {}
explicit ValueOwnershipKind(unsigned NewValue) : Value(innerty(NewValue)) {}
ValueOwnershipKind(SILModule &M, SILType Type,
SILArgumentConvention Convention);

Expand Down