bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Delete some useless casts from global_allocator expansion

Browse source
This commit is contained in:
David Tolnay 2023-08-05 23:06:23 -07:00
parent 11467b1c2a
commit e57a89174c
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82
1 changed files with 6 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
compiler/rustc_builtin_macros/src/global_allocator.rs
View file

@ -78,11 +78,11 @@ impl AllocFnFactory<'_, '_> {
}; };
let args = method.inputs.iter().map(|ty| self.arg_ty(ty, &mut abi_args, &mut mk)).collect(); let args = method.inputs.iter().map(|ty| self.arg_ty(ty, &mut abi_args, &mut mk)).collect();
let result = self.call_allocator(method.name, args); let result = self.call_allocator(method.name, args);
let (output_ty, output_expr) = self.ret_ty(&method.output, result); let output_ty = self.ret_ty(&method.output);
let decl = self.cx.fn_decl(abi_args, ast::FnRetTy::Ty(output_ty)); let decl = self.cx.fn_decl(abi_args, ast::FnRetTy::Ty(output_ty));
let header = FnHeader { unsafety: Unsafe::Yes(self.span), ..FnHeader::default() }; let header = FnHeader { unsafety: Unsafe::Yes(self.span), ..FnHeader::default() };
let sig = FnSig { decl, header, span: self.span }; let sig = FnSig { decl, header, span: self.span };
let body = Some(self.cx.block_expr(output_expr)); let body = Some(self.cx.block_expr(result));
let kind = ItemKind::Fn(Box::new(Fn { let kind = ItemKind::Fn(Box::new(Fn {
defaultness: ast::Defaultness::Final, defaultness: ast::Defaultness::Final,
sig, sig,
@ -140,8 +140,7 @@ impl AllocFnFactory<'_, '_> {
AllocatorTy::Ptr => { AllocatorTy::Ptr => {
let ident = ident(); let ident = ident();
args.push(self.cx.param(self.span, ident, self.ptr_u8())); args.push(self.cx.param(self.span, ident, self.ptr_u8()));
let arg = self.cx.expr_ident(self.span, ident); self.cx.expr_ident(self.span, ident)
self.cx.expr_cast(self.span, arg, self.ptr_u8())
} }
AllocatorTy::Usize => { AllocatorTy::Usize => {
@ -156,18 +155,11 @@ impl AllocFnFactory<'_, '_> {
} }
} }
fn ret_ty(&self, ty: &AllocatorTy, expr: P<Expr>) -> (P<Ty>, P<Expr>) { fn ret_ty(&self, ty: &AllocatorTy) -> P<Ty> {
match *ty { match *ty {
AllocatorTy::ResultPtr => { AllocatorTy::ResultPtr => self.ptr_u8(),
// We're creating:
//
// #expr as *mut u8
let expr = self.cx.expr_cast(self.span, expr, self.ptr_u8()); AllocatorTy::Unit => self.cx.ty(self.span, TyKind::Tup(ThinVec::new())),
(self.ptr_u8(), expr)
}
AllocatorTy::Unit => (self.cx.ty(self.span, TyKind::Tup(ThinVec::new())), expr),
AllocatorTy::Layout | AllocatorTy::Usize | AllocatorTy::Ptr => { AllocatorTy::Layout | AllocatorTy::Usize | AllocatorTy::Ptr => {
panic!("can't convert `AllocatorTy` to an output") panic!("can't convert `AllocatorTy` to an output")