Correct errors from upgrading emscripten

Author: mho22

packages/php-wasm/compile/php/Dockerfile

@@ -2226,13 +2226,7 @@ RUN set -euxo pipefail; \
 	source /root/emsdk/emsdk_env.sh; \
 	if [ "$WITH_JSPI" = "yes" ]; then \
 		# Both imports and exports are required for inter-module communication with wrapped methods, e.g., wasm_recv.
-		export JSPI_ADD_IMPORTS=""; \
-		export JSPI_ADD_EXPORTS=""; \
-		if [ "$EMSCRIPTEN_ENVIRONMENT" = "node" ]; then \
-			export JSPI_ADD_IMPORTS=",fd_close"; \
-			export JSPI_ADD_EXPORTS=",fd_close"; \
-		fi; \
-		export ASYNCIFY_FLAGS=" -s ASYNCIFY=2 -sSUPPORT_LONGJMP=wasm -fwasm-exceptions -sJSPI_IMPORTS=js_open_process,js_fd_read,js_waitpid,js_process_status,js_create_input_device,wasm_setsockopt,wasm_shutdown,wasm_close,wasm_recv,__syscall_fcntl64,js_flock,js_release_file_locks,js_waitpid$JSPI_ADD_IMPORTS -sJSPI_EXPORTS=php_wasm_init,wasm_sleep,wasm_read,emscripten_sleep,wasm_sapi_handle_request,wasm_sapi_request_shutdown,wasm_poll_socket,wrap_select,__wrap_select,select,php_pollfd_for,fflush,wasm_popen,wasm_read,wasm_php_exec,run_cli,wasm_recv,__wasm_call_ctors$JSPI_ADD_EXPORTS -s EXPORTED_RUNTIME_METHODS=ccall,PROXYFS,wasmExports "; \
+		export ASYNCIFY_FLAGS=" -s ASYNCIFY=2 -sSUPPORT_LONGJMP=wasm -fwasm-exceptions -sJSPI_IMPORTS=js_open_process,js_fd_read,js_waitpid,js_process_status,js_create_input_device,wasm_setsockopt,wasm_shutdown,wasm_close,wasm_recv,__syscall_fcntl64,js_flock,js_release_file_locks,js_waitpid -sJSPI_EXPORTS=php_wasm_init,wasm_sleep,wasm_read,emscripten_sleep,wasm_sapi_handle_request,wasm_sapi_request_shutdown,wasm_poll_socket,wrap_select,__wrap_select,select,php_pollfd_for,fflush,wasm_popen,wasm_read,wasm_php_exec,run_cli,wasm_recv,__wasm_call_ctors,__errno_location -s EXPORTED_RUNTIME_METHODS=HEAPU32,HEAPU8,ccall,PROXYFS,wasmExports "; \
 		echo '#define PLAYGROUND_JSPI 1' > /root/php_wasm_asyncify.h; \
 	else \
 		export ASYNCIFY_FLAGS=" -s ASYNCIFY=1 -s ASYNCIFY_IGNORE_INDIRECT=1 -s EXPORTED_RUNTIME_METHODS=ccall,PROXYFS,wasmExports $(cat /root/.emcc-php-asyncify-flags)  "; \
@@ -2243,6 +2237,7 @@ RUN set -euxo pipefail; \
 "stringToUTF8", \n\
 "lengthBytesUTF8", \n\
 "FS", \n\
+"___errno_location", \n\
 "___wrap_select", \n\
 "_wasm_set_sapi_name", \n\
 "_php_wasm_init", \n\
@@ -2403,6 +2398,11 @@ RUN set -euxo pipefail; \
 		# wrapper function.
 		/root/replace.sh $'s/ENVIRONMENT_IS_([A-Z]+)\s*=\s*(true|false)/ENVIRONMENT_IS_$1=RuntimeName==="$1"/g' /root/output/php.js; \
 		/root/replace.sh 's/var ENV\s*=\s*\{/var ENV = PHPLoader.ENV || {/g' /root/output/php.js; \
+	# Expose required functions to the module.
+		# Emscripten 4.0.10 removed the runtime exposure of `_malloc` and `_free`,
+		# so we rebind them from `wasmExports` and attach them to PHPLoader.
+		/root/replace.sh "s/_free\s*=\s*wasmExports\['free'\];/_free = PHPLoader['free'] = wasmExports['free'];/g" /root/output/php.js; \
+		/root/replace.sh "s/_malloc\s*=\s*wasmExports\['malloc'\];/_malloc = PHPLoader['malloc'] = wasmExports['malloc'];/g" /root/output/php.js; \
 	# Patch Emscripten exit status to include a stack trace
 		# Override Emscripten's default ExitStatus class which gets
 		# thrown on failure. Unfortunately, the default object is not

