Add missing reverse deps for some sockets code (#9158)

Fixes #9154
emscripten-core · Aug 9, 2019 · 9c317db · 9c317db
1 parent 095b841
commit 9c317db
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/deps_info.json b/src/deps_info.json
@@ -29,9 +29,11 @@
   "freelocale": ["free"],
   "nl_langinfo": ["malloc"],
   "inet_ntoa": ["malloc"],
-  "gethostbyname": ["malloc", "free", "htons"],
-  "gethostbyname_r": ["malloc", "free", "htons"],
+  "gethostbyname": ["malloc", "free", "htons", "ntohs"],
+  "gethostbyname_r": ["malloc", "free", "htons", "ntohs"],
   "getaddrinfo": ["malloc", "htonl", "htons", "ntohs"],
+  "getnameinfo": ["htons", "ntohs"],
+  "getpeername": ["htons", "ntohs"],
   "_inet_ntop6_raw": ["ntohs"],
   "_read_sockaddr": ["ntohs"],
   "freeaddrinfo": ["free"],

diff --git a/src/library.js b/src/library.js
@@ -3413,7 +3413,7 @@ LibraryManager.library = {
   _inet_ntop4_raw: function(addr) {
     return (addr & 0xff) + '.' + ((addr >> 8) & 0xff) + '.' + ((addr >> 16) & 0xff) + '.' + ((addr >> 24) & 0xff)
   },
-  _inet_pton6_raw__deps: ['htons'],
+  _inet_pton6_raw__deps: ['htons', 'ntohs'],
   _inet_pton6_raw: function(str) {
     var words;
     var w, offset, z, i;
@@ -3578,7 +3578,7 @@ LibraryManager.library = {
     return str;
   },
 
-  _read_sockaddr__deps: ['$Sockets', '_inet_ntop4_raw', '_inet_ntop6_raw'],
+  _read_sockaddr__deps: ['$Sockets', '_inet_ntop4_raw', '_inet_ntop6_raw', 'ntohs'],
   _read_sockaddr: function (sa, salen) {
     // family / port offsets are common to both sockaddr_in and sockaddr_in6
     var family = {{{ makeGetValue('sa', C_STRUCTS.sockaddr_in.sin_family, 'i16') }}};

diff --git a/tests/test_other.py b/tests/test_other.py
@@ -8100,7 +8100,7 @@ def test_binaryen_metadce_hello(self, *args):
                       0, [],        [],           8,   0,    0,  0), # noqa; totally empty!
     # we don't metadce with linkable code! other modules may want stuff
     # don't compare the # of functions in a main module, which changes a lot
-    'main_module_1': (['-O3', '-s', 'MAIN_MODULE=1'], 1576, [], [], 226403, None, 96, None), # noqa
+    'main_module_1': (['-O3', '-s', 'MAIN_MODULE=1'], 1576, [], [], 226403, None, 97, None), # noqa
     'main_module_2': (['-O3', '-s', 'MAIN_MODULE=2'],   15, [], [],  10571,   19,  9,   21), # noqa
   })
   @no_wasm_backend()