Skip to content

[release/10.0] Mark labels in x64 write barrier code as local/alt_entry #120923

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
merged 6 commits into from
Oct 22, 2025
+217 −94
Merged

[release/10.0] Mark labels in x64 write barrier code as local/alt_entry #120923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0f3c170
Mark labels in x64 write barrier code as local/alt_entry to prevent i…
filipnavara Sep 1, 2025
795c369
Fix the LEAF_END_MARKED macro for Apple platforms too
filipnavara Sep 1, 2025
480b2f6
Mark all labels inside JIT_PatchedCode region as .alt_entry on Apple …
filipnavara Sep 2, 2025
ed543ef
Another take at eliminating UB in patchedcode.S with Apple linkers
filipnavara Sep 3, 2025
6d96561
Workaround for broken unwind info
filipnavara Sep 5, 2025
1858141
Use classic linker on Xcode 15
filipnavara Sep 8, 2025
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
7 changes: 7 additions & 0 deletions eng/native/configurecompiler.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,13 @@ if (CLR_CMAKE_HOST_UNIX)
endif()
endif()

# Force usage of classic linker on Xcode 15
if (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" AND
CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 15 AND
CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16)
add_link_options("-Wl,-ld_classic")
endif()

if (CMAKE_CONFIGURATION_TYPES) # multi-configuration generator?
set(CMAKE_CONFIGURATION_TYPES "Debug;Checked;Release;RelWithDebInfo" CACHE STRING "" FORCE)
endif (CMAKE_CONFIGURATION_TYPES)
Expand Down
7 changes: 6 additions & 1 deletion src/coreclr/pal/inc/unixasmmacrosamd64.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,13 @@ C_FUNC(\Name):
.endm

.macro LEAF_END_MARKED Name, Section
C_FUNC(\Name\()_End):
#if defined(__APPLE__)
.alt_entry C_FUNC(\Name\()_End)
.private_extern C_FUNC(\Name\()_End)
#else
.global C_FUNC(\Name\()_End)
#endif
C_FUNC(\Name\()_End):
LEAF_END \Name, \Section
// make sure this symbol gets its own address
nop
Expand Down
7 changes: 6 additions & 1 deletion src/coreclr/pal/inc/unixasmmacrosarm64.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,13 @@ C_FUNC(\Name):
.endm

.macro LEAF_END_MARKED Name, Section
C_FUNC(\Name\()_End):
#if defined(__APPLE__)
.alt_entry C_FUNC(\Name\()_End)
.private_extern C_FUNC(\Name\()_End)
#else
.global C_FUNC(\Name\()_End)
#endif
C_FUNC(\Name\()_End):
LEAF_END \Name, \Section
// make sure this symbol gets its own address
nop
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/vm/amd64/CachedInterfaceDispatchCoreCLR.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ LEAF_ENTRY RhpVTableOffsetDispatch, _TEXT
// to get the address in the vtable chunk list of what we want to dereference
#ifdef TARGET_APPLE
// Apple's linker has issues which break unwind info if
// an ALTERNATE_ENTRY is present in the middle of a function see https://github.com/dotnet/runtime/pull/114982#discussion_r2083272768
// an ALTERNATE_ENTRY is present in the middle of a function see https://github.com/dotnet/runtime/issues/119005
.cfi_endproc
#endif
ALTERNATE_ENTRY RhpVTableOffsetDispatchAVLocation
Expand Down
Loading
Loading