fix bug with missing entry labels being misused between original labels and numeric label ids, and add test

3 files changed, 44 insertions, 5 deletions

diff --git a/src/analyzer.js b/src/analyzer.js
index 1453b22c..cbb4f28e 100644
--- a/src/analyzer.js
+++ b/src/analyzer.js
@@ -9,7 +9,7 @@ var VAR_NATIVIZED = 'nativized';
 var VAR_EMULATED = 'emulated';
 
 var ENTRY_IDENT = toNiceIdent('%0');
-var ENTRY_IDENTS = set(toNiceIdent('%0'), toNiceIdent('%1'));
+var ENTRY_IDENT_IDS = set(0, 1); // XXX
 
 function recomputeLines(func) {
   func.lines = func.labels.map(function(label) { return label.lines }).reduce(concatenator, []);
@@ -1180,7 +1180,9 @@ function analyzer(data, sidePass) {
         func.labelIdsInverse = {};
         func.labelIds[toNiceIdent('%0')] = 0;
         func.labelIdsInverse[0] = toNiceIdent('%0');
-        func.labelIdCounter = 1;
+        func.labelIds[toNiceIdent('%1')] = 1;
+        func.labelIdsInverse[1] = toNiceIdent('%1');
+        func.labelIdCounter = 2;
         func.labels.forEach(function(label) {
           func.labelIds[label.ident] = func.labelIdCounter++;
           func.labelIdsInverse[func.labelIdCounter-1] = label.ident;
@@ -1206,6 +1208,7 @@ function analyzer(data, sidePass) {
             if (phi.intertype == 'phi') {
               for (var i = 0; i < phi.params.length; i++) {
                 phi.params[i].label = func.labelIds[phi.params[i].label];
+                assert(phi.params[i].label);
               }
             }
           });
@@ -1221,9 +1224,10 @@ function analyzer(data, sidePass) {
         // So we need to handle that in a special way here.
         function getActualLabelId(labelId) {
           if (func.labelsDict[labelId]) return labelId;
-          if (labelId in ENTRY_IDENTS) {
-            assert(func.labelsDict[ENTRY_IDENT]);
-            return ENTRY_IDENT;
+          if (labelId in ENTRY_IDENT_IDS) {
+            labelId = func.labelIds[ENTRY_IDENT];
+            assert(func.labelsDict[labelId]);
+            return labelId;
           }
           return null;
         }
@@ -1327,6 +1331,7 @@ function analyzer(data, sidePass) {
               if (phi.intertype == 'phi') {
                 for (var i = 0; i < phi.params.length; i++) {
                   var param = phi.params[i];
+                  assert(param.label);
                   var sourceLabelId = getActualLabelId(param.label);
                   if (sourceLabelId) {
                     var sourceLabel = func.labelsDict[sourceLabelId];
diff --git a/tests/cases/phientryimplicitmoar.ll b/tests/cases/phientryimplicitmoar.ll
new file mode 100644
index 00000000..c83458e6
--- /dev/null
+++ b/tests/cases/phientryimplicitmoar.ll
@@ -0,0 +1,28 @@
+; ModuleID = 'tests/hello_world.bc'
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32-n8:16:32-S128"
+target triple = "i386-pc-linux-gnu"
+
+@.str = private unnamed_addr constant [15 x i8] c"hello, world!\0A\00", align 1 ; [#uses=1 type=[15 x i8]*]
+@.str2 = private unnamed_addr constant [15 x i8] c"hello!!world!\0A\00", align 1 ; [#uses=1 type=[15 x i8]*]
+
+define i32 @main() {
+  %retval = alloca i32, align 4
+  %call2 = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([15 x i8]* @.str2, i32 0, i32 0))
+  %a12 = zext i1 1 to i32
+  br label %13
+
+; <label>:13                                      ; preds = %13, %1
+  %a14 = phi i32 [ %a12, %1 ], [ %a15, %13 ]
+  %call0 = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([15 x i8]* @.str, i32 0, i32 0))
+  %a15 = add nsw i32 %a14, 2
+  %a16 = icmp eq i32 %a15, 9
+  br i1 %a16, label %17, label %13
+
+; <label>:17                                      ; preds = %1
+  %call1 = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([15 x i8]* @.str2, i32 0, i32 0))
+  ret i32 1
+}
+
+; [#uses=1]
+declare i32 @printf(i8*, ...)
+
diff --git a/tests/cases/phientryimplicitmoar.txt b/tests/cases/phientryimplicitmoar.txt
new file mode 100644
index 00000000..50e5e9ae
--- /dev/null
+++ b/tests/cases/phientryimplicitmoar.txt
@@ -0,0 +1,6 @@
+hello!!world!
+hello, world!
+hello, world!
+hello, world!
+hello, world!
+hello!!world!