handle dollar in alias names

2 files changed, 30 insertions, 3 deletions

diff --git a/src/intertyper.js b/src/intertyper.js
index c5a9583b..a1e1b0f2 100644
--- a/src/intertyper.js
+++ b/src/intertyper.js
@@ -69,11 +69,11 @@ function intertyper(data, sidePass, baseLineNums) {
 
         if (mainPass && (line[0] == '%' || line[0] == '@')) {
           // If this isn't a type, it's a global variable, make a note of the information now, we will need it later
-          var testType = /[@%\w\d\.\" ]+ = type .*/.exec(line);
+          var testType = /[@%\w\d\.\" $]+ = type .*/.exec(line);
           if (!testType) {
-            var global = /([@%\w\d\.\" ]+) = .*/.exec(line);
+            var global = /([@%\w\d\.\" $]+) = .*/.exec(line);
             var globalIdent = toNiceIdent(global[1]);
-            var testAlias = /[@%\w\d\.\" ]+ = alias .*/.exec(line);
+            var testAlias = /[@%\w\d\.\" $]+ = alias .*/.exec(line);
             var testString = /^[^"]+c\"[^"]+"/.exec(line);
             Variables.globals[globalIdent] = {
               name: globalIdent,
diff --git a/tests/cases/aliasbitcastdollar.ll b/tests/cases/aliasbitcastdollar.ll
new file mode 100644
index 00000000..1ecf6047
--- /dev/null
+++ b/tests/cases/aliasbitcastdollar.ll
@@ -0,0 +1,27 @@
+; 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]
+
+@"other$name" = alias bitcast (void ()* @original to void (i32)*) ; [#uses=1]
+
+; [#uses=2]
+define void @original() {
+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:
+  call void @"other$name"(i32 5)
+  ret i32 0
+}