Skip to content

Commit ffcbf96

Browse files
committed
Check for rustc_no_mir_inline earlier
1 parent 4aef101 commit ffcbf96

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

compiler/rustc_mir_transform/src/inline.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -280,10 +280,6 @@ impl<'tcx> Inliner<'tcx> {
280280
}
281281
}
282282

283-
if self.tcx.has_attr(callsite.callee.def_id(), sym::rustc_no_mir_inline) {
284-
return Err("found #[rustc_no_mir_inline] on callee");
285-
}
286-
287283
let old_blocks = caller_body.basic_blocks.next_index();
288284
self.inline_call(caller_body, callsite, callee_body);
289285
let new_blocks = old_blocks..caller_body.basic_blocks.next_index();
@@ -418,6 +414,10 @@ impl<'tcx> Inliner<'tcx> {
418414
callee_attrs: &CodegenFnAttrs,
419415
cross_crate_inlinable: bool,
420416
) -> Result<(), &'static str> {
417+
if self.tcx.has_attr(callsite.callee.def_id(), sym::rustc_no_mir_inline) {
418+
return Err("#[rustc_no_mir_inline]");
419+
}
420+
421421
if let InlineAttr::Never = callee_attrs.inline {
422422
return Err("never inline hint");
423423
}

0 commit comments

Comments
 (0)