AbleOS/holey-bytes
3
3
Fork 5
Code Issues 2 Pull requests Packages Projects Releases Wiki Activity

fixing arg datarace

Browse source
This commit is contained in:
Jakub Doka 2024-10-12 22:21:20 +02:00
parent bf00dc85b2
commit 9e65f3949d
No known key found for this signature in database
GPG key ID: C6E9A89936B8C143
3 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lang/src/codegen.rs
View file

@ -1755,11 +1755,11 @@ impl Codegen {
Some(if let Some(sig) = fuc.sig { Some(if let Some(sig) = fuc.sig {
sig sig
} else { } else {
let arg_base = self.tys.ins.args.len(); let arg_base = self.tys.tmp.args.len();
for (arg, carg) in args.iter().zip(cargs) { for (arg, carg) in args.iter().zip(cargs) {
let ty = self.ty(&carg.ty); let ty = self.ty(&carg.ty);
self.tys.ins.args.push(ty); self.tys.tmp.args.push(ty);
let sym = parser::find_symbol(&fast.symbols, carg.id); let sym = parser::find_symbol(&fast.symbols, carg.id);
let loc = if sym.flags & idfl::COMPTIME == 0 { let loc = if sym.flags & idfl::COMPTIME == 0 {
// FIXME: could fuck us // FIXME: could fuck us
@ -1771,7 +1771,7 @@ impl Codegen {
"TODO: we dont support anything except type generics" "TODO: we dont support anything except type generics"
); );
let arg = self.expr_ctx(arg, Ctx::default().with_ty(ty))?; let arg = self.expr_ctx(arg, Ctx::default().with_ty(ty))?;
self.tys.ins.args.push(arg.loc.to_ty().unwrap()); self.tys.tmp.args.push(arg.loc.to_ty().unwrap());
arg.loc arg.loc
}; };
@ -1976,7 +1976,7 @@ impl Codegen {
_ => self.report( _ => self.report(
pos, pos,
format_args!( format_args!(
"expected expression to evaluate to struct (or array maybe) ({})", "expected expression to evaluate to struct (or array maybe) but it evaluated to {}",
self.ty_display(ty) self.ty_display(ty)
), ),
), ),
@ -2498,7 +2498,7 @@ impl Codegen {
file, file,
name: id, name: id,
sig: 'b: { sig: 'b: {
let arg_base = self.tys.ins.args.len(); let arg_base = self.tys.tmp.args.len();
for arg in args { for arg in args {
let sym = find_symbol(&self.files[file as usize].symbols, arg.id); let sym = find_symbol(&self.files[file as usize].symbols, arg.id);
if sym.flags & idfl::COMPTIME != 0 { if sym.flags & idfl::COMPTIME != 0 {
@ -2506,7 +2506,7 @@ impl Codegen {
break 'b None; break 'b None;
} }
let ty = self.ty(&arg.ty); let ty = self.ty(&arg.ty);
self.tys.ins.args.push(ty); self.tys.tmp.args.push(ty);
} }
let args = self.pack_args(pos, arg_base); let args = self.pack_args(pos, arg_base);
@ -2728,7 +2728,9 @@ impl Codegen {
} }
fn pack_args(&mut self, pos: Pos, arg_base: usize) -> ty::Tuple { fn pack_args(&mut self, pos: Pos, arg_base: usize) -> ty::Tuple {
let needle = &self.tys.ins.args[arg_base..]; let base = self.tys.ins.args.len();
self.tys.ins.args.extend(self.tys.tmp.args.drain(arg_base..));
let needle = &self.tys.ins.args[base..];
if needle.is_empty() { if needle.is_empty() {
return ty::Tuple::empty(); return ty::Tuple::empty();
} }
@ -2736,7 +2738,7 @@ impl Codegen {
// FIXME: maybe later when this becomes a bottleneck we use more // FIXME: maybe later when this becomes a bottleneck we use more
// efficient search (SIMD?, indexing?) // efficient search (SIMD?, indexing?)
let sp = self.tys.ins.args.windows(needle.len()).position(|val| val == needle).unwrap(); let sp = self.tys.ins.args.windows(needle.len()).position(|val| val == needle).unwrap();
self.tys.ins.args.truncate((sp + needle.len()).max(arg_base)); self.tys.ins.args.truncate((sp + needle.len()).max(base));
ty::Tuple::new(sp, len) ty::Tuple::new(sp, len)
.unwrap_or_else(|| self.report(pos, "amount of arguments not supported")) .unwrap_or_else(|| self.report(pos, "amount of arguments not supported"))
} }

1
lang/src/lib.rs
View file

@ -800,6 +800,7 @@ struct TypesTmp {
frontier: Vec<ty::Id>, frontier: Vec<ty::Id>,
globals: Vec<ty::Global>, globals: Vec<ty::Global>,
funcs: Vec<ty::Func>, funcs: Vec<ty::Func>,
args: Vec<ty::Id>,
} }
#[derive(Default)] #[derive(Default)]

4
lang/src/son.rs
View file

@ -2078,12 +2078,12 @@ impl Codegen {
file, file,
name: id, name: id,
sig: '_b: { sig: '_b: {
let arg_base = self.tys.ins.args.len(); let arg_base = self.tys.tmp.args.len();
for arg in args { for arg in args {
let sym = parser::find_symbol(&f.symbols, arg.id); let sym = parser::find_symbol(&f.symbols, arg.id);
assert!(sym.flags & idfl::COMPTIME == 0, "TODO"); assert!(sym.flags & idfl::COMPTIME == 0, "TODO");
let ty = self.ty(&arg.ty); let ty = self.ty(&arg.ty);
self.tys.ins.args.push(ty); self.tys.tmp.args.push(ty);
} }
let Some(args) = self.pack_args(arg_base) else { let Some(args) = self.pack_args(arg_base) else {