From a57cb34aa388866f1621a4a59005970604dab0a7 Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Mon, 13 May 2019 16:14:41 -0700 Subject: [PATCH] . --- src/library.js | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/library.js b/src/library.js index b8a5a92b6743..f0df8227910b 100644 --- a/src/library.js +++ b/src/library.js @@ -2152,32 +2152,34 @@ LibraryManager.library = { } var lib = LDSO.loadedLibs[handle]; - var is_main_module = lib.module == Module; + var isMainModule = lib.module == Module; var mangled = '_' + symbol; - var mod_symbol = mangled; + var modSymbol = mangled; #if WASM_BACKEND - if (!is_main_module) { - mod_symbol = symbol; + if (!isMainModule) { + modSymbol = symbol; } - var asm_symbol = symbol; -#else - var asm_symbol = mangled; #endif - if (!lib.module.hasOwnProperty(mod_symbol)) { - DLFCN.errorMsg = ('Tried to lookup unknown symbol "' + mod_symbol + + if (!lib.module.hasOwnProperty(modSymbol)) { + DLFCN.errorMsg = ('Tried to lookup unknown symbol "' + modSymbol + '" in dynamic lib: ' + lib.name); return 0; } - var result = lib.module[mod_symbol]; + var result = lib.module[modSymbol]; #if WASM // Attempt to get the real "unwrapped" symbol so we have more chance of // getting wasm function which can be added to a table. - if (is_main_module) { - if (lib.module["asm"][asm_symbol]) { - result = lib.module["asm"][asm_symbol]; + if (isMainModule) { +#if WASM_BACKEND + var asmSymbol = symbol; +#else + var asmSymbol = mangled; +#endif + if (lib.module["asm"][asmSymbol]) { + result = lib.module["asm"][asmSymbol]; } } #endif