@@ -169,7 +169,7 @@ namespace Intrinsic {
169169 AArch64Svcount,
170170 } Kind;
171171
172- // These three have to be contiguous.
172+ // These six have to be contiguous.
173173 static_assert (OneFourthVecArgument == OneThirdVecArgument + 1 &&
174174 OneFifthVecArgument == OneFourthVecArgument + 1 &&
175175 OneSixthVecArgument == OneFifthVecArgument + 1 &&
@@ -194,9 +194,7 @@ namespace Intrinsic {
194194 unsigned getArgumentNumber () const {
195195 assert (Kind == Argument || Kind == ExtendArgument ||
196196 Kind == TruncArgument || Kind == HalfVecArgument ||
197- Kind == OneThirdVecArgument || Kind == OneFourthVecArgument ||
198- Kind == OneFifthVecArgument || Kind == OneSixthVecArgument ||
199- Kind == OneSeventhVecArgument || Kind == OneEighthVecArgument ||
197+ (Kind >= OneThirdVecArgument && Kind <= OneEighthVecArgument) ||
200198 Kind == SameVecWidthArgument || Kind == VecElementArgument ||
201199 Kind == Subdivide2Argument || Kind == Subdivide4Argument ||
202200 Kind == VecOfBitcastsToInt);
@@ -205,9 +203,7 @@ namespace Intrinsic {
205203 ArgKind getArgumentKind () const {
206204 assert (Kind == Argument || Kind == ExtendArgument ||
207205 Kind == TruncArgument || Kind == HalfVecArgument ||
208- Kind == OneThirdVecArgument || Kind == OneFourthVecArgument ||
209- Kind == OneFifthVecArgument || Kind == OneSixthVecArgument ||
210- Kind == OneSeventhVecArgument || Kind == OneEighthVecArgument ||
206+ (Kind >= OneThirdVecArgument && Kind <= OneEighthVecArgument) ||
211207 Kind == SameVecWidthArgument || Kind == VecElementArgument ||
212208 Kind == Subdivide2Argument || Kind == Subdivide4Argument ||
213209 Kind == VecOfBitcastsToInt);
0 commit comments