Skip to content

Commit 3b7f7b4

Browse files
committed
try
1 parent b08f83c commit 3b7f7b4

File tree

3 files changed

+4
-35
lines changed

3 files changed

+4
-35
lines changed

.github/actions/configure-macos/action.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ runs:
1818
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/libxslt/lib/pkgconfig"
1919
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/zlib/lib/pkgconfig"
2020
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/icu4c/lib/pkgconfig"
21+
export CFLAGS="-fno-omit-frame-pointer"
2122
./buildconf --force
2223
./configure \
2324
--enable-option-checking=fatal \
@@ -28,7 +29,7 @@ runs:
2829
--enable-opcache \
2930
--enable-phar \
3031
--enable-exif \
31-
--enable-undefined-sanitizer \
32+
--enable-address-sanitizer \
3233
--enable-sysvsem \
3334
--enable-sysvshm \
3435
--enable-shmop \

Zend/zend_string.c

+1-33
Original file line numberDiff line numberDiff line change
@@ -439,39 +439,7 @@ ZEND_API zend_never_inline NOIPA bool ZEND_FASTCALL zend_string_equal_val(const
439439
#elif defined(__GNUC__) && defined(__x86_64__) && !defined(__ILP32__)
440440
ZEND_API zend_never_inline NOIPA bool ZEND_FASTCALL zend_string_equal_val(const zend_string *s1, const zend_string *s2)
441441
{
442-
const char *ptr = ZSTR_VAL(s1);
443-
size_t delta = (const char*)s2 - (const char*)s1;
444-
size_t len = ZSTR_LEN(s1);
445-
zend_ulong ret;
446-
447-
__asm__ (
448-
".LL0%=:\n\t"
449-
"movq (%2,%3), %0\n\t"
450-
"xorq (%2), %0\n\t"
451-
"jne .LL1%=\n\t"
452-
"addq $0x8, %2\n\t"
453-
"subq $0x8, %1\n\t"
454-
"ja .LL0%=\n\t"
455-
"movq $0x1, %0\n\t"
456-
"jmp .LL3%=\n\t"
457-
".LL1%=:\n\t"
458-
"cmpq $0x8,%1\n\t"
459-
"jb .LL2%=\n\t"
460-
"xorq %0, %0\n\t"
461-
"jmp .LL3%=\n\t"
462-
".LL2%=:\n\t"
463-
"negq %1\n\t"
464-
"lea 0x40(,%1,8), %1\n\t"
465-
"shlq %b1, %0\n\t"
466-
"sete %b0\n\t"
467-
"movzbq %b0, %0\n\t"
468-
".LL3%=:\n"
469-
: "=&a"(ret),
470-
"+c"(len),
471-
"+r"(ptr)
472-
: "r"(delta)
473-
: "cc");
474-
return ret;
442+
return !memcmp(ZSTR_VAL(s1), ZSTR_VAL(s2), ZSTR_LEN(s1));
475443
}
476444
#endif
477445

run-tests.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3663,7 +3663,7 @@ public function __construct(array $environment, string $tool = 'memcheck')
36633663

36643664
public function wrapCommand(string $cmd, string $memcheck_filename, bool $check_all): string
36653665
{
3666-
$vcmd = "valgrind -q --tool={$this->tool} --trace-children=yes";
3666+
$vcmd = "valgrind --track-origins=yes -q --tool={$this->tool} --trace-children=yes";
36673667
if ($check_all) {
36683668
$vcmd .= ' --smc-check=all';
36693669
}

0 commit comments

Comments
 (0)