Skip to content
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

[NativeAOT] Do not use private APIs on iOS/macOS #90430

Merged
merged 5 commits into from
Aug 12, 2023
Merged

[NativeAOT] Do not use private APIs on iOS/macOS #90430

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7eb1c10
Use custom implementation of _dyld_find_unwind_sections on Apple
filipnavara Aug 11, 2023
422f838
Link against local ICU libraries on iOS-like platforms
filipnavara Aug 11, 2023
bc4d2d3
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Nativ…
filipnavara Aug 11, 2023
eebcca8
Add comment
filipnavara Aug 12, 2023
281f9f7
Update src/coreclr/nativeaot/Runtime/unix/UnwindHelpers.cpp
filipnavara Aug 12, 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
3 changes: 3 additions & 0 deletions src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ The .NET Foundation licenses this file to you under the MIT license.
<NetCoreAppNativeLibrary Include="System.Security.Cryptography.Native.Apple" Condition="'$(_IsApplePlatform)' == 'true'" />
<!-- Not compliant for iOS-like platforms -->
<NetCoreAppNativeLibrary Include="System.Security.Cryptography.Native.OpenSsl" Condition="'$(StaticOpenSslLinking)' != 'true' and '$(_IsiOSLikePlatform)' != 'true'" />
<NetCoreAppNativeLibrary Include="icudata" Condition="'$(_IsiOSLikePlatform)' == 'true' and '$(InvariantGlobalization)' != 'true'" />
<NetCoreAppNativeLibrary Include="icui18n" Condition="'$(_IsiOSLikePlatform)' == 'true' and '$(InvariantGlobalization)' != 'true'" />
<NetCoreAppNativeLibrary Include="icuuc" Condition="'$(_IsiOSLikePlatform)' == 'true' and '$(InvariantGlobalization)' != 'true'" />
</ItemGroup>

<ItemGroup>
Expand Down
34 changes: 33 additions & 1 deletion src/coreclr/nativeaot/Runtime/unix/UnwindHelpers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#define UNW_STEP_SUCCESS 1
#define UNW_STEP_END 0

#ifdef __APPLE__
#if defined(TARGET_APPLE)
#include <mach-o/getsect.h>
#endif

Expand Down Expand Up @@ -883,3 +883,35 @@ bool UnwindHelpers::GetUnwindProcInfo(PCODE pc, UnwindInfoSections &uwInfoSectio
uc.getInfo(procInfo);
return true;
}

#if defined(TARGET_APPLE)
// Apple considers _dyld_find_unwind_sections to be private API that cannot be used
// by apps submitted to App Store and TestFlight, both for iOS-like and macOS platforms.
// We reimplement it using public API surface.
//
// Ref: https://github.com/apple-oss-distributions/dyld/blob/ce1cc2088ef390df1c48a1648075bbd51c5bbc6a/dyld/DyldAPIs.cpp#L1859-L1884
filipnavara marked this conversation as resolved.
Show resolved Hide resolved
// Ref: https://github.com/llvm/llvm-project/blob/c37145cab12168798a603e22af6b6bf6f606b705/libunwind/src/AddressSpace.hpp#L67-L93
bool _dyld_find_unwind_sections(void* addr, dyld_unwind_sections* info)
filipnavara marked this conversation as resolved.
Show resolved Hide resolved
filipnavara marked this conversation as resolved.
Show resolved Hide resolved
{
// Find mach-o image containing address.
Dl_info dlinfo;
if (!dladdr(addr, &dlinfo))
return false;

const struct mach_header_64 *mh = (const struct mach_header_64 *)dlinfo.dli_fbase;

// Initialize the return struct
info->mh = (const struct mach_header *)mh;
info->dwarf_section = getsectiondata(mh, "__TEXT", "__eh_frame", &info->dwarf_section_length);
info->compact_unwind_section = getsectiondata(mh, "__TEXT", "__unwind_info", &info->compact_unwind_section_length);

if (!info->dwarf_section) {
info->dwarf_section_length = 0;
}
if (!info->compact_unwind_section) {
info->compact_unwind_section_length = 0;
}

return true;
}
#endif