packages/php-wasm/compile/php/esm-suffix.js

@@ -36,26 +36,6 @@ PHPLoader['removeRunDependency'] = function (...args) {
     }
 }
 
-/**
- * Other exports live in the Dockerfile in:
- *
- * * EXPORTED_RUNTIME_METHODS
- * * EXPORTED_FUNCTIONS
- *
- * These exports, however, live in here because:
- *
- * * Listing them in EXPORTED_RUNTIME_METHODS doesn't actually
- *   export them. This could be a bug in Emscripten or a consequence of
- *   that option being deprecated.
- * * Listing them in EXPORTED_FUNCTIONS works, but they are overridden
- *   on every `BasePHP.run()` call. This is a problem because we want to
- *   spy on these calls in some unit tests.
- *
- * Therefore, we export them here.
- */
-PHPLoader['malloc'] = _malloc;
-PHPLoader['free'] = typeof _free === 'function' ? _free : PHPLoader['_wasm_free'];
-
 if (typeof NODEFS === 'object') {
     // We override NODEFS.createNode() to add an `isSharedFS` flag to all NODEFS
     // nodes. This way we can tell whether file-locking is needed and possible

packages/php-wasm/compile/php/phpwasm-emscripten-library.js

@@ -434,13 +434,13 @@ const LibraryExample = {
 		envLength
 	) {
 		if (!command) {
-			setErrNo(ERRNO_CODES.EINVAL);
+			___errno_location(ERRNO_CODES.EINVAL);
 			return -1;
 		}
 
 		const cmdstr = UTF8ToString(command);
 		if (!cmdstr.length) {
-			setErrNo(ERRNO_CODES.EINVAL);
+			___errno_location(ERRNO_CODES.EINVAL);
 			return -1;
 		}
 
@@ -504,11 +504,11 @@ const LibraryExample = {
 				}
 			} catch (e) {
 				if (e.code === 'SPAWN_UNSUPPORTED') {
-					setErrNo(ERRNO_CODES.ENOSYS);
+					___errno_location(ERRNO_CODES.ENOSYS);
 					return -1;
 				}
 				if (typeof FS == 'undefined' || !(e.name === 'ErrnoError')) throw e;
-				setErrNo(e.code);
+				___errno_location(e.code);
 				return -1;
 			}
 
@@ -659,7 +659,7 @@ const LibraryExample = {
 				try {
 					stdinStream = SYSCALLS.getStreamFromFD(stdinChildFd);
 				} catch (e) {
-					setErrNo(ERRNO_CODES.EBADF);
+					___errno_location(ERRNO_CODES.EBADF);
 					return ProcInfo.pid;
 				}
 				if (!stdinStream?.node) {
@@ -722,7 +722,7 @@ const LibraryExample = {
 						) {
 							throw e;
 						}
-						setErrNo(e.errno);
+						___errno_location(e.errno);
 						stopPumpingAndCloseStdin();
 					}
 				};
@@ -731,9 +731,9 @@ const LibraryExample = {
 					if (!cp.stdin.closed) {
 						cp.stdin.end();
 					}
-					PHPLoader["free"](buffer);
-					PHPLoader["free"](iov);
-					PHPLoader["free"](pnum);
+					_free(buffer);
+					_free(iov);
+					_free(pnum);
 				}
 
 				// pump() can never alter the result of this function.

packages/php-wasm/compile/shared/intl/Dockerfile

@@ -59,7 +59,6 @@ RUN cd /root && git apply --no-index /root/php${PHP_VERSION:0:3}*.patch -v
 RUN source /root/emsdk/emsdk_env.sh && \
 	cd php-src && \
 	emconfigure ./configure \
-	--host=i386-unknown-freebsd \
 	--disable-fiber-asm \
 	--enable-embed \
 	--disable-cgi \

packages/php-wasm/compile/xdebug/Dockerfile

@@ -53,7 +53,6 @@ RUN cd /root && git apply --no-index /root/php${PHP_VERSION:0:3}*.patch -v
 RUN source /root/emsdk/emsdk_env.sh && \
 	cd php-src && \
 	emconfigure ./configure \
-	--host=i386-unknown-freebsd \
 	--disable-fiber-asm \
 	--enable-embed \
 	--disable-cgi \