Fix: Phi sources preserve unassigned version_0.

Author: dylan-sutton-chavez

compiler/src/modules/parser.rs

@@ -244,16 +244,8 @@ impl<'src, I: Iterator<Item = Token>> Parser<'src, I> {
             let vb = *b.get(&name).unwrap_or(&0);
             if va == vb { continue; }
 
-            let ia = if va == 0 {
-                self.chunk.push_name(&format!("{}_{}", name, vb))
-            } else {
-                self.chunk.push_name(&format!("{}_{}", name, va))
-            };
-            let ib = if vb == 0 {
-                self.chunk.push_name(&format!("{}_{}", name, va))
-            } else {
-                self.chunk.push_name(&format!("{}_{}", name, vb))
-            };
+            let ia = self.chunk.push_name(&format!("{}_{}", name, va));
+            let ib = self.chunk.push_name(&format!("{}_{}", name, vb));
 
             let v  = self.increment_version(&name);
             let ix = self.chunk.push_name(&format!("{}_{}", name, v));

compiler/tests/cases/parser_cases.json

@@ -304,8 +304,8 @@
   {
     "src": "if a:\nx = 1", 
     "constants": ["1"], 
-    "names": ["a_0", "x_1", "x_2"], 
-    "instructions": [["LoadName",0], ["JumpIfFalse",4], ["LoadConst",0], ["StoreName",1], ["Phi",2], ["ReturnValue",0]], 
+    "names": ["a_0", "x_1", "x_0", "x_2"],
+    "instructions": [["LoadName",0], ["JumpIfFalse",4], ["LoadConst",0], ["StoreName",1], ["Phi",3], ["ReturnValue",0]], 
     "annotations": {}
   },
   {
@@ -325,15 +325,15 @@
   {
     "src": "total = 0\nfor i in range(5):\ntotal = total + i", 
     "constants": ["0", "5"], 
-    "names": ["total_1", "i_1", "total_2", "i_2", "total_3"], 
-    "instructions": [["LoadConst",0], ["StoreName",0], ["LoadConst",1], ["CallRange",1], ["GetIter",0], ["ForIter",12], ["StoreName",1], ["LoadName",0], ["LoadName",1], ["Add",0], ["StoreName",2], ["Jump",5], ["Phi",3], ["Phi",4], ["ReturnValue",0]], 
+    "names": ["total_1", "i_1", "total_2", "i_0", "i_2", "total_3"], 
+    "instructions": [["LoadConst",0], ["StoreName",0], ["LoadConst",1], ["CallRange",1], ["GetIter",0], ["ForIter",12], ["StoreName",1], ["LoadName",0], ["LoadName",1], ["Add",0], ["StoreName",2], ["Jump",5], ["Phi",4], ["Phi",5], ["ReturnValue",0]], 
     "annotations": {}
   },
   {
     "src": "for i in range(3):\nprint(i)", 
     "constants": ["3"], 
-    "names": ["i_1", "i_2"], 
-    "instructions": [["LoadConst",0], ["CallRange",1], ["GetIter",0], ["ForIter",8], ["StoreName",0], ["LoadName",0], ["CallPrint",0], ["Jump",3], ["Phi",1], ["ReturnValue",0]], 
+    "names": ["i_1", "i_0", "i_2"], 
+    "instructions": [["LoadConst",0], ["CallRange",1], ["GetIter",0], ["ForIter",8], ["StoreName",0], ["LoadName",0], ["CallPrint",0], ["Jump",3], ["Phi",2], ["ReturnValue",0]], 
     "annotations": {}
   },
   {
@@ -381,8 +381,8 @@
   {
     "src": "s = 0\nfor i in range(10):\ns += i", 
     "constants": ["0", "10"], 
-    "names": ["s_1", "i_1", "s_2", "i_2", "s_3"], 
-    "instructions": [["LoadConst",0], ["StoreName",0], ["LoadConst",1], ["CallRange",1], ["GetIter",0], ["ForIter",12], ["StoreName",1], ["LoadName",0], ["LoadName",1], ["Add",0], ["StoreName",2], ["Jump",5], ["Phi",3], ["Phi",4], ["ReturnValue",0]], 
+    "names": ["s_1", "i_1", "s_2", "i_0", "i_2", "s_3"], 
+    "instructions": [["LoadConst",0], ["StoreName",0], ["LoadConst",1], ["CallRange",1], ["GetIter",0], ["ForIter",12], ["StoreName",1], ["LoadName",0], ["LoadName",1], ["Add",0], ["StoreName",2], ["Jump",5], ["Phi",4], ["Phi",5], ["ReturnValue",0]], 
     "annotations": {}
   },
   {
@@ -423,15 +423,15 @@
   {
     "src": "if True:\n    x = 1\n    y = 2\nz = x", 
     "constants": ["1", "2"], 
-    "names": ["x_1", "y_1", "x_2", "y_2", "z_1"], 
-    "instructions": [["LoadTrue",0], ["JumpIfFalse",6], ["LoadConst",0], ["StoreName",0], ["LoadConst",1], ["StoreName",1], ["Phi",2], ["Phi",3], ["LoadName",2], ["StoreName",4], ["ReturnValue",0]], 
+    "names": ["x_1", "y_1", "x_0", "x_2", "y_0", "y_2", "z_1"], 
+    "instructions": [["LoadTrue",0], ["JumpIfFalse",6], ["LoadConst",0], ["StoreName",0], ["LoadConst",1], ["StoreName",1], ["Phi",3], ["Phi",5], ["LoadName",3], ["StoreName",6], ["ReturnValue",0]], 
     "annotations": {}
   },
   {
     "src": "for i in range(3):\n    x = i\n    print(x)", 
     "constants": ["3"], 
-    "names": ["i_1", "x_1", "i_2", "x_2"], 
-    "instructions": [["LoadConst",0], ["CallRange",1], ["GetIter",0], ["ForIter",10], ["StoreName",0], ["LoadName",0], ["StoreName",1], ["LoadName",1], ["CallPrint",0], ["Jump",3], ["Phi",2], ["Phi",3], ["ReturnValue",0]], 
+    "names": ["i_1", "x_1", "i_0", "i_2", "x_0", "x_2"], 
+    "instructions": [["LoadConst",0], ["CallRange",1], ["GetIter",0], ["ForIter",10], ["StoreName",0], ["LoadName",0], ["StoreName",1], ["LoadName",1], ["CallPrint",0], ["Jump",3], ["Phi",3], ["Phi",5], ["ReturnValue",0]], 
     "annotations": {}
   },
   {
@@ -521,8 +521,8 @@
   {
     "src": "try:\n    x = 1\nexcept:\n    x = 2", 
     "constants": ["1", "2"], 
-    "names": ["x_1", "x_2", "x_3"], 
-    "instructions": [["SetupExcept",5], ["LoadConst",0], ["StoreName",0], ["PopExcept",0], ["Jump",7], ["LoadConst",1], ["StoreName",1], ["Phi",2], ["ReturnValue",0]], 
+    "names": ["x_1", "x_2", "x_0", "x_3"], 
+    "instructions": [["SetupExcept",5], ["LoadConst",0], ["StoreName",0], ["PopExcept",0], ["Jump",7], ["LoadConst",1], ["StoreName",1], ["Phi",3], ["ReturnValue",0]], 
     "annotations": {}
   },
   {
@@ -939,22 +939,20 @@
   {
     "src": "for i in range(3):\n    pass\nelse:\n    x = 1", 
     "constants": ["3", "1"], 
-    "names": ["i_1", "x_1", "i_2", "x_2"], 
-    "instructions": [["LoadConst",0], ["CallRange",1], ["GetIter",0], ["ForIter",6], ["StoreName",0], ["Jump",3], ["LoadConst",1], ["StoreName",1], ["Phi",2], ["Phi",3], ["ReturnValue",0]], 
+    "names": ["i_1", "x_1", "i_0", "i_2", "x_0", "x_2"], 
+    "instructions": [["LoadConst",0], ["CallRange",1], ["GetIter",0], ["ForIter",6], ["StoreName",0], ["Jump",3], ["LoadConst",1], ["StoreName",1], ["Phi",3], ["Phi",5], ["ReturnValue",0]], 
     "annotations": {}
   },
   {
     "src": "while x:\n    pass\nelse:\n    y = 1", 
     "constants": ["1"], 
-    "names": ["x_0", "y_1", "y_2"], 
-    "instructions": [["LoadName",0], ["JumpIfFalse",3], ["Jump",0], ["LoadConst",0], ["StoreName",1], ["Phi",2], ["ReturnValue",0]], 
+    "names": ["x_0", "y_1", "y_0", "y_2"], 
+    "instructions": [["LoadName",0], ["JumpIfFalse",3], ["Jump",0], ["LoadConst",0], ["StoreName",1], ["Phi",3], ["ReturnValue",0]], 
     "annotations": {}
   },
   {
-    "src": "try:\n    x = 1\nexcept:\n    x = 2\nelse:\n    x = 3", 
-    "constants": ["1", "2", "3"], 
-    "names": ["x_1", "x_2", "x_3", "x_4"], 
-    "instructions": [["SetupExcept",5], ["LoadConst",0], ["StoreName",0], ["PopExcept",0], ["Jump",7], ["LoadConst",1], ["StoreName",1], ["LoadConst",2], ["StoreName",2], ["Phi",3], ["ReturnValue",0]], 
+    "src": "try:\n    x = 1\nexcept:\n    x = 2\nelse:\n    x = 3", "constants": ["1", "2", "3"], "names": ["x_1", "x_2", "x_3", "x_0", "x_4"], 
+    "instructions": [["SetupExcept",5], ["LoadConst",0], ["StoreName",0], ["PopExcept",0], ["Jump",7], ["LoadConst",1], ["StoreName",1], ["LoadConst",2], ["StoreName",2], ["Phi",4], ["ReturnValue",0]], 
     "annotations": {}
   },
   {