bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #138187 - matthiaskrgr:rmclone, r=cjgillot

Browse source 
remove clones
This commit is contained in:
Jacob Pratt 2025-03-07 21:57:54 -05:00 • committed by GitHub
commit dad4c8b6a9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

29
compiler/rustc_builtin_macros/src/autodiff.rs
View file

@ -286,7 +286,7 @@ mod llvm_enzyme {
let orig_annotatable: Annotatable = match item { let orig_annotatable: Annotatable = match item {
Annotatable::Item(ref mut iitem) => { Annotatable::Item(ref mut iitem) => {
if !iitem.attrs.iter().any(|a| a.id == attr.id) { if !iitem.attrs.iter().any(|a| a.id == attr.id) {
iitem.attrs.push(attr.clone()); iitem.attrs.push(attr);
} }
if !iitem.attrs.iter().any(|a| a.id == inline_never.id) { if !iitem.attrs.iter().any(|a| a.id == inline_never.id) {
iitem.attrs.push(inline_never.clone()); iitem.attrs.push(inline_never.clone());
@ -295,7 +295,7 @@ mod llvm_enzyme {
} }
Annotatable::AssocItem(ref mut assoc_item, i @ Impl) => { Annotatable::AssocItem(ref mut assoc_item, i @ Impl) => {
if !assoc_item.attrs.iter().any(|a| a.id == attr.id) { if !assoc_item.attrs.iter().any(|a| a.id == attr.id) {
assoc_item.attrs.push(attr.clone()); assoc_item.attrs.push(attr);
} }
if !assoc_item.attrs.iter().any(|a| a.id == inline_never.id) { if !assoc_item.attrs.iter().any(|a| a.id == inline_never.id) {
assoc_item.attrs.push(inline_never.clone()); assoc_item.attrs.push(inline_never.clone());
@ -322,7 +322,7 @@ mod llvm_enzyme {
let d_annotatable = if is_impl { let d_annotatable = if is_impl {
let assoc_item: AssocItemKind = ast::AssocItemKind::Fn(asdf); let assoc_item: AssocItemKind = ast::AssocItemKind::Fn(asdf);
let d_fn = P(ast::AssocItem { let d_fn = P(ast::AssocItem {
attrs: thin_vec![d_attr.clone(), inline_never], attrs: thin_vec![d_attr, inline_never],
id: ast::DUMMY_NODE_ID, id: ast::DUMMY_NODE_ID,
span, span,
vis, vis,
@ -332,12 +332,8 @@ mod llvm_enzyme {
}); });
Annotatable::AssocItem(d_fn, Impl) Annotatable::AssocItem(d_fn, Impl)
} else { } else {
let mut d_fn = ecx.item( let mut d_fn =
span, ecx.item(span, d_ident, thin_vec![d_attr, inline_never], ItemKind::Fn(asdf));
d_ident,
thin_vec![d_attr.clone(), inline_never],
ItemKind::Fn(asdf),
);
d_fn.vis = vis; d_fn.vis = vis;
Annotatable::Item(d_fn) Annotatable::Item(d_fn)
}; };
@ -446,7 +442,7 @@ mod llvm_enzyme {
if primal_ret && n_active == 0 && x.mode.is_rev() { if primal_ret && n_active == 0 && x.mode.is_rev() {
// We only have the primal ret. // We only have the primal ret.
body.stmts.push(ecx.stmt_expr(black_box_primal_call.clone())); body.stmts.push(ecx.stmt_expr(black_box_primal_call));
return body; return body;
} }
@ -471,7 +467,7 @@ mod llvm_enzyme {
if primal_ret { if primal_ret {
// We have both primal ret and active floats. // We have both primal ret and active floats.
// primal ret is first, by construction. // primal ret is first, by construction.
exprs.push(primal_call.clone()); exprs.push(primal_call);
} }
// Now construct default placeholder for each active float. // Now construct default placeholder for each active float.
@ -538,16 +534,11 @@ mod llvm_enzyme {
return body; return body;
} }
[arg] => { [arg] => {
ret = ecx.expr_call( ret = ecx.expr_call(new_decl_span, blackbox_call_expr, thin_vec![arg.clone()]);
new_decl_span,
blackbox_call_expr.clone(),
thin_vec![arg.clone()],
);
} }
args => { args => {
let ret_tuple: P<ast::Expr> = ecx.expr_tuple(span, args.into()); let ret_tuple: P<ast::Expr> = ecx.expr_tuple(span, args.into());
ret = ret = ecx.expr_call(new_decl_span, blackbox_call_expr, thin_vec![ret_tuple]);
ecx.expr_call(new_decl_span, blackbox_call_expr.clone(), thin_vec![ret_tuple]);
} }
} }
assert!(has_ret(&d_sig.decl.output)); assert!(has_ret(&d_sig.decl.output));
@ -567,7 +558,7 @@ mod llvm_enzyme {
let args: ThinVec<_> = let args: ThinVec<_> =
idents[1..].iter().map(|arg| ecx.expr_path(ecx.path_ident(span, *arg))).collect(); idents[1..].iter().map(|arg| ecx.expr_path(ecx.path_ident(span, *arg))).collect();
let self_expr = ecx.expr_self(span); let self_expr = ecx.expr_self(span);
ecx.expr_method_call(span, self_expr, primal, args.clone()) ecx.expr_method_call(span, self_expr, primal, args)
} else { } else {
let args: ThinVec<_> = let args: ThinVec<_> =
idents.iter().map(|arg| ecx.expr_path(ecx.path_ident(span, *arg))).collect(); idents.iter().map(|arg| ecx.expr_path(ecx.path_ident(span, *arg))).collect();