Conversation
|
This has been extracted out of rust-lang/rust#134522. |
bjorn3
force-pushed
the
weak_defs
branch
3 times, most recently
from
5a433c4 to
2402b40
Compare
src/shims/foreign_items.rs
Outdated
| if let Some((instance, _, _)) = instance_and_crate { | ||
| if !matches!(tcx.def_kind(instance.def_id()), DefKind::Fn | DefKind::AssocFn) { | ||
| throw_ub_format!( | ||
| "attempt to call an exported symbol that is not defined as a function" | ||
| ); | ||
| } | ||
| } | ||
|
|
There was a problem hiding this comment.
I guess this logic can live here as well, but is there a specific reason you moved it?
There was a problem hiding this comment.
It will make a difference if there's a weak symbol that's not a function and a "strong" symbol that is. That's probably fine?
|
@rustbot author |
rustbot
added
the
S-waiting-on-author
|
what's the status of this one @bjorn3? (I expect just little time which is very fair <3) |
|
Somehow I didn't notice there were outstanding review comments. |
bjorn3
force-pushed
the
weak_defs
branch
2 times, most recently
from
59a946e to
de4a356
Compare
|
@rustbot ready |
rustbot
added
S-waiting-on-review
src/shims/foreign_items.rs
Outdated
| if let Some(SymbolTarget { | ||
| instance: original_instance, | ||
| cnum: original_cnum, | ||
| is_weak: original_is_weak, | ||
| }) = symbol_target |
There was a problem hiding this comment.
| if let Some(SymbolTarget { | |
| instance: original_instance, | |
| cnum: original_cnum, | |
| is_weak: original_is_weak, | |
| }) = symbol_target | |
| if let Some(original) = symbol_target |
seems more concise and more clear
src/shims/foreign_items.rs
Outdated
| if let Some((instance, _, _)) = instance_and_crate { | ||
| if !matches!(tcx.def_kind(instance.def_id()), DefKind::Fn | DefKind::AssocFn) { | ||
| throw_ub_format!( | ||
| "attempt to call an exported symbol that is not defined as a function" | ||
| ); | ||
| } | ||
| } | ||
|
|
There was a problem hiding this comment.
It will make a difference if there's a weak symbol that's not a function and a "strong" symbol that is. That's probably fine?
| })?; | ||
|
|
||
| e.insert(instance_and_crate.map(|ic| ic.0)) | ||
| if let Some(SymbolTarget { instance, .. }) = symbol_target { |
There was a problem hiding this comment.
| if let Some(SymbolTarget { instance, .. }) = symbol_target { | |
| // Once we identified the instance corresponding to the symbol, ensure | |
| // it is a function. It is okay to encounter non-functions in the search above | |
| // as long as the final instance we arrive at is a function. | |
| if let Some(SymbolTarget { instance, .. }) = symbol_target { |
|
@rustbot author |
rustbot
added
S-waiting-on-author
|
@rustbot ready |
rustbot
added
S-waiting-on-review
|
Thanks! |
rustbot
added
S-waiting-on-author
|
This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed. Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers. |
When a symbol only has a weak definition, this definition will be picked. When a symbol has both a weak and a regular definition, the regular definition will be picked instead.
|
Rebased and squashed. @rustbot ready |
rustbot
added
S-waiting-on-review
4 participants
When a symbol only has a weak definition, this definition will be picked. When a symbol has both a weak and a regular definition, the regular definition will be picked instead.
In the future the allocator shim may be replaced by weak definitions. This already adds support to simplify things in the future.