1 files changed, 8 insertions, 4 deletions

diff --git a/src/jsifier.js b/src/jsifier.js
index 0e5f8ef3..f638ea08 100644
--- a/src/jsifier.js
+++ b/src/jsifier.js
@@ -234,8 +234,8 @@ function JSify(data, functionsOnly, givenFunctions) {
   function globalVariableHandler(item) {
     function needsPostSet(value) {
       if (typeof value !== 'string') return false;
-      return value[0] in UNDERSCORE_OPENPARENS || value.substr(0, 14) === 'CHECK_OVERFLOW'
-                                               || value.substr(0, 6) === 'GLOBAL';
+      // (' is ok, as it is something we can indexize later into a concrete int: ('{{ FI_ ...
+      return /^([(_][^']|CHECK_OVERFLOW|GLOBAL).*/.test(value);
     }
 
     item.intertype = 'GlobalVariableStub';
@@ -308,6 +308,8 @@ function JSify(data, functionsOnly, givenFunctions) {
             JS: makeSetValue(makeGlobalUse(item.ident), i, value, structTypes[i], false, true) + ';' // ignore=true, since e.g. rtti and statics cause lots of safe_heap errors
           });
           constant[i] = '0';
+        } else {
+          if (typeof value === 'string') constant[i] = deParenCarefully(value);
         }
       });
 
@@ -405,6 +407,9 @@ function JSify(data, functionsOnly, givenFunctions) {
       var snippet = LibraryManager.library[ident];
       var redirectedIdent = null;
       var deps = LibraryManager.library[ident + '__deps'] || [];
+      deps.forEach(function(dep) {
+        if (typeof snippet === 'string' && !(dep in LibraryManager.library)) warn('missing library dependency ' + dep + ', make sure you are compiling with the right options (see #ifdefs in src/library*.js)');
+      });
       var isFunction = false;
 
       if (typeof snippet === 'string') {
@@ -536,7 +541,6 @@ function JSify(data, functionsOnly, givenFunctions) {
         case 'unreachable': line.JS = unreachableHandler(line); break;
         default: throw 'what is this line? ' + dump(line);
       }
-      assert(line.JS);
       //if (ASM_JS) assert(line.JS.indexOf('var ') < 0, dump(line));
       if (line.assignTo) makeAssign(line);
       Framework.currItem = null;
@@ -1361,7 +1365,7 @@ function JSify(data, functionsOnly, givenFunctions) {
       if (item.allocatedSize === 0) return ''; // This will not actually be shown - it's nativized
       return asmCoercion(getFastValue('sp', '+', item.allocatedIndex.toString()), 'i32');
     } else {
-      return RuntimeGenerator.stackAlloc(getFastValue(calcAllocatedSize(item.allocatedType), '*', item.allocatedNum));
+      return RuntimeGenerator.stackAlloc(getFastValue(calcAllocatedSize(item.allocatedType), '*', item.ident));
     }
   }
   function va_argHandler(item) {