properly resolve multilevel function aliases, fixes bug with adding indexing for aliases. also optimize function indexing in compiler

3 files changed, 26 insertions, 11 deletions

diff --git a/src/jsifier.js b/src/jsifier.js
index 45177c3f..b02164f6 100644
--- a/src/jsifier.js
+++ b/src/jsifier.js
@@ -341,7 +341,7 @@ function JSify(data, functionsOnly, givenFunctions) {
       var ret = [item];
       item.JS = 'var ' + item.ident + ';';
       // Set the actual value in a postset, since it may be a global variable. We also order by dependencies there
-      var value = finalizeLLVMParameter(item.value);
+      var value = Variables.globals[item.ident].resolvedAlias = finalizeLLVMParameter(item.value);
       ret.push({
         intertype: 'GlobalVariablePostSet',
         ident: item.ident,
diff --git a/src/modules.js b/src/modules.js
index 3ce4a541..49f93e61 100644
--- a/src/modules.js
+++ b/src/modules.js
@@ -254,22 +254,37 @@ var Functions = {
   // All the function idents seen so far
   allIdents: [],
 
-  indexedFunctions: [0, 0], // Start at a non-0 (even, see below) value
+  indexedFunctions: {},
+  nextIndex: 2, // Start at a non-0 (even, see below) value
 
   // Mark a function as needing indexing, and returns the index
   getIndex: function(ident) {
-    var key = this.indexedFunctions.indexOf(ident);
-    if (key < 0) {
-      key = this.indexedFunctions.length;
-      this.indexedFunctions[key] = ident;
-      this.indexedFunctions[key+1] = 0; // Need to have keys be even numbers, see |polymorph| test
+    var ret = this.indexedFunctions[ident];
+    if (!ret) {
+      ret = this.nextIndex;
+      this.nextIndex += 2; // Need to have indexes be even numbers, see |polymorph| test
+      this.indexedFunctions[ident] = ret;
     }
-    return key.toString();
+    return ret.toString();
   },
 
   // Generate code for function indexing
   generateIndexing: function() {
-    var indices = this.indexedFunctions.toString().replace('"', '');
+    var vals = zeros(this.nextIndex);
+    for (var ident in this.indexedFunctions) {
+      vals[this.indexedFunctions[ident]] = ident;
+    }
+
+    // Resolve multi-level aliases all the way down
+    for (var i = 0; i < vals.length; i++) {
+      while (1) {
+        var varData = Variables.globals[vals[i]];
+        if (!(varData && varData.resolvedAlias)) break;
+        vals[i] = vals[varData.resolvedAlias];
+      }
+    }
+
+    var indices = vals.toString().replace('"', '');
     if (BUILD_AS_SHARED_LIB) {
       // Shared libraries reuse the parent's function table.
       return 'FUNCTION_TABLE = FUNCTION_TABLE.concat([' + indices + ']);';
diff --git a/src/parseTools.js b/src/parseTools.js
index 92a360ad..24c38296 100644
--- a/src/parseTools.js
+++ b/src/parseTools.js
@@ -951,8 +951,8 @@ function makeGetValue(ptr, pos, type, noNeedFirst, unsigned, ignore, align, noSa
 }
 
 function indexizeFunctions(value, type) {
-  assert((type && type !== '?') || (typeof value === 'string' && value.substr(0, 6) === 'CHECK_'), 'No type given for function indexizing: ' + [value, type]);
-  assert(value !== type, 'Type set to value: ' + [value, type]);
+  assert((type && type !== '?') || (typeof value === 'string' && value.substr(0, 6) === 'CHECK_'), 'No type given for function indexizing');
+  assert(value !== type, 'Type set to value');
   if (type && isFunctionType(type) && value[0] === '_') { // checking for _ differentiates from $ (local vars)
     if (BUILD_AS_SHARED_LIB) {
       return '(FUNCTION_TABLE_OFFSET + ' + Functions.getIndex(value) + ')';