Skip to content

[NativeAOT] Objective-C exception propagation #80334

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
Jan 27, 2023
Merged

[NativeAOT] Objective-C exception propagation #80334

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
dadbc7d
[NativeAOT] Objective-C exception interception
AustinWise Jan 6, 2023
12f2484
Fix Windows build
AustinWise Jan 22, 2023
fdbdd6b
Add back UnwoundReversePInvoke flag after re-initing.
AustinWise Jan 22, 2023
d2b5cd8
Fix backtrace in VS when calling RaiseFailFastException
AustinWise Jan 22, 2023
3866c20
Revert "Fix backtrace in VS when calling RaiseFailFastException"
AustinWise Jan 23, 2023
b1a66d4
Switch to preemptive mode before jumping to propagation callback
AustinWise Jan 25, 2023
8bee9f0
Update src/tests/Interop/ObjectiveC/ObjectiveCMarshalAPI/Program.cs
AustinWise Jan 25, 2023
89dd391
Print actual and expected values in AsmOffsetsVerify.cpp
AustinWise Jan 25, 2023
c947c4b
Revert "Print actual and expected values in AsmOffsetsVerify.cpp"
AustinWise Jan 26, 2023
95fae60
Fix windows AMD64 offsets.
AustinWise Jan 26, 2023
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
Prev Previous commit
Next Next commit
Fix Windows build
  • Loading branch information
@AustinWise
AustinWise committed Jan 22, 2023
commit 12f2484e7ad7fd0d3f3c78e7cd456f2c7454ae0f
7 changes: 6 additions & 1 deletion src/coreclr/nativeaot/Runtime/windows/CoffNativeCodeManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,9 @@ uintptr_t CoffNativeCodeManager::GetConservativeUpperBoundForOutgoingArgs(Method
}

bool CoffNativeCodeManager::UnwindStackFrame(MethodInfo * pMethodInfo,
uint32_t flags,
REGDISPLAY * pRegisterSet, // in/out
bool * pFoundReversePInvoke, // out
PInvokeTransitionFrame** ppPreviousTransitionFrame) // out
{
CoffNativeMethodInfo * pNativeMethodInfo = (CoffNativeMethodInfo *)pMethodInfo;
Expand All @@ -547,10 +549,13 @@ bool CoffNativeCodeManager::UnwindStackFrame(MethodInfo * pMethodInfo,

uint8_t unwindBlockFlags = *p++;

*pFoundReversePInvoke = (unwindBlockFlags & UBF_FUNC_REVERSE_PINVOKE) != 0;

if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) != 0)
p += sizeof(int32_t);

if ((unwindBlockFlags & UBF_FUNC_REVERSE_PINVOKE) != 0)
if ((unwindBlockFlags & UBF_FUNC_REVERSE_PINVOKE) != 0 &&
(flags & USFF_UsePreviousTransitionFrame) != 0)
{
// Reverse PInvoke transition should be on the main function body only
assert(pNativeMethodInfo->mainRuntimeFunction == pNativeMethodInfo->runtimeFunction);
Expand Down
2 changes: 2 additions & 0 deletions src/coreclr/nativeaot/Runtime/windows/CoffNativeCodeManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,9 @@ class CoffNativeCodeManager : public ICodeManager
bool isActiveStackFrame);

bool UnwindStackFrame(MethodInfo * pMethodInfo,
uint32_t flags,
REGDISPLAY * pRegisterSet, // in/out
bool * pFoundReversePInvoke, // out
PInvokeTransitionFrame** ppPreviousTransitionFrame); // out

uintptr_t GetConservativeUpperBoundForOutgoingArgs(MethodInfo * pMethodInfo,
Expand Down