Skip to content

Commit d160782

Browse files
committed
remove use of constexpr and replace with const inline
1 parent 74f0925 commit d160782

File tree

1 file changed

+38
-24
lines changed

1 file changed

+38
-24
lines changed

clang/lib/Headers/hlsl/hlsl_intrinsics.h

Lines changed: 38 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -723,72 +723,86 @@ float4 cosh(float4);
723723

724724
#ifdef __HLSL_ENABLE_16_BIT
725725
_HLSL_AVAILABILITY(shadermodel, 6.2)
726-
constexpr uint countbits(int16_t x) {
726+
const inline uint countbits(int16_t x) {
727727
return __builtin_elementwise_popcount(x);
728728
}
729729
_HLSL_AVAILABILITY(shadermodel, 6.2)
730-
constexpr uint2 countbits(int16_t2 x) {
730+
const inline uint2 countbits(int16_t2 x) {
731731
return __builtin_elementwise_popcount(x);
732732
}
733733
_HLSL_AVAILABILITY(shadermodel, 6.2)
734-
constexpr uint3 countbits(int16_t3 x) {
734+
const inline uint3 countbits(int16_t3 x) {
735735
return __builtin_elementwise_popcount(x);
736736
}
737737
_HLSL_AVAILABILITY(shadermodel, 6.2)
738-
constexpr uint4 countbits(int16_t4 x) {
738+
const inline uint4 countbits(int16_t4 x) {
739739
return __builtin_elementwise_popcount(x);
740740
}
741741
_HLSL_AVAILABILITY(shadermodel, 6.2)
742-
constexpr uint countbits(uint16_t x) {
742+
const inline uint countbits(uint16_t x) {
743743
return __builtin_elementwise_popcount(x);
744744
}
745745
_HLSL_AVAILABILITY(shadermodel, 6.2)
746-
constexpr uint2 countbits(uint16_t2 x) {
746+
const inline uint2 countbits(uint16_t2 x) {
747747
return __builtin_elementwise_popcount(x);
748748
}
749749
_HLSL_AVAILABILITY(shadermodel, 6.2)
750-
constexpr uint3 countbits(uint16_t3 x) {
750+
const inline uint3 countbits(uint16_t3 x) {
751751
return __builtin_elementwise_popcount(x);
752752
}
753753
_HLSL_AVAILABILITY(shadermodel, 6.2)
754-
constexpr uint4 countbits(uint16_t4 x) {
754+
const inline uint4 countbits(uint16_t4 x) {
755755
return __builtin_elementwise_popcount(x);
756756
}
757757
#endif
758758

759-
constexpr uint countbits(int x) { return __builtin_elementwise_popcount(x); }
760-
constexpr uint2 countbits(int2 x) { return __builtin_elementwise_popcount(x); }
761-
constexpr uint3 countbits(int3 x) { return __builtin_elementwise_popcount(x); }
762-
constexpr uint4 countbits(int4 x) { return __builtin_elementwise_popcount(x); }
759+
const inline uint countbits(int x) { return __builtin_elementwise_popcount(x); }
760+
const inline uint2 countbits(int2 x) {
761+
return __builtin_elementwise_popcount(x);
762+
}
763+
const inline uint3 countbits(int3 x) {
764+
return __builtin_elementwise_popcount(x);
765+
}
766+
const inline uint4 countbits(int4 x) {
767+
return __builtin_elementwise_popcount(x);
768+
}
763769

764-
constexpr uint countbits(uint x) { return __builtin_elementwise_popcount(x); }
765-
constexpr uint2 countbits(uint2 x) { return __builtin_elementwise_popcount(x); }
766-
constexpr uint3 countbits(uint3 x) { return __builtin_elementwise_popcount(x); }
767-
constexpr uint4 countbits(uint4 x) { return __builtin_elementwise_popcount(x); }
770+
const inline uint countbits(uint x) {
771+
return __builtin_elementwise_popcount(x);
772+
}
773+
const inline uint2 countbits(uint2 x) {
774+
return __builtin_elementwise_popcount(x);
775+
}
776+
const inline uint3 countbits(uint3 x) {
777+
return __builtin_elementwise_popcount(x);
778+
}
779+
const inline uint4 countbits(uint4 x) {
780+
return __builtin_elementwise_popcount(x);
781+
}
768782

769-
constexpr uint countbits(int64_t x) {
783+
const inline uint countbits(int64_t x) {
770784
return __builtin_elementwise_popcount(x);
771785
}
772-
constexpr uint2 countbits(int64_t2 x) {
786+
const inline uint2 countbits(int64_t2 x) {
773787
return __builtin_elementwise_popcount(x);
774788
}
775-
constexpr uint3 countbits(int64_t3 x) {
789+
const inline uint3 countbits(int64_t3 x) {
776790
return __builtin_elementwise_popcount(x);
777791
}
778-
constexpr uint4 countbits(int64_t4 x) {
792+
const inline uint4 countbits(int64_t4 x) {
779793
return __builtin_elementwise_popcount(x);
780794
}
781795

782-
constexpr uint countbits(uint64_t x) {
796+
const inline uint countbits(uint64_t x) {
783797
return __builtin_elementwise_popcount(x);
784798
}
785-
constexpr uint2 countbits(uint64_t2 x) {
799+
const inline uint2 countbits(uint64_t2 x) {
786800
return __builtin_elementwise_popcount(x);
787801
}
788-
constexpr uint3 countbits(uint64_t3 x) {
802+
const inline uint3 countbits(uint64_t3 x) {
789803
return __builtin_elementwise_popcount(x);
790804
}
791-
constexpr uint4 countbits(uint64_t4 x) {
805+
const inline uint4 countbits(uint64_t4 x) {
792806
return __builtin_elementwise_popcount(x);
793807
}
794808

0 commit comments

Comments
 (0)