emit proper redirect thunks in side modules

Author: kripken

emscripten.py

@@ -165,6 +165,8 @@ def fix_dot_zero(m):
     metadata['declares'] = filter(lambda i64_func: i64_func not in ['getHigh32', 'setHigh32', '__muldi3', '__divdi3', '__remdi3', '__udivdi3', '__uremdi3'], metadata['declares']) # FIXME: do these one by one as normal js lib funcs
 
     # Integrate info from backend
+    if settings['SIDE_MODULE']:
+      settings['DEFAULT_LIBRARY_FUNCS_TO_INCLUDE'] = [] # we don't need any JS library contents in side modules
     settings['DEFAULT_LIBRARY_FUNCS_TO_INCLUDE'] = list(
       set(settings['DEFAULT_LIBRARY_FUNCS_TO_INCLUDE'] + map(shared.JS.to_nice_ident, metadata['declares'])).difference(
         map(lambda x: x[1:], metadata['implementedFunctions'])
@@ -306,7 +308,7 @@ def move_preasm(m):
       contents = m.groups(0)[0]
       outfile.write(contents + '\n')
       return ''
-    if not settings['BOOTSTRAPPING_STRUCT_INFO']:
+    if not settings['BOOTSTRAPPING_STRUCT_INFO'] and not settings['SIDE_MODULE']:
       funcs_js[1] = re.sub(r'/\* PRE_ASM \*/(.*)\n', lambda m: move_preasm(m), funcs_js[1])
 
     class Counter:

src/jsifier.js

@@ -62,7 +62,7 @@ function JSify(data, functionsOnly) {
     var libFuncsToInclude;
     if (INCLUDE_FULL_LIBRARY) {
       assert(!(BUILD_AS_SHARED_LIB || SIDE_MODULE), 'Cannot have both INCLUDE_FULL_LIBRARY and BUILD_AS_SHARED_LIB/SIDE_MODULE set.')
-      libFuncsToInclude = MAIN_MODULE ? DEFAULT_LIBRARY_FUNCS_TO_INCLUDE.slice(0) : [];
+      libFuncsToInclude = (MAIN_MODULE || SIDE_MODULE) ? DEFAULT_LIBRARY_FUNCS_TO_INCLUDE.slice(0) : [];
       for (var key in LibraryManager.library) {
         if (!key.match(/__(deps|postset|inline|asm|sig)$/)) {
           libFuncsToInclude.push(key);
@@ -125,7 +125,7 @@ function JSify(data, functionsOnly) {
 
       var noExport = false;
 
-      if (!LibraryManager.library.hasOwnProperty(ident) && !LibraryManager.library.hasOwnProperty(ident + '__inline')) {
+      if ((!LibraryManager.library.hasOwnProperty(ident) && !LibraryManager.library.hasOwnProperty(ident + '__inline')) || SIDE_MODULE) {
         if (notDep) {
           if (VERBOSE || ident.substr(0, 11) !== 'emscripten_') { // avoid warning on emscripten_* functions which are for internal usage anyhow
             if (ERROR_ON_UNDEFINED_SYMBOLS) error('unresolved symbol: ' + ident);
@@ -136,7 +136,12 @@ function JSify(data, functionsOnly) {
           // emit a stub that will fail at runtime
           LibraryManager.library[shortident] = new Function("Module['printErr']('missing function: " + shortident + "'); abort(-1);");
         } else {
-          LibraryManager.library[shortident] = new Function("return Module['_" + shortident + "'].apply(null, arguments);");
+          LibraryManager.library[shortident] = new Function("return " + (MAIN_MODULE ? '' : 'parent') + "Module['_" + shortident + "'].apply(null, arguments);");
+          if (SIDE_MODULE) {
+            // no dependencies, just emit the thunk
+            Functions.libraryFunctions[finalName] = 1;
+            return processLibraryFunction(LibraryManager.library[shortident], ident, finalName);
+          }
           noExport = true;
         }
       }
@@ -206,7 +211,6 @@ function JSify(data, functionsOnly) {
         EXPORTED_FUNCTIONS[finalName] = 1;
         Functions.libraryFunctions[finalName] = 2;
       }
-      if (SIDE_MODULE) return ';'; // we import into the side module js library stuff from the outside parent 
       if ((EXPORT_ALL || (finalName in EXPORTED_FUNCTIONS)) && !noExport) {
         contentText += '\nModule["' + finalName + '"] = ' + finalName + ';';
       }

tests/test_core.py

@@ -3776,7 +3776,7 @@ def test_dylink_class(self):
     ''', side=r'''
       #include "header.h"
       Class::Class(const char *name) { printf("new %s\n", name); }
-    ''', expected=['new main\n'], need_reverse=False)
+    ''', expected=['new main\n'])
 
   def test_random(self):
     src = r'''#include <stdlib.h>