Skip to content

Commit 648cda6

Browse files
committed
Don't mark cpu_supports functions as always inline
The use of no-sanitize may result in an inlining failure, which will be promoted into a compile error by always-inline. Use a normal inlining hint without enforcing it.
1 parent 4959c60 commit 648cda6

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

Zend/zend_cpuinfo.h

+16-16
Original file line numberDiff line numberDiff line change
@@ -120,102 +120,102 @@ ZEND_API int zend_cpu_supports(zend_cpu_feature feature);
120120
* resolver functions should not depend on any external
121121
* functions */
122122
ZEND_NO_SANITIZE_ADDRESS
123-
static zend_always_inline int zend_cpu_supports_sse2() {
123+
static inline int zend_cpu_supports_sse2() {
124124
#if PHP_HAVE_BUILTIN_CPU_INIT
125125
__builtin_cpu_init();
126126
#endif
127127
return __builtin_cpu_supports("sse2");
128128
}
129129

130130
ZEND_NO_SANITIZE_ADDRESS
131-
static zend_always_inline int zend_cpu_supports_sse3() {
131+
static inline int zend_cpu_supports_sse3() {
132132
#if PHP_HAVE_BUILTIN_CPU_INIT
133133
__builtin_cpu_init();
134134
#endif
135135
return __builtin_cpu_supports("sse3");
136136
}
137137

138138
ZEND_NO_SANITIZE_ADDRESS
139-
static zend_always_inline int zend_cpu_supports_ssse3() {
139+
static inline int zend_cpu_supports_ssse3() {
140140
#if PHP_HAVE_BUILTIN_CPU_INIT
141141
__builtin_cpu_init();
142142
#endif
143143
return __builtin_cpu_supports("ssse3");
144144
}
145145

146146
ZEND_NO_SANITIZE_ADDRESS
147-
static zend_always_inline int zend_cpu_supports_sse41() {
147+
static inline int zend_cpu_supports_sse41() {
148148
#if PHP_HAVE_BUILTIN_CPU_INIT
149149
__builtin_cpu_init();
150150
#endif
151151
return __builtin_cpu_supports("sse4.1");
152152
}
153153

154154
ZEND_NO_SANITIZE_ADDRESS
155-
static zend_always_inline int zend_cpu_supports_sse42() {
155+
static inline int zend_cpu_supports_sse42() {
156156
#if PHP_HAVE_BUILTIN_CPU_INIT
157157
__builtin_cpu_init();
158158
#endif
159159
return __builtin_cpu_supports("sse4.2");
160160
}
161161

162162
ZEND_NO_SANITIZE_ADDRESS
163-
static zend_always_inline int zend_cpu_supports_avx() {
163+
static inline int zend_cpu_supports_avx() {
164164
#if PHP_HAVE_BUILTIN_CPU_INIT
165165
__builtin_cpu_init();
166166
#endif
167167
return __builtin_cpu_supports("avx");
168168
}
169169

170170
ZEND_NO_SANITIZE_ADDRESS
171-
static zend_always_inline int zend_cpu_supports_avx2() {
171+
static inline int zend_cpu_supports_avx2() {
172172
#if PHP_HAVE_BUILTIN_CPU_INIT
173173
__builtin_cpu_init();
174174
#endif
175175
return __builtin_cpu_supports("avx2");
176176
}
177177
#else
178178

179-
static zend_always_inline int zend_cpu_supports_sse2() {
179+
static inline int zend_cpu_supports_sse2() {
180180
return zend_cpu_supports(ZEND_CPU_FEATURE_SSE2);
181181
}
182182

183-
static zend_always_inline int zend_cpu_supports_sse3() {
183+
static inline int zend_cpu_supports_sse3() {
184184
return zend_cpu_supports(ZEND_CPU_FEATURE_SSE3);
185185
}
186186

187-
static zend_always_inline int zend_cpu_supports_ssse3() {
187+
static inline int zend_cpu_supports_ssse3() {
188188
return zend_cpu_supports(ZEND_CPU_FEATURE_SSSE3);
189189
}
190190

191-
static zend_always_inline int zend_cpu_supports_sse41() {
191+
static inline int zend_cpu_supports_sse41() {
192192
return zend_cpu_supports(ZEND_CPU_FEATURE_SSE41);
193193
}
194194

195-
static zend_always_inline int zend_cpu_supports_sse42() {
195+
static inline int zend_cpu_supports_sse42() {
196196
return zend_cpu_supports(ZEND_CPU_FEATURE_SSE42);
197197
}
198198

199-
static zend_always_inline int zend_cpu_supports_avx() {
199+
static inline int zend_cpu_supports_avx() {
200200
return zend_cpu_supports(ZEND_CPU_FEATURE_AVX);
201201
}
202202

203-
static zend_always_inline int zend_cpu_supports_avx2() {
203+
static inline int zend_cpu_supports_avx2() {
204204
return zend_cpu_supports(ZEND_CPU_FEATURE_AVX2);
205205
}
206206
#endif
207207

208208
/* __builtin_cpu_supports has pclmul from gcc9 */
209209
#if PHP_HAVE_BUILTIN_CPU_SUPPORTS && (!defined(__GNUC__) || (ZEND_GCC_VERSION >= 9000))
210210
ZEND_NO_SANITIZE_ADDRESS
211-
static zend_always_inline int zend_cpu_supports_pclmul() {
211+
static inline int zend_cpu_supports_pclmul() {
212212
#if PHP_HAVE_BUILTIN_CPU_INIT
213213
__builtin_cpu_init();
214214
#endif
215215
return __builtin_cpu_supports("pclmul");
216216
}
217217
#else
218-
static zend_always_inline int zend_cpu_supports_pclmul() {
218+
static inline int zend_cpu_supports_pclmul() {
219219
return zend_cpu_supports(ZEND_CPU_FEATURE_PCLMULQDQ);
220220
}
221221
#endif

0 commit comments

Comments
 (0)