diff options
| author | Carol Eidt <carol.eidt@microsoft.com> | 2018-03-29 14:57:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-29 14:57:03 -0700 |
| commit | 9b3d9ddabe7ce6a1994cd4c9ae60ba7dcf0cbcdc (patch) | |
| tree | 30f074958239a4d6acb7a3879d1bca390e527086 /src/jit | |
| parent | 1b0e8e3f76530efb68e40c0c47d1c568b4029f65 (diff) | |
| parent | ec608a04e8e3362ef5db363ef4d90156aea690be (diff) | |
| download | coreclr-9b3d9ddabe7ce6a1994cd4c9ae60ba7dcf0cbcdc.tar.gz coreclr-9b3d9ddabe7ce6a1994cd4c9ae60ba7dcf0cbcdc.tar.bz2 coreclr-9b3d9ddabe7ce6a1994cd4c9ae60ba7dcf0cbcdc.zip | |
Merge pull request #17211 from mikedn/dyn-hwinfo
Remove HWIntrinsicFlag bitwise OR operator
Diffstat (limited to 'src/jit')
| -rw-r--r-- | src/jit/hwintrinsicxarch.cpp | 4 | ||||
| -rw-r--r-- | src/jit/namedintrinsiclist.h | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/jit/hwintrinsicxarch.cpp b/src/jit/hwintrinsicxarch.cpp index 9da218fc48..df39c29ea6 100644 --- a/src/jit/hwintrinsicxarch.cpp +++ b/src/jit/hwintrinsicxarch.cpp @@ -20,8 +20,10 @@ struct HWIntrinsicInfo }; static const HWIntrinsicInfo hwIntrinsicInfoArray[] = { +// clang-format off #define HARDWARE_INTRINSIC(id, name, isa, ival, size, numarg, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, category, flag) \ - {NI_##id, name, InstructionSet_##isa, ival, size, numarg, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, category, flag}, + {NI_##id, name, InstructionSet_##isa, ival, size, numarg, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, category, static_cast<HWIntrinsicFlag>(flag)}, +// clang-format on #include "hwintrinsiclistxarch.h" }; diff --git a/src/jit/namedintrinsiclist.h b/src/jit/namedintrinsiclist.h index dd98821c66..d8dfabdb96 100644 --- a/src/jit/namedintrinsiclist.h +++ b/src/jit/namedintrinsiclist.h @@ -112,11 +112,6 @@ enum HWIntrinsicFlag : unsigned int HW_Flag_SpecialImport = 0x80000, }; -inline HWIntrinsicFlag operator|(HWIntrinsicFlag c1, HWIntrinsicFlag c2) -{ - return static_cast<HWIntrinsicFlag>(static_cast<unsigned>(c1) | static_cast<unsigned>(c2)); -} - enum HWIntrinsicCategory : unsigned int { // Simple SIMD intrinsics |