Skip to content

Fix a static_assert, add a new one, and improve one other. #2679

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
May 25, 2016
Merged

Fix a static_assert, add a new one, and improve one other. #2679

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
5 changes: 3 additions & 2 deletions include/swift/AST/Expr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ class alignas(8) Expr {
unsigned IsSingleUnicodeScalar : 1;
unsigned IsSingleExtendedGraphemeCluster : 1;
};
enum { NumStringLiteralExprBits = NumLiteralExprBits + 2 };
enum { NumStringLiteralExprBits = NumLiteralExprBits + 4 };
static_assert(NumStringLiteralExprBits <= 32, "fits in an unsigned");

class DeclRefExprBitfields {
Expand Down Expand Up @@ -271,6 +271,7 @@ class alignas(8) Expr {
unsigned IsSourceScalar : 1;
};
enum { NumTupleShuffleExprBits = NumImplicitConversionExprBits + 1 };
static_assert(NumTupleShuffleExprBits <= 32, "fits in an unsigned");

class ApplyExprBitfields {
friend class ApplyExpr;
Expand All @@ -287,7 +288,7 @@ class alignas(8) Expr {
unsigned : NumExprBits;
unsigned CastKind : NumCheckedCastKindBits;
};
enum { NumCheckedCastExprBits = NumExprBits + 4 };
enum { NumCheckedCastExprBits = NumExprBits + NumCheckedCastKindBits };
static_assert(NumCheckedCastExprBits <= 32, "fits in an unsigned");
static_assert(unsigned(CheckedCastKind::Last_CheckedCastKind)
< (1 << NumCheckedCastKindBits),
Expand Down