handle llvm funcs in aliases

3 files changed, 45 insertions, 6 deletions

diff --git a/src/intertyper.js b/src/intertyper.js
index 969a43d8..ea6b6019 100644
--- a/src/intertyper.js
+++ b/src/intertyper.js
@@ -400,14 +400,16 @@ function intertyper(data, parseFunctions, baseLineNum) {
       if (item.tokens[2].text == 'alias') {
         cleanOutTokens(LLVM.LINKAGES, item.tokens, 3);
         cleanOutTokens(LLVM.VISIBILITIES, item.tokens, 3);
-        Types.needAnalysis[item.tokens[3].text] = 0;
-        return [{
+        var last = getTokenIndexByText(item.tokens, ';');
+        var ret = {
           intertype: 'alias',
           ident: toNiceIdent(item.tokens[0].text),
-          aliasee: toNiceIdent(item.tokens[4].text),
-          type: item.tokens[3].text,
+          value: parseLLVMSegment(item.tokens.slice(3, last)),
           lineNum: item.lineNum
-        }];
+        };
+        ret.type = ret.value.type;
+        Types.needAnalysis[ret.type] = 0;
+        return [ret];
       }
       if (item.tokens[2].text == 'type') {
         var fields = [];
diff --git a/src/jsifier.js b/src/jsifier.js
index b1f42567..e24b8e73 100644
--- a/src/jsifier.js
+++ b/src/jsifier.js
@@ -258,7 +258,7 @@ function JSify(data, functionsOnly, givenFunctions, givenGlobalVariables) {
       // Set the actual value in a postset, since it may be a global variable. TODO: handle alias of alias (needs ordering)
       ret.push({
         intertype: 'GlobalVariablePostSet',
-        JS: item.ident + ' = ' + item.aliasee + ';'
+        JS: item.ident + ' = ' + finalizeLLVMParameter(item.value) + ';'
       });
       return ret;
     }
diff --git a/tests/cases/aliasbitcast.ll b/tests/cases/aliasbitcast.ll
new file mode 100644
index 00000000..70dc64ef
--- /dev/null
+++ b/tests/cases/aliasbitcast.ll
@@ -0,0 +1,37 @@
+; ModuleID = '/tmp/emscripten/tmp/src.cpp.o'
+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"
+target triple = "i386-pc-linux-gnu"
+
+@.str = private constant [14 x i8] c"hello, world!\00", align 1 ; [#uses=1]
+
+@_ZN16FormWidgetChoiceD2Ev = alias bitcast (i32 678 to i8*) ; [#uses=1]
+
+; [#uses=2]
+define void @"\01_Z5hellov"() {
+entry:
+  %0 = call i32 bitcast (i32 (i8*)* @puts to i32 (i32*)*)(i8* getelementptr inbounds ([14 x i8]* @.str, i32 0, i32 0)) ; [#uses=0]
+  br label %return
+
+return:                                           ; preds = %entry
+  ret void
+}
+
+; [#uses=1]
+declare i32 @puts(i8*)
+
+; [#uses=0]
+define i32 @main() {
+entry:
+  %retval = alloca i32                            ; [#uses=2]
+  %0 = alloca i32                                 ; [#uses=2]
+  %"alloca point" = bitcast i32 0 to i32          ; [#uses=0]
+  call void @"\01_Z5hellov"()
+  store i32 0, i32* %0, align 4
+  %1 = load i32* %0, align 4                      ; [#uses=1]
+  store i32 %1, i32* %retval, align 4
+  br label %return
+
+return:                                           ; preds = %entry
+  %retval1 = load i32* %retval                    ; [#uses=1]
+  ret i32 %retval1
+}