Skip to content

Preserve throw kind across GetThread #130015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkotas merged 10 commits into from
Jun 30, 2026
+8 −4
Merged

Preserve throw kind across GetThread #130015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f2e4b8c
Preserve throw kind across GetThread
am11 Jun 30, 2026
cfcede8
.
am11 Jun 30, 2026
768fc83
Revert LA64 asm
am11 Jun 30, 2026
3349348
Merge branch 'main' into patch-55
am11 Jun 30, 2026
a4fa0df
Address CR feedback
am11 Jun 30, 2026
4ba6c4b
.
am11 Jun 30, 2026
a69bfb8
.
am11 Jun 30, 2026
ac3e6b5
Merge branch 'main' into patch-55
am11 Jun 30, 2026
3951c91
Apply the same fix to x64
am11 Jun 30, 2026
abf2eb8
Merge branch 'main' into patch-55
am11 Jun 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/coreclr/nativeaot/Runtime/amd64/ExceptionHandling.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ NESTED_ENTRY RhpThrowImpl, _TEXT, NoHandler
END_PROLOGUE

mov rbx, rdi
mov r12, r8 // Save ExKind
INLINE_GETTHREAD
mov rdi, rbx

Expand All @@ -161,7 +162,7 @@ NESTED_ENTRY RhpThrowImpl, _TEXT, NoHandler
mov [rsi + OFFSETOF__ExInfo__m_exception], rdx // init the exception object to null
mov byte ptr [rsi + OFFSETOF__ExInfo__m_passNumber], 1 // init to the first pass
mov dword ptr [rsi + OFFSETOF__ExInfo__m_idxCurClause], 0xFFFFFFFF
mov byte ptr [rsi + OFFSETOF__ExInfo__m_kind], r8b // ExKind (from r8b)
mov byte ptr [rsi + OFFSETOF__ExInfo__m_kind], r12b // ExKind

// link the ExInfo into the thread's ExInfo chain
mov rdx, [rax + OFFSETOF__Thread__m_pExInfoStackHead]
Expand Down
3 changes: 2 additions & 1 deletion src/coreclr/nativeaot/Runtime/arm64/ExceptionHandling.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,7 @@
NESTED_ENTRY RhpThrowImpl, _TEXT, NoHandler

ALLOC_THROW_FRAME SOFTWARE_EXCEPTION
mov x19, x4 // Save ExKind

GetThreadX2

Expand Down Expand Up @@ -340,7 +341,7 @@ LOCAL_LABEL(NotHijacked):
strb w3, [x1, #OFFSETOF__ExInfo__m_passNumber] // pExInfo->m_passNumber = 1
mov w3, #0xFFFFFFFF
str w3, [x1, #OFFSETOF__ExInfo__m_idxCurClause] // pExInfo->m_idxCurClause = MaxTryRegionIdx
strb w4, [x1, #OFFSETOF__ExInfo__m_kind] // pExInfo->m_kind = ExKind (from w4)
strb w19, [x1, #OFFSETOF__ExInfo__m_kind] // pExInfo->m_kind = ExKind

// link the ExInfo into the thread's ExInfo chain
ldr x3, [x2, #OFFSETOF__Thread__m_pExInfoStackHead]
Expand Down
3 changes: 2 additions & 1 deletion src/coreclr/nativeaot/Runtime/loongarch64/ExceptionHandling.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,7 @@
NESTED_ENTRY RhpThrowImpl, _TEXT, NoHandler

ALLOC_THROW_FRAME SOFTWARE_EXCEPTION
ori $r23, $a4, 0 // Save ExKind

GetThreadA2

Expand Down Expand Up @@ -355,7 +356,7 @@ LOCAL_LABEL(NotHijacked):
st.b $a3, $a1, OFFSETOF__ExInfo__m_passNumber // pExInfo->m_passNumber = 1
addi.w $a3, $zero, -1
st.w $a3, $a1, OFFSETOF__ExInfo__m_idxCurClause // pExInfo->m_idxCurClause = MaxTryRegionIdx
st.b $a4, $a1, OFFSETOF__ExInfo__m_kind // pExInfo->m_kind = ExKind (from a4)
st.b $r23, $a1, OFFSETOF__ExInfo__m_kind // pExInfo->m_kind = ExKind

// link the ExInfo into the thread's ExInfo chain
ld.d $a3, $a2, OFFSETOF__Thread__m_pExInfoStackHead
Expand Down
3 changes: 2 additions & 1 deletion src/coreclr/nativeaot/Runtime/riscv64/ExceptionHandling.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,7 @@
NESTED_ENTRY RhpThrowImpl, _TEXT, NoHandler

ALLOC_THROW_FRAME SOFTWARE_EXCEPTION
mv s1, a4 // Save ExKind

GetThreadA2

Expand Down Expand Up @@ -381,7 +382,7 @@ LOCAL_LABEL(NotHijacked):
sb a3, OFFSETOF__ExInfo__m_passNumber(a1) // pExInfo->m_passNumber = 1
addiw a3, zero, -1
sw a3, OFFSETOF__ExInfo__m_idxCurClause(a1) // pExInfo->m_idxCurClause = MaxTryRegionIdx
sb a4, OFFSETOF__ExInfo__m_kind(a1) // pExInfo->m_kind = ExKind (from a4)
sb s1, OFFSETOF__ExInfo__m_kind(a1) // pExInfo->m_kind = ExKind

// Link the ExInfo into the thread's ExInfo chain
ld a3, OFFSETOF__Thread__m_pExInfoStackHead(a2)
Expand Down
Loading