diff options
| author | Ralf Jung <post@ralfj.de> | 2023-09-08 08:48:41 +0200 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2023-09-15 10:43:44 +0200 |
| commit | 22e13b4c55b65e0f73483cb3a61a091feef64d47 (patch) | |
| tree | 287338b327f96200ec879f3aaa7876fa6fa03c87 | |
| parent | d7766ffa36d2f3a518181b16c1732fe2751e809d (diff) | |
| download | rust-22e13b4c55b65e0f73483cb3a61a091feef64d47.tar.gz rust-22e13b4c55b65e0f73483cb3a61a091feef64d47.zip | |
clarify PassMode::Indirect as well
| -rw-r--r-- | src/abi.rs | 6 | ||||
| -rw-r--r-- | src/intrinsic/mod.rs | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/abi.rs b/src/abi.rs index 377dc753f68..9c93a1b52fa 100644 --- a/src/abi.rs +++ b/src/abi.rs @@ -129,7 +129,7 @@ impl<'gcc, 'tcx> FnAbiGccExt<'gcc, 'tcx> for FnAbi<'tcx, Ty<'tcx>> { argument_tys.push(arg.layout.scalar_pair_element_gcc_type(cx, 1)); continue; } - PassMode::Indirect { extra_attrs: Some(_), .. } => { + PassMode::Indirect { meta_attrs: Some(_), .. } => { unimplemented!(); } PassMode::Cast(ref cast, pad_i32) => { @@ -139,11 +139,11 @@ impl<'gcc, 'tcx> FnAbiGccExt<'gcc, 'tcx> for FnAbi<'tcx, Ty<'tcx>> { } cast.gcc_type(cx) } - PassMode::Indirect { extra_attrs: None, on_stack: true, .. } => { + PassMode::Indirect { meta_attrs: None, on_stack: true, .. } => { on_stack_param_indices.insert(argument_tys.len()); arg.memory_ty(cx) }, - PassMode::Indirect { extra_attrs: None, on_stack: false, .. } => cx.type_ptr_to(arg.memory_ty(cx)), + PassMode::Indirect { meta_attrs: None, on_stack: false, .. } => cx.type_ptr_to(arg.memory_ty(cx)), }; argument_tys.push(arg_ty); } diff --git a/src/intrinsic/mod.rs b/src/intrinsic/mod.rs index f8c32c6dbbb..b59a17b5cad 100644 --- a/src/intrinsic/mod.rs +++ b/src/intrinsic/mod.rs @@ -511,10 +511,10 @@ impl<'gcc, 'tcx> ArgAbiExt<'gcc, 'tcx> for ArgAbi<'tcx, Ty<'tcx>> { PassMode::Pair(..) => { OperandValue::Pair(next(), next()).store(bx, dst); }, - PassMode::Indirect { extra_attrs: Some(_), .. } => { + PassMode::Indirect { meta_attrs: Some(_), .. } => { OperandValue::Ref(next(), Some(next()), self.layout.align.abi).store(bx, dst); }, - PassMode::Direct(_) | PassMode::Indirect { extra_attrs: None, .. } | PassMode::Cast(..) => { + PassMode::Direct(_) | PassMode::Indirect { meta_attrs: None, .. } | PassMode::Cast(..) => { let next_arg = next(); self.store(bx, next_arg, dst); }, |