fix bug in state edge passthrough aw yeah

dag_in_context/src/greedy_dag_extractor.rs

@@ -858,13 +858,19 @@ pub fn extract_with_paths(
     let root_costset_index = *extractor
         .costs
         .get(&root_eclass)
-        .expect("Failed to extract program! Also failed to extract any functions in program.")
+        .expect(&format!("Failed to extract function {}!", func))
         .get(&root_eclass)
         .unwrap_or_else(|| {
             if effectful_paths.is_some() {
-                panic!("Failed to extract program after linear path is found!");
+                panic!(
+                    "Failed to extract function {} after linear path is found!",
+                    func
+                );
             } else {
-                panic!("Failed to extract program during initial extraction!");
+                panic!(
+                    "Failed to extract function {} during initial extraction!",
+                    func
+                );
             }
         });
     let root_costset = extractor.costsets[root_costset_index].clone();

dag_in_context/src/lib.rs

@@ -291,7 +291,7 @@ pub fn optimize(
 
         // if we are inlining, save the program
         // TODO we inline on the first pass, but this should be configurable from the schedule
-        let inline_program = if i == 0 { Some(res.clone()) } else { None };
+        let inline_program = if i == 100000 { Some(res.clone()) } else { None };
 
         for func in fns {
             log::info!("Running pass {} on {}", i, func);

dag_in_context/src/schedule.rs

@@ -4,7 +4,7 @@ pub(crate) fn helpers() -> String {
 
     (saturate type-helpers)
     (saturate error-checking)
-    state-edge-passthrough
+    ;state-edge-passthrough
 
     (saturate
         (saturate type-helpers)
@@ -26,11 +26,13 @@ pub(crate) fn helpers() -> String {
     apply-subst-unions
     cleanup-subst
 
-    subsume-after-helpers
-
     (saturate boundary-analysis)
-)"
-    .to_string()
+)
+
+;; be careful to finish dropping and substituting before subsuming things!
+;; otherwise substitution or dropat may not finish, violating the weak linearity invariant
+subsume-after-helpers"
+        .to_string()
 }
 
 fn cheap_optimizations() -> Vec<String> {