Skip to content

Commit e60ff30

Browse files
committed
Testing without no-builtin
1 parent 256c9e9 commit e60ff30

File tree

2 files changed

+0
-14
lines changed

2 files changed

+0
-14
lines changed

.github/workflows/push.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,6 @@ jobs:
226226
set -x
227227
./buildconf --force
228228
./configure \
229-
CFLAGS="-fno-builtin-memcpy -fno-builtin-memmove -fno-builtin-memset -fno-builtin-memcmp" \
230229
--disable-debug \
231230
--enable-mbstring \
232231
--enable-opcache \

Zend/zend_alloc.c

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,6 @@
8080
#include <fcntl.h>
8181
#include <errno.h>
8282

83-
#ifdef HAVE_VALGRIND
84-
# include "valgrind/callgrind.h"
85-
#endif
86-
8783
#ifndef _WIN32
8884
# include <sys/mman.h>
8985
# ifndef MAP_ANON
@@ -3186,18 +3182,15 @@ size_t zend_mm_globals_size(void)
31863182

31873183
void *memcpy(void *restrict dest, const void *restrict src, size_t n)
31883184
{
3189-
CALLGRIND_TOGGLE_COLLECT;
31903185
const char *csrc = src;
31913186
char *cdest = dest;
31923187
for (int i = 0; i < n; i++) {
31933188
cdest[i] = csrc[i];
31943189
}
3195-
CALLGRIND_TOGGLE_COLLECT;
31963190
return dest;
31973191
}
31983192
void *memmove(void *dest, const void *src, size_t n)
31993193
{
3200-
CALLGRIND_TOGGLE_COLLECT;
32013194
char *csrc = (char *)src;
32023195
char *cdest = (char *)dest;
32033196

@@ -3210,18 +3203,15 @@ void *memmove(void *dest, const void *src, size_t n)
32103203
cdest[n] = csrc[n];
32113204
}
32123205
}
3213-
CALLGRIND_TOGGLE_COLLECT;
32143206
return dest;
32153207
}
32163208
void *memset(void *s, int c, size_t n)
32173209
{
3218-
CALLGRIND_TOGGLE_COLLECT;
32193210
unsigned char *cs = (unsigned char *)s;
32203211

32213212
for (int i = 0; i < n; i++) {
32223213
cs[i] = (unsigned char)c;
32233214
}
3224-
CALLGRIND_TOGGLE_COLLECT;
32253215
return s;
32263216
}
32273217
int memcmp(const void *s1, const void *s2, size_t n)
@@ -3230,18 +3220,15 @@ int memcmp(const void *s1, const void *s2, size_t n)
32303220
return 0;
32313221
}
32323222

3233-
CALLGRIND_TOGGLE_COLLECT;
32343223
unsigned char *p = (unsigned char *)s1;
32353224
unsigned char *q = (unsigned char *)s2;
32363225
while (n-- != 0) {
32373226
if (*p != *q) {
3238-
CALLGRIND_TOGGLE_COLLECT;
32393227
return (*p > *q) ? 1 : -1;
32403228
}
32413229
p++;
32423230
q++;
32433231
}
3244-
CALLGRIND_TOGGLE_COLLECT;
32453232
return 0;
32463233
}
32473234
# if defined(__GNUC__) && !defined(__clang__)

0 commit comments

Comments
 (0)