Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions src/analyze/annot.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ pub fn callable_path() -> [Symbol; 2] {
[Symbol::intern("thrust"), Symbol::intern("callable")]
}

pub fn extern_spec_fn_path() -> [Symbol; 2] {
[Symbol::intern("thrust"), Symbol::intern("extern_spec_fn")]
}

/// A [`annot::Resolver`] implementation for resolving function parameters.
///
/// The parameter names and their sorts needs to be configured via
Expand Down
12 changes: 11 additions & 1 deletion src/analyze/crate_.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,22 @@ impl<'tcx, 'ctx> Analyzer<'tcx, 'ctx> {
self.trusted.insert(local_def_id.to_def_id());
}

if analyzer.is_annotated_as_extern_spec_fn() {
assert!(analyzer.is_fully_annotated());
self.trusted.insert(local_def_id.to_def_id());
}

use mir_ty::TypeVisitableExt as _;
if sig.has_param() && !analyzer.is_fully_annotated() {
self.ctx.register_deferred_def(local_def_id.to_def_id());
} else {
let expected = analyzer.expected_ty();
self.ctx.register_def(local_def_id.to_def_id(), expected);
let target_def_id = if analyzer.is_annotated_as_extern_spec_fn() {
analyzer.extern_spec_fn_target_def_id()
} else {
local_def_id.to_def_id()
};
self.ctx.register_def(target_def_id, expected);
}
}

Expand Down
54 changes: 53 additions & 1 deletion src/analyze/local_def.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use rustc_index::bit_set::BitSet;
use rustc_index::IndexVec;
use rustc_middle::mir::{self, BasicBlock, Body, Local};
use rustc_middle::ty::{self as mir_ty, TyCtxt, TypeAndMut};
use rustc_span::def_id::LocalDefId;
use rustc_span::def_id::{DefId, LocalDefId};
use rustc_span::symbol::Ident;

use crate::analyze;
Expand Down Expand Up @@ -126,6 +126,16 @@ impl<'tcx, 'ctx> Analyzer<'tcx, 'ctx> {
.is_some()
}

pub fn is_annotated_as_extern_spec_fn(&self) -> bool {
self.tcx
.get_attrs_by_path(
self.local_def_id.to_def_id(),
&analyze::annot::extern_spec_fn_path(),
)
.next()
.is_some()
}

// TODO: unify this logic with extraction functions above
pub fn is_fully_annotated(&self) -> bool {
let has_require = self
Expand Down Expand Up @@ -240,6 +250,48 @@ impl<'tcx, 'ctx> Analyzer<'tcx, 'ctx> {
rty::RefinedType::unrefined(builder.build().into())
}

/// Extract the target DefId from `#[thrust::extern_spec_fn]` function.
pub fn extern_spec_fn_target_def_id(&self) -> DefId {
struct ExtractDefId<'tcx> {
tcx: TyCtxt<'tcx>,
outer_def_id: LocalDefId,
inner_def_id: Option<DefId>,
}

impl<'tcx> rustc_hir::intravisit::Visitor<'tcx> for ExtractDefId<'tcx> {
type NestedFilter = rustc_middle::hir::nested_filter::OnlyBodies;

fn nested_visit_map(&mut self) -> Self::Map {
self.tcx.hir()
}

fn visit_qpath(
&mut self,
qpath: &rustc_hir::QPath<'tcx>,
hir_id: rustc_hir::HirId,
_span: rustc_span::Span,
) {
let typeck_result = self.tcx.typeck(self.outer_def_id);
if let rustc_hir::def::Res::Def(_, def_id) = typeck_result.qpath_res(qpath, hir_id)
{
assert!(self.inner_def_id.is_none(), "invalid extern_spec_fn");
self.inner_def_id = Some(def_id);
}
}
}

use rustc_hir::intravisit::Visitor as _;
let mut visitor = ExtractDefId {
tcx: self.tcx,
outer_def_id: self.local_def_id,
inner_def_id: None,
};
if let rustc_hir::Node::Item(item) = self.tcx.hir_node_by_def_id(self.local_def_id) {
visitor.visit_item(item);
}
visitor.inner_def_id.expect("invalid extern_spec_fn")
}

fn is_mut_param(&self, param_idx: rty::FunctionParamIdx) -> bool {
let param_local = analyze::local_of_function_param(param_idx);
self.body.local_decls[param_local].mutability.is_mut()
Expand Down
14 changes: 14 additions & 0 deletions tests/ui/fail/extern_spec_take.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
//@error-in-other-file: Unsat

#[thrust::extern_spec_fn]
#[thrust::requires(true)]
#[thrust::ensures(result == *dest && ^dest == 0)]
fn _extern_spec_take(dest: &mut i32) -> i32 {
std::mem::take(dest)
}

fn main() {
let mut x = 42;
let old = std::mem::take(&mut x);
assert!(x == 42);
}
15 changes: 15 additions & 0 deletions tests/ui/pass/extern_spec_take.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
//@check-pass

#[thrust::extern_spec_fn]
#[thrust::requires(true)]
#[thrust::ensures(result == *dest && ^dest == 0)]
fn _extern_spec_take(dest: &mut i32) -> i32 {
std::mem::take(dest)
}

fn main() {
let mut x = 42;
let old = std::mem::take(&mut x);
assert!(old == 42);
assert!(x == 0);
}