diff options
| -rwxr-xr-x | emscripten.py | 4 | ||||
| -rw-r--r-- | tests/test_core.py | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/emscripten.py b/emscripten.py index 77082aee..0b1c0bf4 100755 --- a/emscripten.py +++ b/emscripten.py @@ -862,15 +862,13 @@ def emscript_fast(infile, settings, outfile, libraries=[], compiler_engine=None, pre = parts[0] funcs_js.append(parts[1]) - # calculations on merged forwarded data TODO - # merge forwarded data assert settings.get('ASM_JS'), 'fastcomp is asm.js only' settings['EXPORTED_FUNCTIONS'] = forwarded_json['EXPORTED_FUNCTIONS'] all_exported_functions = set(settings['EXPORTED_FUNCTIONS']) # both asm.js and otherwise for additional_export in settings['DEFAULT_LIBRARY_FUNCS_TO_INCLUDE']: # additional functions to export from asm, if they are implemented all_exported_functions.add('_' + additional_export) - exported_implemented_functions = set() + exported_implemented_functions = set(metadata['exports']) export_bindings = settings['EXPORT_BINDINGS'] export_all = settings['EXPORT_ALL'] for key in metadata['implementedFunctions'] + forwarded_json['Functions']['implementedFunctions'].keys(): # XXX perf diff --git a/tests/test_core.py b/tests/test_core.py index d7e2bbcb..ec25a733 100644 --- a/tests/test_core.py +++ b/tests/test_core.py @@ -1892,8 +1892,6 @@ class T(RunnerCore): # Short name, to make it more fun to use manually on the co self.do_run_from_file(src, output, [], lambda x, err: x.replace('\n', '*')) def test_llvm_used(self): - if os.environ.get('EMCC_FAST_COMPILER') == '1': return self.skip('pnacl kills llvm_used') - Building.LLVM_OPTS = 3 test_path = path_from_root('tests', 'core', 'test_llvm_used') |