Skip to content

Commit aa9175e

Browse files
Add support for noalias function parameters
1 parent 4ffa425 commit aa9175e

File tree

1 file changed

+29
-12
lines changed

1 file changed

+29
-12
lines changed

src/abi.rs

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use rustc_codegen_ssa::traits::{AbiBuilderMethods, BaseTypeMethods};
33
use rustc_data_structures::fx::FxHashSet;
44
use rustc_middle::bug;
55
use rustc_middle::ty::Ty;
6-
use rustc_target::abi::call::{CastTarget, FnAbi, PassMode, Reg, RegKind};
6+
use rustc_target::abi::call::{ArgAttributes, CastTarget, FnAbi, PassMode, Reg, RegKind};
77

88
use crate::builder::Builder;
99
use crate::context::CodegenCx;
@@ -120,30 +120,47 @@ impl<'gcc, 'tcx> FnAbiGccExt<'gcc, 'tcx> for FnAbi<'tcx, Ty<'tcx>> {
120120
}
121121
};
122122

123+
#[cfg(feature = "master")]
124+
let apply_attrs = |ty: Type<'gcc>, attrs: &ArgAttributes| {
125+
if attrs.regular.contains(rustc_target::abi::call::ArgAttribute::NoAlias) {
126+
ty.make_restrict()
127+
} else {
128+
ty
129+
}
130+
};
131+
#[cfg(not(feature = "master"))]
132+
let apply_attrs = |ty: Type<'gcc>, _attrs: &ArgAttributes| {
133+
ty
134+
};
135+
123136
for arg in self.args.iter() {
124137
let arg_ty = match arg.mode {
125138
PassMode::Ignore => continue,
126-
PassMode::Direct(_) => arg.layout.immediate_gcc_type(cx),
127-
PassMode::Pair(..) => {
128-
argument_tys.push(arg.layout.scalar_pair_element_gcc_type(cx, 0, true));
129-
argument_tys.push(arg.layout.scalar_pair_element_gcc_type(cx, 1, true));
139+
PassMode::Pair(a, b) => {
140+
argument_tys.push(apply_attrs(arg.layout.scalar_pair_element_gcc_type(cx, 0, true), &a));
141+
argument_tys.push(apply_attrs(arg.layout.scalar_pair_element_gcc_type(cx, 1, true), &b));
130142
continue;
131143
}
132-
PassMode::Indirect { extra_attrs: Some(_), .. } => {
133-
unimplemented!();
134-
}
135144
PassMode::Cast(ref cast, pad_i32) => {
136145
// add padding
137146
if pad_i32 {
138147
argument_tys.push(Reg::i32().gcc_type(cx));
139148
}
140-
cast.gcc_type(cx)
149+
let ty = cast.gcc_type(cx);
150+
apply_attrs(ty, &cast.attrs)
141151
}
142-
PassMode::Indirect { extra_attrs: None, on_stack: true, .. } => {
152+
PassMode::Indirect { attrs, extra_attrs: None, on_stack: true } => {
143153
on_stack_param_indices.insert(argument_tys.len());
144-
arg.memory_ty(cx)
154+
apply_attrs(arg.memory_ty(cx), &attrs)
145155
},
146-
PassMode::Indirect { extra_attrs: None, on_stack: false, .. } => cx.type_ptr_to(arg.memory_ty(cx)),
156+
PassMode::Direct(attrs) => apply_attrs(arg.layout.immediate_gcc_type(cx), &attrs),
157+
PassMode::Indirect { attrs, extra_attrs: None, on_stack: false } => {
158+
apply_attrs(cx.type_ptr_to(arg.memory_ty(cx)), &attrs)
159+
}
160+
PassMode::Indirect { attrs, extra_attrs: Some(extra_attrs), on_stack } => {
161+
assert!(!on_stack);
162+
apply_attrs(apply_attrs(cx.type_ptr_to(arg.memory_ty(cx)), &attrs), &extra_attrs)
163+
}
147164
};
148165
argument_tys.push(arg_ty);
149166
}

0 commit comments

Comments
 (0)