1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

zlib: disable CRC32 SIMD optimization

Browse Source 
It seems that the optimization causes memory corruption. Disable it
until the issue is fixed upstream.

Fixes: https://github.com/nodejs/node/issues/45268
PR-URL: https://github.com/nodejs/node/pull/49511
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
This commit is contained in:
Luigi Pinca 2023-09-10 07:44:49 +02:00 committed by GitHub
parent 705e623ac4
commit ae115d68e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
deps/zlib/zlib.gyp vendored
View File

@ -107,33 +107,33 @@
}], }],
], ],
}, # zlib_arm_crc32 }, # zlib_arm_crc32
{ # {
'target_name': 'zlib_crc32_simd', # 'target_name': 'zlib_crc32_simd',
'type': 'static_library', # 'type': 'static_library',
'conditions': [ # 'conditions': [
['OS!="win" or llvm_version!="0.0"', { # ['OS!="win" or llvm_version!="0.0"', {
'cflags': [ # 'cflags': [
'-msse4.2', # '-msse4.2',
'-mpclmul', # '-mpclmul',
], # ],
'xcode_settings': { # 'xcode_settings': {
'OTHER_CFLAGS': [ # 'OTHER_CFLAGS': [
'-msse4.2', # '-msse4.2',
'-mpclmul', # '-mpclmul',
], # ],
}, # },
}] # }]
], # ],
'defines': [ 'CRC32_SIMD_SSE42_PCLMUL' ], # 'defines': [ 'CRC32_SIMD_SSE42_PCLMUL' ],
'include_dirs': [ '<(ZLIB_ROOT)' ], # 'include_dirs': [ '<(ZLIB_ROOT)' ],
'direct_dependent_settings': { # 'direct_dependent_settings': {
'defines': [ 'CRC32_SIMD_SSE42_PCLMUL' ], # 'defines': [ 'CRC32_SIMD_SSE42_PCLMUL' ],
'include_dirs': [ '<(ZLIB_ROOT)' ], # 'include_dirs': [ '<(ZLIB_ROOT)' ],
}, # },
'sources': [ # 'sources': [
'<!@pymod_do_main(GN-scraper "<(ZLIB_ROOT)/BUILD.gn" "\\"zlib_crc32_simd\\".*?sources = ")', # '<!@pymod_do_main(GN-scraper "<(ZLIB_ROOT)/BUILD.gn" "\\"zlib_crc32_simd\\".*?sources = ")',
], # ],
}, # zlib_crc32_simd # }, # zlib_crc32_simd
{ {
'target_name': 'zlib_inflate_chunk_simd', 'target_name': 'zlib_inflate_chunk_simd',
'type': 'static_library', 'type': 'static_library',
@ -208,7 +208,9 @@
['target_arch in "ia32 x64" and OS!="ios"', { ['target_arch in "ia32 x64" and OS!="ios"', {
'dependencies': [ 'dependencies': [
'zlib_adler32_simd', 'zlib_adler32_simd',
'zlib_crc32_simd', # Disabled due to memory corruption.
# See https://github.com/nodejs/node/issues/45268.
# 'zlib_crc32_simd',
], ],
'defines': [ 'DEFLATE_SLIDE_HASH_SSE2' ], 'defines': [ 'DEFLATE_SLIDE_HASH_SSE2' ],
'conditions': [ 'conditions': [