diff --git a/src/library.js b/src/library.js index 94bfd91b96178..140382f802c8d 100644 --- a/src/library.js +++ b/src/library.js @@ -3555,9 +3555,8 @@ addToLibrary({ $HandleAllocator: class { constructor() { - // TODO(sbc): Use class fields once we allow/enable es2022 in - // JavaScript input to acorn and closure. - // Reserve slot 0 so that 0 is always an invalid handle + // TODO(https://github.com/emscripten-core/emscripten/issues/21414): + // Use inline field declarations. this.allocated = [undefined]; this.freelist = []; } diff --git a/src/library_fs.js b/src/library_fs.js index 9a43274bf6880..20a724a0afcb8 100644 --- a/src/library_fs.js +++ b/src/library_fs.js @@ -99,10 +99,13 @@ FS.staticInit();` + FSStream: class { constructor() { + // TODO(https://github.com/emscripten-core/emscripten/issues/21414): + // Use inline field declarations. this.shared = {}; #if USE_CLOSURE_COMPILER + // Closure compiler requires us to declare all properties in the + // constructor. this.node = null; - this.flags = 0; #endif } get object() { @@ -1652,6 +1655,8 @@ FS.staticInit();` + this.lengthKnown = false; this.chunks = []; // Loaded chunks. Index is the chunk number #if USE_CLOSURE_COMPILER + // Closure compiler requires us to declare all properties in the + // constructor. this.getter = undefined; this._length = 0; this._chunkSize = 0; diff --git a/test/other/metadce/test_metadce_cxx_ctors1.gzsize b/test/other/metadce/test_metadce_cxx_ctors1.gzsize index a4b96364adee2..aa902cabe050d 100644 --- a/test/other/metadce/test_metadce_cxx_ctors1.gzsize +++ b/test/other/metadce/test_metadce_cxx_ctors1.gzsize @@ -1 +1 @@ -9887 +9883 diff --git a/test/other/metadce/test_metadce_cxx_ctors1.jssize b/test/other/metadce/test_metadce_cxx_ctors1.jssize index 64ceb1904e2e8..3cad9c9ad5f68 100644 --- a/test/other/metadce/test_metadce_cxx_ctors1.jssize +++ b/test/other/metadce/test_metadce_cxx_ctors1.jssize @@ -1 +1 @@ -24323 +24310 diff --git a/test/other/metadce/test_metadce_cxx_ctors2.gzsize b/test/other/metadce/test_metadce_cxx_ctors2.gzsize index ce3d4cffe5b30..15cad531f0200 100644 --- a/test/other/metadce/test_metadce_cxx_ctors2.gzsize +++ b/test/other/metadce/test_metadce_cxx_ctors2.gzsize @@ -1 +1 @@ -9870 +9866 diff --git a/test/other/metadce/test_metadce_cxx_ctors2.jssize b/test/other/metadce/test_metadce_cxx_ctors2.jssize index 3a2c6ce656ebd..89f2ddba1b3d7 100644 --- a/test/other/metadce/test_metadce_cxx_ctors2.jssize +++ b/test/other/metadce/test_metadce_cxx_ctors2.jssize @@ -1 +1 @@ -24291 +24278 diff --git a/test/other/metadce/test_metadce_cxx_except.gzsize b/test/other/metadce/test_metadce_cxx_except.gzsize index 507aabbf00309..146e6e733deee 100644 --- a/test/other/metadce/test_metadce_cxx_except.gzsize +++ b/test/other/metadce/test_metadce_cxx_except.gzsize @@ -1 +1 @@ -10971 +10968 diff --git a/test/other/metadce/test_metadce_cxx_except.jssize b/test/other/metadce/test_metadce_cxx_except.jssize index d4c04d0ef6c79..cf7480af53c6a 100644 --- a/test/other/metadce/test_metadce_cxx_except.jssize +++ b/test/other/metadce/test_metadce_cxx_except.jssize @@ -1 +1 @@ -28195 +28182 diff --git a/test/other/metadce/test_metadce_cxx_except_wasm.gzsize b/test/other/metadce/test_metadce_cxx_except_wasm.gzsize index 1f1e1de446b6e..34cf2a336a2c6 100644 --- a/test/other/metadce/test_metadce_cxx_except_wasm.gzsize +++ b/test/other/metadce/test_metadce_cxx_except_wasm.gzsize @@ -1 +1 @@ -9854 +9850 diff --git a/test/other/metadce/test_metadce_cxx_except_wasm.jssize b/test/other/metadce/test_metadce_cxx_except_wasm.jssize index 2ad7d8d6ac5b0..f1f6f0cd0bb35 100644 --- a/test/other/metadce/test_metadce_cxx_except_wasm.jssize +++ b/test/other/metadce/test_metadce_cxx_except_wasm.jssize @@ -1 +1 @@ -24217 +24204 diff --git a/test/other/metadce/test_metadce_cxx_mangle.gzsize b/test/other/metadce/test_metadce_cxx_mangle.gzsize index f961a857f5172..abcda8b3df866 100644 --- a/test/other/metadce/test_metadce_cxx_mangle.gzsize +++ b/test/other/metadce/test_metadce_cxx_mangle.gzsize @@ -1 +1 @@ -10982 +10979 diff --git a/test/other/metadce/test_metadce_cxx_mangle.jssize b/test/other/metadce/test_metadce_cxx_mangle.jssize index 83e78402133ef..9177a914a21eb 100644 --- a/test/other/metadce/test_metadce_cxx_mangle.jssize +++ b/test/other/metadce/test_metadce_cxx_mangle.jssize @@ -1 +1 @@ -28196 +28183 diff --git a/test/other/metadce/test_metadce_cxx_noexcept.gzsize b/test/other/metadce/test_metadce_cxx_noexcept.gzsize index a4b96364adee2..aa902cabe050d 100644 --- a/test/other/metadce/test_metadce_cxx_noexcept.gzsize +++ b/test/other/metadce/test_metadce_cxx_noexcept.gzsize @@ -1 +1 @@ -9887 +9883 diff --git a/test/other/metadce/test_metadce_cxx_noexcept.jssize b/test/other/metadce/test_metadce_cxx_noexcept.jssize index 64ceb1904e2e8..3cad9c9ad5f68 100644 --- a/test/other/metadce/test_metadce_cxx_noexcept.jssize +++ b/test/other/metadce/test_metadce_cxx_noexcept.jssize @@ -1 +1 @@ -24323 +24310 diff --git a/test/other/metadce/test_metadce_files_js_fs.gzsize b/test/other/metadce/test_metadce_files_js_fs.gzsize index 28907e4585ea3..d01797194d005 100644 --- a/test/other/metadce/test_metadce_files_js_fs.gzsize +++ b/test/other/metadce/test_metadce_files_js_fs.gzsize @@ -1 +1 @@ -7843 +7840 diff --git a/test/other/metadce/test_metadce_files_js_fs.jssize b/test/other/metadce/test_metadce_files_js_fs.jssize index 39f21b4cf94c7..a4192e7c24a28 100644 --- a/test/other/metadce/test_metadce_files_js_fs.jssize +++ b/test/other/metadce/test_metadce_files_js_fs.jssize @@ -1 +1 @@ -19352 +19339