From edfc96628e5b2941bcc358b8b92e7d5aa46b4a86 Mon Sep 17 00:00:00 2001
From: Folkert <folkert@folkertdev.nl>
Date: Sat, 17 Oct 2020 14:53:57 +0200
Subject: [PATCH] WIP

---
 compiler/constrain/src/expr.rs       |  2 ++
 compiler/gen/src/llvm/build.rs       |  1 +
 compiler/gen/tests/gen_primitives.rs | 30 ++++++++++++++++++++++++++++
 compiler/gen/tests/helpers/eval.rs   |  6 ++++--
 compiler/load/src/file.rs            |  2 +-
 compiler/mono/src/ir.rs              |  3 +++
 compiler/solve/src/solve.rs          | 19 +++++++++++-------
 7 files changed, 53 insertions(+), 10 deletions(-)

diff --git a/compiler/constrain/src/expr.rs b/compiler/constrain/src/expr.rs
index 646b8b4af1..e2fb4e1aa0 100644
--- a/compiler/constrain/src/expr.rs
+++ b/compiler/constrain/src/expr.rs
@@ -322,8 +322,10 @@ pub fn constrain_expr(
             arguments,
             loc_body: boxed,
             captured_symbols,
+            name,
             ..
         } => {
+            dbg!(name, &captured_symbols);
             let loc_body_expr = &**boxed;
             let mut state = PatternState {
                 headers: SendMap::default(),
diff --git a/compiler/gen/src/llvm/build.rs b/compiler/gen/src/llvm/build.rs
index e614d19b35..c448094df2 100644
--- a/compiler/gen/src/llvm/build.rs
+++ b/compiler/gen/src/llvm/build.rs
@@ -1841,6 +1841,7 @@ pub fn build_proc_header<'a, 'ctx, 'env>(
     let args = proc.args;
     let arena = env.arena;
     let context = &env.context;
+
     let ret_type = basic_type_from_layout(arena, context, &proc.ret_layout, env.ptr_bytes);
     let mut arg_basic_types = Vec::with_capacity_in(args.len(), arena);
     let mut arg_symbols = Vec::new_in(arena);
diff --git a/compiler/gen/tests/gen_primitives.rs b/compiler/gen/tests/gen_primitives.rs
index 6ae3135fef..ac9d757058 100644
--- a/compiler/gen/tests/gen_primitives.rs
+++ b/compiler/gen/tests/gen_primitives.rs
@@ -972,4 +972,34 @@ mod gen_primitives {
             i64
         );
     }
+
+    #[test]
+    fn io_poc() {
+        use roc_std::RocStr;
+        assert_evals_to!(
+            indoc!(
+                r#"
+                app Test provides [ main ] imports []
+
+                Effect a : [ @Effect ({} -> a) ]
+
+                succeed : a -> Effect a
+                succeed = \x -> @Effect \{} -> x
+
+                foo : Effect Float
+                foo = 
+                    succeed 3.14
+
+                runEffect : Effect a -> a
+                runEffect = \@Effect thunk -> thunk {}
+
+                main = 
+                    runEffect foo
+
+                "#
+            ),
+            RocStr::from_slice(&"Foo".as_bytes()),
+            RocStr
+        );
+    }
 }
diff --git a/compiler/gen/tests/helpers/eval.rs b/compiler/gen/tests/helpers/eval.rs
index 19557b798b..3bd6d785a3 100644
--- a/compiler/gen/tests/helpers/eval.rs
+++ b/compiler/gen/tests/helpers/eval.rs
@@ -191,6 +191,7 @@ pub fn helper<'a>(
     // because their bodies may reference each other.
     let mut scope = Scope::default();
     for ((symbol, layout), proc) in procedures.drain() {
+        dbg!(&symbol, &layout);
         let fn_val = build_proc_header(&env, &mut layout_ids, symbol, &layout, &proc);
 
         if proc.args.is_empty() {
@@ -229,7 +230,8 @@ pub fn helper<'a>(
                 mode,
             );
 
-            fn_val.print_to_stderr();
+            // fn_val.print_to_stderr();
+            module.print_to_stderr();
 
             panic!(
                 "The preceding code was from {:?}, which failed LLVM verification in {} build.",
@@ -347,7 +349,7 @@ macro_rules! assert_evals_to {
             assert_llvm_evals_to!($src, $expected, $ty, $transform, $leak);
         }
         {
-            assert_opt_evals_to!($src, $expected, $ty, $transform, $leak);
+            // assert_opt_evals_to!($src, $expected, $ty, $transform, $leak);
         }
     };
 }
diff --git a/compiler/load/src/file.rs b/compiler/load/src/file.rs
index 0e875b48d5..aa77879834 100644
--- a/compiler/load/src/file.rs
+++ b/compiler/load/src/file.rs
@@ -1440,7 +1440,7 @@ fn update<'a>(
             {
                 // state.timings.insert(module_id, module_timing);
 
-                Proc::insert_refcount_operations(arena, &mut state.procedures);
+                // Proc::insert_refcount_operations(arena, &mut state.procedures);
 
                 msg_tx
                     .send(Msg::FinishedAllSpecialization {
diff --git a/compiler/mono/src/ir.rs b/compiler/mono/src/ir.rs
index 8638a6017e..bc2277d73f 100644
--- a/compiler/mono/src/ir.rs
+++ b/compiler/mono/src/ir.rs
@@ -2350,6 +2350,8 @@ pub fn with_hole<'a>(
                 Located::at_zero(roc_can::pattern::Pattern::Identifier(record_symbol)),
             )];
 
+            dbg!("aaaa");
+
             match procs.insert_anonymous(
                 env,
                 name,
@@ -2491,6 +2493,7 @@ pub fn with_hole<'a>(
         } => {
             let loc_body = *boxed_body;
 
+            dbg!("bbb");
             match procs.insert_anonymous(
                 env,
                 name,
diff --git a/compiler/solve/src/solve.rs b/compiler/solve/src/solve.rs
index 6e74bdd0fb..ad215a0319 100644
--- a/compiler/solve/src/solve.rs
+++ b/compiler/solve/src/solve.rs
@@ -1155,13 +1155,18 @@ fn adjust_rank_content(
                 Func(arg_vars, closure_var, ret_var) => {
                     let mut rank = adjust_rank(subs, young_mark, visit_mark, group_rank, ret_var);
 
-                    rank = rank.max(adjust_rank(
-                        subs,
-                        young_mark,
-                        visit_mark,
-                        group_rank,
-                        closure_var,
-                    ));
+                    // TODO investigate further.
+                    //
+                    // My theory is that because the closure_var contains variables already
+                    // contained in the signature only, it does not need to be part of the rank
+                    // calculuation
+                    //                    rank = rank.max(adjust_rank(
+                    //                        subs,
+                    //                        young_mark,
+                    //                        visit_mark,
+                    //                        group_rank,
+                    //                        closure_var,
+                    //                    ));
 
                     for var in arg_vars {
                         rank = rank.max(adjust_rank(subs, young_mark, visit_mark, group_rank, var));