Commit 35b935a

committed

Oh yeah, tidy

1 parent 24ca89b commit 35b935aCopy full SHA for 35b935a

File tree

+10

-4

lines changed

+10

-4

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,9 @@ fn inline_attr<'ll>(cx: &CodegenCx<'ll, '_>, inline: InlineAttr) -> Option<&'ll`
`52`	`52`	`return Some(AttributeKind::NoInline.create_attr(cx.llcx));`
`53`	`53`	`}`
`54`	`54`	`match inline {`
`55`		`- InlineAttr::Hint \| InlineAttr::Early => Some(AttributeKind::InlineHint.create_attr(cx.llcx)),`
	`55`	`+ InlineAttr::Hint \| InlineAttr::Early => {`
	`56`	`+ Some(AttributeKind::InlineHint.create_attr(cx.llcx))`
	`57`	`+ }`
`56`	`58`	`InlineAttr::Always \| InlineAttr::Force { .. } => {`
`57`	`59`	`Some(AttributeKind::AlwaysInline.create_attr(cx.llcx))`
`58`	`60`	`}`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,9 @@ fn cross_crate_inlinable(tcx: TyCtxt<'_>, def_id: LocalDefId) -> bool {`
`46`	`46`	`// #[inline(never)] to force code generation.`
`47`	`47`	`match codegen_fn_attrs.inline {`
`48`	`48`	`InlineAttr::Never => return false,`
`49`		`- InlineAttr::Hint \| InlineAttr::Always \| InlineAttr::Early \| InlineAttr::Force { .. } => return true,`
	`49`	`+ InlineAttr::Hint \| InlineAttr::Always \| InlineAttr::Early \| InlineAttr::Force { .. } => {`
	`50`	`+ return true;`
	`51`	`+ }`
`50`	`52`	`InlineAttr::None => {}`
`51`	`53`	`}`
`52`	`54`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,8 @@ impl<'tcx> Inliner<'tcx> for ForceInliner<'tcx> {`
`193`	`193`
`194`	`194`	`fn should_inline_for_callee(&self, instance_kind: &InstanceKind<'tcx>) -> bool {`
`195`	`195`	`if let InstanceKind::Item(def_id) = instance_kind`
`196`		`- && let InlineAttr::Force { .. } \| InlineAttr::Early = self.tcx().codegen_fn_attrs(def_id).inline`
	`196`	`+ && let InlineAttr::Force { .. } \| InlineAttr::Early =`
	`197`	`+ self.tcx().codegen_fn_attrs(def_id).inline`
`197`	`198`	`{`
`198`	`199`	`true`
`199`	`200`	`} else {`
`@@ -272,7 +273,8 @@ impl<'tcx> Inliner<'tcx> for ForceInliner<'tcx> {`
`272`	`273`	`callee_span: tcx.def_span(callsite.callee.def_id()),`
`273`	`274`	`callee: tcx.def_path_str(callsite.callee.def_id()),`
`274`	`275`	`reason,`
`275`		`- justification: justification.map(\|sym\| crate::errors::ForceInlineJustification { sym }),`
	`276`	`+ justification: justification`
	`277`	`+ .map(\|sym\| crate::errors::ForceInlineJustification { sym }),`
`276`	`278`	`});`
`277`	`279`	`}`
`278`	`280`	`_ => bug!("called on item without required inlining"),`

Comments

(0)