chapter11: check for cproj instead of proj in idealize_if

SeaOfNodes · Jan 15, 2025 · 7d0fb93 · 7d0fb93
1 parent e2586a3
commit 7d0fb93
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/src/sea_of_nodes/nodes/idealize.rs b/src/sea_of_nodes/nodes/idealize.rs
@@ -477,7 +477,7 @@ impl<'t> Nodes<'t> {
                     let if_pred = self.inputs[d][1]?;
                     if_pred.add_dep(node, self);
                     if if_pred == pred {
-                        if let Op::Proj(p) = &self[prior] {
+                        if let Op::CProj(p) = &self[prior] {
                             let value = if p.index == 0 {
                                 self.types.ty_int_one
                             } else {

diff --git a/src/sea_of_nodes/nodes/node.rs b/src/sea_of_nodes/nodes/node.rs
@@ -74,7 +74,7 @@ impl<'t> Op<'t> {
     pub fn label(&self) -> Cow<str> {
         Borrowed(match self {
             Op::Constant(ty) => return Owned(format!("#{ty}")),
-            Op::XCtrl => "XCtrl",
+            Op::XCtrl => "Xctrl",
             Op::Return => "Return",
             Op::Start { .. } => "Start",
             Op::Add => "Add",

diff --git a/src/sea_of_nodes/parser.rs b/src/sea_of_nodes/parser.rs
@@ -71,7 +71,6 @@ impl<'s, 't> Parser<'s, 't> {
         nodes.start = Start::new(&[types.ty_ctrl, arg], &mut nodes);
 
         let stop = Stop::new(&mut nodes);
-        nodes.ty[stop] = Some(types.ty_bot); // differs from java; ensures that it isn't dead
 
         nodes.zero = Constant::new(types.ty_int_zero, &mut nodes)
             .peephole(&mut nodes)