Repository navigation
[native] Construct DSO names and directory paths without local strings - #12515
Merged
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR factors out repeated DSO name normalization (optional lib prefix + mandatory .so suffix) into a shared helper and uses it in both CoreCLR DSO path construction and P/Invoke override loading to reduce duplicated string manipulation.
Changes:
- Added
Util::append_dso_name()helper to normalize DSO names (prefix/suffix). - Updated
AndroidSystem::get_full_dso_path()to use the shared helper. - Updated P/Invoke override loading to use the shared helper when rewriting short library names.
Show a summary per file
| File | Description |
|---|---|
| src/native/clr/runtime-base/android-system.cc | Uses shared helper for full DSO path construction while preserving rooted/path-qualified handling. |
| src/native/clr/include/runtime-base/util.hh | Introduces shared helper for DSO name normalization. |
| src/native/clr/include/host/pinvoke-override-impl.hh | Uses shared helper when rewriting [DllImport] names like log/liblog. |
Review details
- Files reviewed: 3/3 changed files
- Comments generated: 1
- Review effort level: Lite
simonrozsival
added
the
drop-libcpp
simonrozsival
changed the title
simonrozsival
force-pushed
the
dev/simonrozsival/simplify-dso-name
branch
from
August 25, 2026 15:09
67f7f33 to
51ef76a
Compare
simonrozsival
changed the base branch from
main
to
dev/simonrozsival/replace-simple-local-strings
August 25, 2026 15:10
simonrozsival
force-pushed
the
dev/simonrozsival/simplify-dso-name
branch
2 times, most recently
from
August 25, 2026 15:35
355d3d7 to
4c9090e
Compare
simonrozsival
force-pushed
the
dev/simonrozsival/simplify-dso-name
branch
from
August 25, 2026 15:42
4c9090e to
390be0f
Compare
simonrozsival
changed the title
simonrozsival
force-pushed
the
dev/simonrozsival/simplify-dso-name
branch
from
August 25, 2026 15:54
390be0f to
2a53b4d
Compare
simonrozsival
force-pushed
the
dev/simonrozsival/simplify-dso-name
branch
2 times, most recently
from
August 25, 2026 18:53
2ea7b1e to
19e08dc
Compare
simonrozsival
force-pushed
the
dev/simonrozsival/simplify-dso-name
branch
from
August 25, 2026 21:27
19e08dc to
821de28
Compare
simonrozsival
force-pushed
the
dev/simonrozsival/simplify-dso-name
branch
from
August 25, 2026 21:32
821de28 to
0c6fa97
Compare
simonrozsival
force-pushed
the
dev/simonrozsival/simplify-dso-name
branch
from
August 25, 2026 21:41
0c6fa97 to
cc5e351
Compare
simonrozsival
force-pushed
the
dev/simonrozsival/simplify-dso-name
branch
from
August 25, 2026 21:51
cc5e351 to
7dc6df9
Compare
simonrozsival
added
the
ready-to-review
Base automatically changed from
dev/simonrozsival/replace-simple-local-strings
to
main
August 31, 2026 13:39
Use one helper to conditionally add the lib prefix and .so suffix for runtime DSO lookup and P/Invoke override loading. Co-authored-by: Copilot <[email protected]>
Return formatted DSO and lookup-path lengths through caller-owned buffers, removing the remaining local strings from both normalization paths. Co-authored-by: Copilot <[email protected]>
Preserve the unbounded behavior of dynamic local strings without introducing libc++ ownership. Co-authored-by: Copilot <[email protected]>
Return the malloc-allocated joined path directly after releasing the temporary DSO name. Co-authored-by: Copilot <[email protected]>
Calculate complete DSO sizes first, use the sensible local buffer when possible, and allocate only larger names and paths. Co-authored-by: Copilot <[email protected]>
Return the selected stack or heap buffer from DSO formatters and report the exact required capacity when local storage is too small. Co-authored-by: Copilot <[email protected]>
Rely on free(nullptr) and name stack-backed DSO storage explicitly. Co-authored-by: Copilot <[email protected]>
Use non-template DSO helpers and make callers provide each stack buffer capacity. Co-authored-by: Copilot <[email protected]>
Remove heap-buffer out parameters and free returned DSO strings only when they differ from their stack buffers. Co-authored-by: Copilot <[email protected]>
`get_full_dso_path` gained a second overload whose parameter list is identical to the existing one and differs only in its return type, which is not a valid overload. Rename the raw `ssize_t` variant to `format_full_dso_path` and leave the `char*` wrapper as the only `get_full_dso_path`. Co-authored-by: Copilot <[email protected]> Copilot-Session: 0a35a0db-502d-48c0-8468-e73b5dd0ab2e
Replace the resizable local string in Util::create_directory with a checked mutable path buffer and report ENAMETOOLONG when it cannot fit. Co-authored-by: Copilot <[email protected]>
Stop scanning once the fixed create-directory buffer capacity is reached. Co-authored-by: Copilot <[email protected]>
The stacked fixed-buffer migrations remove every remaining CLR and NativeAOT consumer of strings.hh, so drop the final includes. Co-authored-by: Copilot <[email protected]>
Preserve the former dynamic local string behavior with malloc/free instead of imposing SENSIBLE_PATH_MAX as a path limit. Co-authored-by: Copilot <[email protected]>
Use the sensible local buffer for common paths and allocate only when the complete path exceeds it. Co-authored-by: Copilot <[email protected]>
Keep typical paths in local storage, use malloc only when needed, and clean up through Util::free_if_used. Co-authored-by: Copilot <[email protected]>
Rely on free(nullptr) and name stack-backed directory storage explicitly. Co-authored-by: Copilot <[email protected]>
Eliminate the separate heap pointer and free directory storage only when it differs from the stack buffer. Co-authored-by: Copilot <[email protected]>
create_directory no longer uses dynamic_local_string, so the header is no longer needed here. Co-authored-by: Copilot <[email protected]> Copilot-Session: 0a35a0db-502d-48c0-8468-e73b5dd0ab2e
jonathanpeppers
force-pushed
the
dev/simonrozsival/simplify-dso-name
branch
from
August 31, 2026 13:39
48ac89b to
057798b
Compare
jonathanpeppers
approved these changes
Aug 31, 2026
Keep fast local failure detection while allowing slower CI hosts up to two minutes to complete apkdiff. Report the selected timeout in failure diagnostics. Co-authored-by: Copilot App <[email protected]>
rolfbjarne
approved these changes
Sep 1, 2026
5 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Remove the CLR/NativeAOT local-string dependencies from DSO-name, path and directory construction, without introducing libc++ ownership or fixed-size limits. This removes the last
strings.hhincludes from the CLR/NativeAOT code.Part of #12533. This PR is the combination of what were previously two stacked PRs — the DSO-name work and the directory-creation work — which sat directly on top of each other and modified the same files (
android-system.hh/cc,util.hh/cc). They are reviewed together here.DSO names and paths
libprefix and.sosuffix constructionmalloc()storage, with no heap out-parametersDirectory creation
Preserves dynamically sized directory paths:
strlen(pathname) + 1once for mutable directory-path storagemalloc()storage otherwisemkdir()errnoacross conditional heap cleanupstrings.hhincludesBoth halves use the same ownership convention — a returned pointer is freed only when it differs from the caller's stack buffer — which is the main reason they are easier to review as one change.
Validation