Skip to content

Commit f168678

Browse files
monojenkinslateralusX
authored andcommitted
Fix Mono Windows x64 crash blocking CI Windows x64 Release job. (mono#20720)
After upgrade to later msvc version on CI boots, see dotnet/runtime#45524 for details, Window x64 Release builds started to crash on libraries tests. After investigation it turns out that new msvc compiler handles an expression different compared to how it was handled in previous version. After upgrade of msvc, the expression: int _amd64_width_temp = ((guint64)(imm) == (guint64)(int)(guint64)(imm)); implemented in amd64_mov_reg_imm and then called from tramp-amd64.c@500 was transformed into an always true expression by compiler: ``` amd64_mov_reg_imm (code, AMD64_R11, (guint8*)mono_get_rethrow_preserve_exception_addr ()); lea rcx,[rethrow_preserve_exception_func (07FFB9E33A590h)] mov word ptr [rbx+0Dh],0BB41h mov byte ptr [rbx+0Fh],cl mov rax,rcx shr eax,8 mov byte ptr [rbx+10h],al mov rax,rcx shr eax,10h shr ecx,18h mov byte ptr [rbx+11h],al lea rax,[rbx+13h] mov byte ptr [rbx+12h],cl ``` as seen above, the condition and handling of a 64-bit imm has been dropped by compiler. This cause issues when the imm is a 64-bit value since it will always gets truncated into 32-bit imm and in this case it was a pointer to a function within coreclr.dll (mono_get_rethrow_preserve_exception_addr) loaded located at higher address (using more than 32-bit). This is most likely a regression issue in compiler for this specific construction. I tried simpler construction (using same type conversion) on both old and new compiler version and then it makes the right optimization. Fix is to switch to a macro already available in amd64-codegen (amd64_is_imm32) detecting if an imm needs a 32-bit or 64-bit sized value. This will be correctly optimized by new msvc compiler and even if this is a work around for a what seems to be a optimization bug in the compiler, it is still cleaner and better describes the intent than current code. Fix also re-enable Windows x64 Release CI test lane. Co-authored-by: lateralusX <[email protected]>
1 parent e4bfd95 commit f168678

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

mono/arch/amd64/amd64-codegen.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -417,9 +417,8 @@ typedef union {
417417

418418
#define amd64_mov_reg_imm(inst,reg,imm) \
419419
do { \
420-
int _amd64_width_temp = ((guint64)(imm) == (guint64)(int)(guint64)(imm)); \
421420
amd64_codegen_pre(inst); \
422-
amd64_mov_reg_imm_size ((inst), (reg), (imm), (_amd64_width_temp ? 4 : 8)); \
421+
amd64_mov_reg_imm_size ((inst), (reg), (imm), (amd64_is_imm32 (((gint64)imm)) ? 4 : 8)); \
423422
amd64_codegen_post(inst); \
424423
} while (0)
425424

0 commit comments

Comments
 (0)