Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 9b3d9dd

Browse files
authored
Merge pull request #17211 from mikedn/dyn-hwinfo
Remove HWIntrinsicFlag bitwise OR operator
2 parents 1b0e8e3 + ec608a0 commit 9b3d9dd

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

src/jit/hwintrinsicxarch.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@ struct HWIntrinsicInfo
2020
};
2121

2222
static const HWIntrinsicInfo hwIntrinsicInfoArray[] = {
23+
// clang-format off
2324
#define HARDWARE_INTRINSIC(id, name, isa, ival, size, numarg, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, category, flag) \
24-
{NI_##id, name, InstructionSet_##isa, ival, size, numarg, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, category, flag},
25+
{NI_##id, name, InstructionSet_##isa, ival, size, numarg, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, category, static_cast<HWIntrinsicFlag>(flag)},
26+
// clang-format on
2527
#include "hwintrinsiclistxarch.h"
2628
};
2729

src/jit/namedintrinsiclist.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,6 @@ enum HWIntrinsicFlag : unsigned int
112112
HW_Flag_SpecialImport = 0x80000,
113113
};
114114

115-
inline HWIntrinsicFlag operator|(HWIntrinsicFlag c1, HWIntrinsicFlag c2)
116-
{
117-
return static_cast<HWIntrinsicFlag>(static_cast<unsigned>(c1) | static_cast<unsigned>(c2));
118-
}
119-
120115
enum HWIntrinsicCategory : unsigned int
121116
{
122117
// Simple SIMD intrinsics

0 commit comments

Comments
 (0)