revert mono tests

This commit is contained in:
Folkert 2021-02-17 01:05:03 +01:00
parent 80736f93b9
commit e6ec85eeba
3 changed files with 32 additions and 55 deletions

View file

@ -60,24 +60,6 @@ mod cli_run {
panic!("failed to parse the `valgrind` xml output. Error was:\n\n{:?}\n\nvalgrind xml was: \"{}\"\n\nvalgrind stdout was: \"{}\"\n\nvalgrind stderr was: \"{}\"", err, raw_xml, valgrind_out.stdout, valgrind_out.stderr);
});
// #[derive(Debug, Deserialize, Clone)]
// pub struct ValgrindError {
// kind: String,
// #[serde(default)]
// what: Option<String>,
// #[serde(default)]
// xwhat: Option<ValgrindErrorXWhat>,
// }
//
// #[derive(Debug, Deserialize, Clone)]
// pub struct ValgrindErrorXWhat {
// text: String,
// #[serde(default)]
// leakedbytes: Option<isize>,
// #[serde(default)]
// leakedblocks: Option<isize>,
// }
if !memory_errors.is_empty() {
for error in memory_errors {
let ValgrindError {
@ -245,6 +227,7 @@ mod cli_run {
);
}
#[ignore]
#[test]
#[serial(closure1)]
fn closure1() {
@ -257,6 +240,7 @@ mod cli_run {
);
}
#[ignore]
#[test]
#[serial(closure2)]
fn closure2() {
@ -269,8 +253,8 @@ mod cli_run {
);
}
#[test]
#[ignore]
#[test]
#[serial(closure3)]
fn closure3() {
check_output(
@ -282,6 +266,7 @@ mod cli_run {
);
}
#[ignore]
#[test]
#[serial(closure4)]
fn closure4() {

View file

@ -195,8 +195,11 @@ impl<'a> Proc<'a> {
pub fn insert_refcount_operations(
arena: &'a Bump,
procs: &mut MutMap<(Symbol, Layout<'a>), Proc<'a>>,
passed_by_pointer: &MutMap<(Symbol, Layout<'a>), Symbol>,
_passed_by_pointer: &MutMap<(Symbol, Layout<'a>), Symbol>,
) {
// currently we ignore the passed-by-pointerness
let passed_by_pointer = &Default::default();
let borrow_params =
arena.alloc(crate::borrow::infer_borrow(arena, procs, passed_by_pointer));
@ -207,6 +210,11 @@ impl<'a> Proc<'a> {
let layout = key.1.clone();
procs.insert((*other, layout), proc);
} else {
unreachable!(
"we need a by-pointer version of {:?}, but its by-name version does not exist",
key.0
)
}
}
@ -5621,12 +5629,13 @@ where
}
fn call_by_pointer<'a>(
env: &mut Env<'a, '_>,
_env: &mut Env<'a, '_>,
procs: &mut Procs<'a>,
symbol: Symbol,
layout: Layout<'a>,
) -> Expr<'a> {
let other = env.unique_symbol();
// let other = env.unique_symbol();
let other = symbol;
procs
.passed_by_pointer

View file

@ -650,12 +650,8 @@ mod test_mono {
let Test.3 = lowlevel DictSize #Attr.2;
ret Test.3;
procedure Test.5 ():
let Test.4 = lowlevel DictEmpty ;
ret Test.4;
procedure Test.0 ():
let Test.2 = FunctionPointer Test.5;
let Test.2 = FunctionPointer Dict.2;
let Test.1 = CallByName Dict.6 Test.2;
ret Test.1;
"#
@ -1778,11 +1774,11 @@ mod test_mono {
indoc!(
r#"
procedure List.4 (#Attr.2, #Attr.3, #Attr.4):
let Test.23 = lowlevel ListLen #Attr.2;
let Test.21 = lowlevel NumLt #Attr.3 Test.23;
if Test.21 then
let Test.22 = lowlevel ListSet #Attr.2 #Attr.3 #Attr.4;
ret Test.22;
let Test.22 = lowlevel ListLen #Attr.2;
let Test.20 = lowlevel NumLt #Attr.3 Test.22;
if Test.20 then
let Test.21 = lowlevel ListSet #Attr.2 #Attr.3 #Attr.4;
ret Test.21;
else
ret #Attr.2;
@ -1802,24 +1798,17 @@ mod test_mono {
ret Test.10;
procedure Test.2 (Test.3):
let Test.17 = 0i64;
let Test.18 = 0i64;
let Test.19 = 0i64;
let Test.17 = CallByName List.4 Test.3 Test.18 Test.19;
ret Test.17;
procedure Test.24 ():
let Test.11 = 1i64;
let Test.12 = 2i64;
let Test.13 = 3i64;
let Test.10 = Array [Test.11, Test.12, Test.13];
ret Test.10;
let Test.16 = CallByName List.4 Test.3 Test.17 Test.18;
ret Test.16;
procedure Test.0 ():
let Test.16 = FunctionPointer Test.24;
let Test.15 = CallByName Test.2 Test.16;
let Test.5 = CallByName List.7 Test.15;
dec Test.15;
let Test.8 = FunctionPointer Test.14;
let Test.15 = FunctionPointer Test.1;
let Test.14 = CallByName Test.2 Test.15;
let Test.5 = CallByName List.7 Test.14;
dec Test.14;
let Test.8 = FunctionPointer Test.1;
let Test.6 = CallByName List.7 Test.8;
dec Test.8;
let Test.4 = CallByName Num.24 Test.5 Test.6;
@ -2356,13 +2345,10 @@ mod test_mono {
r#"
procedure Test.1 (Test.5):
let Test.2 = 42i64;
let Test.13 = FunctionPointer Test.16;
let Test.13 = FunctionPointer Test.3;
let Test.3 = Struct {Test.13, Test.2};
ret Test.3;
procedure Test.16 (Test.11, #Attr.12):
ret #Attr.12;
procedure Test.3 (Test.11, #Attr.12):
ret #Attr.12;
@ -2407,14 +2393,11 @@ mod test_mono {
procedure Test.1 (Test.5):
let Test.2 = 41i64;
let Test.12 = FunctionPointer Test.15;
let Test.12 = FunctionPointer Test.3;
let Test.11 = Struct {Test.12, Test.2};
let Test.10 = Array [Test.11];
ret Test.10;
procedure Test.15 (Test.9, #Attr.12):
ret #Attr.12;
procedure Test.3 (Test.9, #Attr.12):
ret #Attr.12;