Skip to content
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

CFI: Repair vtables without altering types #122573

Closed
wants to merge 13 commits into from
Closed

CFI: Repair vtables without altering types #122573

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7578cc5
Introduce trait_obj_ty query
maurer Mar 2, 2024
f50baef
Refactor visiting instance_def
maurer Feb 16, 2024
0b49e3c
Refactor fmt_instance
maurer Feb 22, 2024
8aaa391
CFI: Use Instance at callsites
maurer Mar 15, 2024
c9ff274
CFI: Introduce CFI shims
maurer Jan 29, 2024
7fd0f60
CFI: Apply CFI shims to drops
maurer Mar 1, 2024
1d81d8e
CFI: Enable vtable shimming
maurer Mar 1, 2024
6538cdb
CFI: Remove trait function encoding hack
maurer Mar 14, 2024
614f30c
CFI: Skip non-passed arguments
maurer Feb 17, 2024
54cf2dc
CFI: Support self_cell-like recursion
maurer Mar 3, 2024
c74b018
CFI: Generate super vtables explicitly
maurer Feb 19, 2024
54b15b0
CFI: Strip auto traits off Self for virtual calls
maurer Mar 15, 2024
a93f25b
CFI: Handle dyn with no principal
maurer Feb 19, 2024
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
Prev Previous commit
Next Next commit
Refactor visiting instance_def 
In preparation to add recursive instance_defs, move this logic to its
own convenience method.
  • Loading branch information
@maurer
maurer committed Mar 14, 2024
commit f50baef1a783ae504bdde12d7b1ffe946f5ac1fe
54 changes: 28 additions & 26 deletions compiler/rustc_middle/src/mir/visit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,33 +331,10 @@ macro_rules! make_mir_visitor {
self.visit_source_scope($(& $mutability)? *parent_scope);
}
if let Some((callee, callsite_span)) = inlined {
let location = Location::START;

self.visit_span($(& $mutability)? *callsite_span);

let ty::Instance { def: callee_def, args: callee_args } = callee;
match callee_def {
ty::InstanceDef::Item(_def_id) => {}

ty::InstanceDef::Intrinsic(_def_id) |
ty::InstanceDef::VTableShim(_def_id) |
ty::InstanceDef::ReifyShim(_def_id) |
ty::InstanceDef::Virtual(_def_id, _) |
ty::InstanceDef::ThreadLocalShim(_def_id) |
ty::InstanceDef::ClosureOnceShim { call_once: _def_id, track_caller: _ } |
ty::InstanceDef::ConstructCoroutineInClosureShim { coroutine_closure_def_id: _def_id, target_kind: _ } |
ty::InstanceDef::CoroutineKindShim { coroutine_def_id: _def_id, target_kind: _ } |
ty::InstanceDef::DropGlue(_def_id, None) => {}

ty::InstanceDef::FnPtrShim(_def_id, ty) |
ty::InstanceDef::DropGlue(_def_id, Some(ty)) |
ty::InstanceDef::CloneShim(_def_id, ty) |
ty::InstanceDef::FnPtrAddrShim(_def_id, ty) => {
// FIXME(eddyb) use a better `TyContext` here.
self.visit_ty($(& $mutability)? *ty, TyContext::Location(location));
}
}
self.visit_args(callee_args, location);
let ty::Instance { def, args } = callee;
self.visit_instance_def($(& $mutability)? *def);
self.visit_args(& $($mutability)? *args, Location::START);
}
if let Some(inlined_parent_scope) = inlined_parent_scope {
self.visit_source_scope($(& $mutability)? *inlined_parent_scope);
Expand Down Expand Up @@ -941,6 +918,31 @@ macro_rules! make_mir_visitor {

// Convenience methods

fn visit_instance_def(&mut self, def: $(& $mutability)? ty::InstanceDef<'tcx>) {
let location = Location::START;
match def {
ty::InstanceDef::Item(_def_id) => {}

ty::InstanceDef::Intrinsic(_def_id) |
ty::InstanceDef::VTableShim(_def_id) |
ty::InstanceDef::ReifyShim(_def_id) |
ty::InstanceDef::Virtual(_def_id, _) |
ty::InstanceDef::ThreadLocalShim(_def_id) |
ty::InstanceDef::ClosureOnceShim { call_once: _def_id, track_caller: _ } |
ty::InstanceDef::ConstructCoroutineInClosureShim { coroutine_closure_def_id: _def_id, target_kind: _ } |
ty::InstanceDef::CoroutineKindShim { coroutine_def_id: _def_id, target_kind: _ } |
ty::InstanceDef::DropGlue(_def_id, None) => {}

ty::InstanceDef::FnPtrShim(_def_id, ty) |
ty::InstanceDef::DropGlue(_def_id, Some(ty)) |
ty::InstanceDef::CloneShim(_def_id, ty) |
ty::InstanceDef::FnPtrAddrShim(_def_id, ty) => {
// FIXME(eddyb) use a better `TyContext` here.
self.visit_ty($(& $mutability *)? ty, TyContext::Location(location));
}
}
}

fn visit_location(
&mut self,
body: &$($mutability)? Body<'tcx>,
Expand Down