Skip to content

Commit c1afd3e

Browse files
authored
[release/9.0] Avoid C4319 build warnings in libunwind (#122179)
Include libunwind/libunwind#931 in the build of the libunwind dependency. Fixes runtime build errors on `1es-windows-2022-open` that are blocking HTTP & SSL stress runs. ## Customer Impact - [x] Found internally Our internal HTTP and SSL stress tests are failing to build on the 8.0 branch. An update of MSVC in the `1es-windows-2022-open` image brought updated analyzer rules that now fail the build of dotnet/runtime on Windows. ``` mempool.c(96): warning C4319: '~': zero extending 'unsigned long' to 'size_t' of greater size ``` This change adds `(size_t)` casts in the libunwind dependency, which resolves the new errors. ## Regression - [X] Yes Infra update. ## Testing Regular CI is still passing + CI stress runs for HTTP and SSL now build and work again. ## Risk Low. This is a one-line targeted fix that only adds casts.
1 parent e2b3568 commit c1afd3e

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

src/native/external/libunwind-version.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ Apply https://github.com/libunwind/libunwind/pull/714
1010
Revert https://github.com/libunwind/libunwind/commit/ec03043244082b8f552881ba9fb790aa49c85468 and follow up changes in the same file # issue: https://github.com/libunwind/libunwind/issues/715
1111
Apply https://github.com/libunwind/libunwind/pull/734
1212
Apply https://github.com/libunwind/libunwind/pull/758
13+
Apply https://github.com/libunwind/libunwind/pull/931

src/native/external/libunwind/include/libunwind_i.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,6 +437,6 @@ static inline void invalidate_edi (struct elf_dyn_info *edi)
437437
# define DWARF_VAL_LOC(c,v) DWARF_NULL_LOC
438438
#endif
439439

440-
#define UNW_ALIGN(x,a) (((x)+(a)-1UL)&~((a)-1UL))
440+
#define UNW_ALIGN(x,a) (((size_t)(x) + (size_t)(a) - 1) & ~((size_t)(a) - 1))
441441

442442
#endif /* libunwind_i_h */

0 commit comments

Comments
 (0)