fix bug with using an implicit label in a phi more than once

4 files changed, 37 insertions, 14 deletions

diff --git a/src/analyzer.js b/src/analyzer.js
index a4e7d52d..c5a8cea3 100644
--- a/src/analyzer.js
+++ b/src/analyzer.js
@@ -87,7 +87,7 @@ function analyzer(data, sidePass) {
         } else if (item.functions.length > 0 && item.functions.slice(-1)[0].endLineNum === null) {
           // Internal line
           if (!currLabelFinished) {
-            item.functions.slice(-1)[0].labels.slice(-1)[0].lines.push(subItem); // If this line fails, perhaps missing a label? LLVM_STYLE related?
+            item.functions.slice(-1)[0].labels.slice(-1)[0].lines.push(subItem); // If this line fails, perhaps missing a label?
             if (subItem.intertype === 'branch') {
               currLabelFinished = true;
             }
@@ -1018,8 +1018,11 @@ function analyzer(data, sidePass) {
         function getActualLabelId(labelId) {
           var label = func.labelsDict[labelId];
           if (!label) {
-            assert(!unknownEntry, 'More than one unknown label in phi, so both cannot be an unlabelled entry, in ' + func.ident);
-            unknownEntry = labelId;
+            if (!unknownEntry) {
+              unknownEntry = labelId;
+            } else {
+              assert(labelId == unknownEntry, 'More than one unknown label in phi, so both cannot be an unlabelled entry, in ' + func.ident);
+            }
             labelId = ENTRY_IDENT;
             label = func.labelsDict[labelId];
             assert(label, 'Cannot find entry label when looking for it after seeing an unknown label in a phi');
diff --git a/src/intertyper.js b/src/intertyper.js
index d03810d4..341598fc 100644
--- a/src/intertyper.js
+++ b/src/intertyper.js
@@ -29,14 +29,6 @@ function intertyper(data, sidePass, baseLineNums) {
 
   dprint('framework', 'Big picture: Starting intertyper, main pass=' + mainPass);
 
-  if (mainPass) {
-    if (LLVM_STYLE === null) {
-      // new = clang on 2.8, old = llvm-gcc anywhere or clang on 2.7
-      LLVM_STYLE = (data.indexOf('<label>') == -1 && data.indexOf('entry:') != -1) ? 'old' : 'new';
-      //dprint('LLVM_STYLE: ' + LLVM_STYLE);
-    }
-  }
-
   // Substrate
 
   var substrate = new Substrate('Intertyper');
@@ -347,7 +339,7 @@ function intertyper(data, sidePass, baseLineNums) {
             if (tokensLength >= 3 && token0Text == 'landingpad')
               return 'Landingpad';
           } else if (item.indent === 0) {
-            if ((tokensLength >= 1 && token0Text.substr(-1) == ':') || // LLVM 2.7 format, or llvm-gcc in 2.8
+            if ((tokensLength >= 1 && token0Text.substr(-1) == ':') ||
                 (tokensLength >= 3 && token1Text == '<label>'))
               return 'Label';
             if (tokensLength >= 4 && token0Text == 'declare')
diff --git a/src/modules.js b/src/modules.js
index cfc29014..52f14c2f 100644
--- a/src/modules.js
+++ b/src/modules.js
@@ -2,8 +2,6 @@
 
 // Various namespace-like modules
 
-var LLVM_STYLE = null;
-
 var LLVM = {
   LINKAGES: set('private', 'linker_private', 'linker_private_weak', 'linker_private_weak_def_auto', 'internal',
                 'available_externally', 'linkonce', 'common', 'weak', 'appending', 'extern_weak', 'linkonce_odr',
diff --git a/tests/cases/phientryimplicitmix.ll b/tests/cases/phientryimplicitmix.ll
new file mode 100644
index 00000000..9223c059
--- /dev/null
+++ b/tests/cases/phientryimplicitmix.ll
@@ -0,0 +1,30 @@
+; 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"
+
+; Phi nodes can refer to the entry. And the entry might be unnamed, and doesn't even have a consistent implicit name!
+
+@.str = private unnamed_addr constant [15 x i8] c"hello, world!\0A\00", align 1 ; [#uses=1 type=[15 x i8]*]
+
+; [#uses=0]
+define i32 @main() {
+  %retval = alloca i32, align 4                   ; [#uses=1 type=i32*]
+  %16 = trunc i32 1 to i1
+  br i1 %16, label %whoosh, label %26, !dbg !1269853  ; [debug line = 3920:5]
+
+whoosh: ; preds = %1
+  %25 = trunc i32 1 to i1
+  br label %26
+
+; <label>:26                                      ; preds = %17, %1
+  %27 = phi i1 [ false, %1 ], [ %25, %whoosh ]        ; [#uses=1 type=i1]
+  %28 = phi i1 [ true, %1 ], [ %25, %whoosh ]        ; [#uses=1 type=i1]
+  store i32 0, i32* %retval
+  %call = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([15 x i8]* @.str, i32 0, i32 0)) ; [#uses=0 type=i32]
+  %cal2 = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([15 x i8]* @.str, i32 0, i32 0), i32 %27) ; make sure %27 is used
+  %cal3 = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([15 x i8]* @.str, i32 0, i32 0), i32 %28) ; make sure %28 is used
+  ret i32 1
+}
+
+; [#uses=1]
+declare i32 @printf(i8*, ...)