properly parse ctors fully; fixes #1155

3 files changed, 55 insertions, 1 deletions

diff --git a/src/intertyper.js b/src/intertyper.js
index 781c8187..94a096f3 100644
--- a/src/intertyper.js
+++ b/src/intertyper.js
@@ -531,7 +531,9 @@ function intertyper(lines, sidePass, baseLineNums) {
         if (item.tokens[3].item) {
           var subTokens = item.tokens[3].item.tokens;
           splitTokenList(subTokens).forEach(function(segment) {
-            var ctor = toNiceIdent(segment[1].tokens.slice(-1)[0].text);
+            var parsed = parseLLVMSegment(segment);
+            assert(parsed.intertype === 'structvalue');
+            var ctor = toNiceIdent(parsed.params[1].ident);
             ret.ctors.push(ctor);
             if (ASM_JS) { // must export the global constructors from asm.js module, so mark as implemented and exported
               Functions.implementedFunctions[ctor] = 'v';
diff --git a/tests/cases/ctors_cast.ll b/tests/cases/ctors_cast.ll
new file mode 100644
index 00000000..d94b1d63
--- /dev/null
+++ b/tests/cases/ctors_cast.ll
@@ -0,0 +1,49 @@
+; ModuleID = '/tmp/tmpHcVUBJ/a.out.bc'
+target datalayout = "e-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-p:32:32:32-v128:32:32"
+target triple = "le32-unknown-nacl"
+
+%struct.Other = type { i8 }
+
+@.str = private unnamed_addr constant [17 x i8] c"autorun called!\0A\00", align 1
+@other = internal global %struct.Other zeroinitializer, align 1
+@.str1 = private unnamed_addr constant [14 x i8] c"main called!\0A\00", align 1
+@.str2 = private unnamed_addr constant [7 x i8] c"Other\0A\00", align 1
+@llvm.global_ctors = appending global [2 x { i32, void ()* }] [{ i32, void ()* } { i32 65535, void ()* bitcast (i32 ()* @_Z7autorunv to void ()*) }, { i32, void ()* } { i32 65535, void ()* @_GLOBAL__I_a }]
+
+define internal i32 @_Z7autorunv() {
+  %1 = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([17 x i8]* @.str, i32 0, i32 0))
+  ret i32 0
+}
+
+declare i32 @printf(i8*, ...)
+
+define internal void @__cxx_global_var_init() {
+  call void @_ZN5OtherC1Ev(%struct.Other* @other)
+  ret void
+}
+
+define internal void @_ZN5OtherC1Ev(%struct.Other* %this) unnamed_addr align 2 {
+  %1 = alloca %struct.Other*, align 4
+  store %struct.Other* %this, %struct.Other** %1, align 4
+  %2 = load %struct.Other** %1
+  call void @_ZN5OtherC2Ev(%struct.Other* %2)
+  ret void
+}
+
+define i32 @main() {
+  %1 = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([14 x i8]* @.str1, i32 0, i32 0))
+  ret i32 0
+}
+
+define internal void @_ZN5OtherC2Ev(%struct.Other* %this) unnamed_addr align 2 {
+  %1 = alloca %struct.Other*, align 4
+  store %struct.Other* %this, %struct.Other** %1, align 4
+  %2 = load %struct.Other** %1
+  %3 = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([7 x i8]* @.str2, i32 0, i32 0))
+  ret void
+}
+
+define internal void @_GLOBAL__I_a() {
+  call void @__cxx_global_var_init()
+  ret void
+}
diff --git a/tests/cases/ctors_cast.txt b/tests/cases/ctors_cast.txt
new file mode 100644
index 00000000..8a3f62a7
--- /dev/null
+++ b/tests/cases/ctors_cast.txt
@@ -0,0 +1,3 @@
+autorun called!
+Other
+main called!