mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make frame_in_std check work with inlining

Browse Source
This commit is contained in:
Ralf Jung 2022-06-10 20:23:30 -07:00
parent 4d6eca1c08
commit 4da48e06c7
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/helpers.rs
View File

@ -729,10 +729,22 @@ fn check_abi<'a>(&self, abi: Abi, exp_abi: Abi) -> InterpResult<'a, ()> {
fn frame_in_std(&self) -> bool { fn frame_in_std(&self) -> bool {
let this = self.eval_context_ref(); let this = self.eval_context_ref();
this.tcx.lang_items().start_fn().map_or(false, |start_fn| { let Some(start_fn) = this.tcx.lang_items().start_fn() else {
this.tcx.def_path(this.frame().instance.def_id()).krate // no_std situations
== this.tcx.def_path(start_fn).krate return false;
}) };
let frame = this.frame();
// Make an attempt to get at the instance of the function this is inlined from.
let instance: Option<_> = try {
let scope = frame.current_source_info()?.scope;
let inlined_parent = frame.body.source_scopes[scope].inlined_parent_scope?;
let source = &frame.body.source_scopes[inlined_parent];
source.inlined.expect("inlined_parent_scope points to scope without inline info").0
};
// Fall back to the instance of the function itself.
let instance = instance.unwrap_or(frame.instance);
// Now check if this is in the same crate as start_fn.
this.tcx.def_path(instance.def_id()).krate == this.tcx.def_path(start_fn).krate
} }
/// Handler that should be called when unsupported functionality is encountered. /// Handler that should be called when unsupported functionality is encountered.