Fix linking two dylibs together when both depend on profiler_builtins#154856
Merged
rust-bors[bot] merged 1 commit intorust-lang:mainfrom Apr 9, 2026
Merged
Fix linking two dylibs together when both depend on profiler_builtins#154856rust-bors[bot] merged 1 commit intorust-lang:mainfrom
rust-bors[bot] merged 1 commit intorust-lang:mainfrom
Conversation
rustbot
added
S-waiting-on-review
Collaborator
|
r? @mati865 rustbot has assigned @mati865. Use Why was this reviewer chosen?The reviewer was selected based on:
|
See the comment inside this commit for why.
bjorn3
force-pushed
the
fix_dylib_profiler_builtins
branch
from
c91e254 to
642f348
Compare
mati865
approved these changes
Apr 8, 2026
Member
There was a problem hiding this comment.
I had played a bit with this code and I have to admit this isn't the easiest thing to follow. I don't immediately see a better option.
@bors r+
Contributor
rust-bors
bot
added
S-waiting-on-bors
rust-bors bot
pushed a commit
that referenced
this pull request
Apr 9, 2026
Rollup of 10 pull requests Successful merges: - #150316 (Do not use non-wf input expectations from fudge when checking function calls) - #152859 (`-Znext-solver` use the trait object's own bounds instead of goal when considering builtin object bounds) - #154856 (Fix linking two dylibs together when both depend on profiler_builtins) - #153888 (Avoid stack overflow in FindExprBySpan) - #154991 (Fix ICE in next-solver TransmuteFrom candidate) - #154995 (min/max_by tests: also check result) - #155004 (core/num: Fix feature name for unstable `integer_extend_truncate` functions) - #155007 (renaming method is_impl_trait to is_opaque) - #155009 (meta: Add checkboxes to unsresolved questions in issue templates) - #155017 (Update tracking issue number of future-incompatibility lint `unstable_syntax_pre_expansion`)
rust-timer
added a commit
that referenced
this pull request
Apr 9, 2026
Rollup merge of #154856 - bjorn3:fix_dylib_profiler_builtins, r=mati865 Fix linking two dylibs together when both depend on profiler_builtins See the comment inside this commit for why. Fixes a regression from #150014 reported at [#t-compiler > 1.94 profiler_builtin linkage in dylibs](https://rust-lang.zulipchat.com/#narrow/channel/131828-t-compiler/topic/1.2E94.20profiler_builtin.20linkage.20in.20dylibs/with/583704962).
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
See the comment inside this commit for why.
Fixes a regression from #150014 reported at #t-compiler > 1.94 profiler_builtin linkage in dylibs.