properly identify function pointers that return things like [64 x i16]*

3 files changed, 37 insertions, 1 deletions

diff --git a/src/parseTools.js b/src/parseTools.js
index 81fa61d9..158e6340 100644
--- a/src/parseTools.js
+++ b/src/parseTools.js
@@ -169,7 +169,15 @@ function isFunctionDef(token, out) {
 
 function isFunctionType(type, out) {
   type = type.replace(/"[^"]+"/g, '".."');
-  var parts = type.split(' ');
+  var parts;
+  // hackish, but quick splitting of function def parts. this must be fast as it happens a lot
+  if (type[0] != '[') {
+    parts = type.split(' ');
+  } else {
+    var index = type.search(']');
+    index += type.substr(index).search(' ');
+    parts = [type.substr(0, index), type.substr(index+1)];
+  }
   if (pointingLevels(type) !== 1) return false;
   var text = removeAllPointing(parts.slice(1).join(' '));
   if (!text) return false;
diff --git a/tests/cases/funcptr.ll b/tests/cases/funcptr.ll
new file mode 100644
index 00000000..07e2bf91
--- /dev/null
+++ b/tests/cases/funcptr.ll
@@ -0,0 +1,27 @@
+; 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 [17 x i8] c"hello %d world!\0A\00", align 1 ; [#uses=1 type=[17 x i8]*]
+
+; [#uses=0]
+define i32 @main() {
+entry:
+  %retval = alloca i32, align 4                   ; [#uses=1 type=i32*]
+  store i32 0, i32* %retval
+  %access_virt_barray = bitcast i32 0 to [64 x i16]* (i32*, i32)**
+  store [64 x i16]* (i32*, i32)* @access_virt_barray, [64 x i16]* (i32*, i32)** %access_virt_barray, align 4
+  %wakaptr = bitcast [64 x i16]* (i32*, i32)** %access_virt_barray to i32*
+  %waka = load i32* %wakaptr
+  %waka2 = icmp eq i32 %waka, 0
+  %waka3 = zext i1 %waka2 to i32
+  %call = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([17 x i8]* @.str, i32 0, i32 0), i32 %waka3) ; [#uses=0 type=i32]
+  ret i32 1
+}
+
+define [64 x i16]* @access_virt_barray(i32*, i32) {
+  ret void
+}
+
+; [#uses=1]
+declare i32 @printf(i8*, ...)
diff --git a/tests/cases/funcptr.txt b/tests/cases/funcptr.txt
new file mode 100644
index 00000000..1030830d
--- /dev/null
+++ b/tests/cases/funcptr.txt
@@ -0,0 +1 @@
+hello 0 world!