Skip to content

More use of globalThis over typeof. NFC #25850

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 22, 2025
+50 −50
Merged

More use of globalThis over typeof. NFC #25850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/lib/libwasi.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ var WasiLibrary = {
var lang = 'C.UTF-8';
#else
// Browser language detection #8751
var lang = ((typeof navigator == 'object' && navigator.language) || 'C').replace('-', '_') + '.UTF-8';
var lang = (globalThis.navigator?.language ?? 'C').replace('-', '_') + '.UTF-8';
#endif
var env = {
#if !PURE_WASI
Expand Down
8 changes: 4 additions & 4 deletions test/codesize/test_codesize_cxx_ctors1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"a.out.js": 19670,
"a.out.js.gz": 8152,
"a.out.js": 19654,
"a.out.js.gz": 8145,
"a.out.nodebug.wasm": 129454,
"a.out.nodebug.wasm.gz": 49164,
"total": 149124,
"total_gz": 57316,
"total": 149108,
"total_gz": 57309,
"sent": [
"__cxa_throw",
"_abort_js",
Expand Down
8 changes: 4 additions & 4 deletions test/codesize/test_codesize_cxx_ctors2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"a.out.js": 19647,
"a.out.js.gz": 8139,
"a.out.js": 19631,
"a.out.js.gz": 8132,
"a.out.nodebug.wasm": 128881,
"a.out.nodebug.wasm.gz": 48809,
"total": 148528,
"total_gz": 56948,
"total": 148512,
"total_gz": 56941,
"sent": [
"__cxa_throw",
"_abort_js",
Expand Down
8 changes: 4 additions & 4 deletions test/codesize/test_codesize_cxx_except.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"a.out.js": 23325,
"a.out.js.gz": 9128,
"a.out.js": 23309,
"a.out.js.gz": 9122,
"a.out.nodebug.wasm": 171262,
"a.out.nodebug.wasm.gz": 57278,
"total": 194587,
"total_gz": 66406,
"total": 194571,
"total_gz": 66400,
"sent": [
"__cxa_begin_catch",
"__cxa_end_catch",
Expand Down
8 changes: 4 additions & 4 deletions test/codesize/test_codesize_cxx_except_wasm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"a.out.js": 19486,
"a.out.js.gz": 8077,
"a.out.js": 19470,
"a.out.js.gz": 8070,
"a.out.nodebug.wasm": 144618,
"a.out.nodebug.wasm.gz": 54850,
"total": 164104,
"total_gz": 62927,
"total": 164088,
"total_gz": 62920,
"sent": [
"_abort_js",
"_tzset_js",
Expand Down
8 changes: 4 additions & 4 deletions test/codesize/test_codesize_cxx_except_wasm_legacy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"a.out.js": 19555,
"a.out.js.gz": 8099,
"a.out.js": 19539,
"a.out.js.gz": 8089,
"a.out.nodebug.wasm": 142207,
"a.out.nodebug.wasm.gz": 54300,
"total": 161762,
"total_gz": 62399,
"total": 161746,
"total_gz": 62389,
"sent": [
"_abort_js",
"_tzset_js",
Expand Down
8 changes: 4 additions & 4 deletions test/codesize/test_codesize_cxx_lto.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"a.out.js": 19009,
"a.out.js.gz": 7829,
"a.out.js": 18993,
"a.out.js.gz": 7823,
"a.out.nodebug.wasm": 106456,
"a.out.nodebug.wasm.gz": 42570,
"total": 125465,
"total_gz": 50399,
"total": 125449,
"total_gz": 50393,
"sent": [
"a (emscripten_resize_heap)",
"b (_setitimer_js)",
Expand Down
8 changes: 4 additions & 4 deletions test/codesize/test_codesize_cxx_mangle.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"a.out.js": 23375,
"a.out.js.gz": 9148,
"a.out.js": 23359,
"a.out.js.gz": 9142,
"a.out.nodebug.wasm": 235283,
"a.out.nodebug.wasm.gz": 78886,
"total": 258658,
"total_gz": 88034,
"total": 258642,
"total_gz": 88028,
"sent": [
"__cxa_begin_catch",
"__cxa_end_catch",
Expand Down
8 changes: 4 additions & 4 deletions test/codesize/test_codesize_cxx_noexcept.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"a.out.js": 19670,
"a.out.js.gz": 8152,
"a.out.js": 19654,
"a.out.js.gz": 8145,
"a.out.nodebug.wasm": 131871,
"a.out.nodebug.wasm.gz": 50163,
"total": 151541,
"total_gz": 58315,
"total": 151525,
"total_gz": 58308,
"sent": [
"__cxa_throw",
"_abort_js",
Expand Down
8 changes: 4 additions & 4 deletions test/codesize/test_codesize_cxx_wasmfs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"a.out.js": 7059,
"a.out.js.gz": 3330,
"a.out.js": 7043,
"a.out.js.gz": 3322,
"a.out.nodebug.wasm": 169659,
"a.out.nodebug.wasm.gz": 62903,
"total": 176718,
"total_gz": 66233,
"total": 176702,
"total_gz": 66225,
"sent": [
"__cxa_throw",
"_abort_js",
Expand Down
8 changes: 4 additions & 4 deletions test/codesize/test_codesize_hello_dylink.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"a.out.js": 26712,
"a.out.js.gz": 11400,
"a.out.js": 26695,
"a.out.js.gz": 11394,
"a.out.nodebug.wasm": 17751,
"a.out.nodebug.wasm.gz": 8984,
"total": 44463,
"total_gz": 20384,
"total": 44446,
"total_gz": 20378,
"sent": [
"__syscall_stat64",
"emscripten_resize_heap",
Expand Down
4 changes: 2 additions & 2 deletions test/codesize/test_codesize_hello_dylink_all.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"a.out.js": 245677,
"a.out.js": 245661,
"a.out.nodebug.wasm": 574007,
"total": 819684,
"total": 819668,
"sent": [
"IMG_Init",
"IMG_Load",
Expand Down
10 changes: 5 additions & 5 deletions test/pthread/test_pthread_mandelbrot.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ double prevT = 0;

void register_tasks()
{
numTasks = EM_ASM_INT(return (typeof document !== 'undefined' && document.getElementById('num_threads')) ? parseInt(document.getElementById('num_threads').value) : 1);
numTasks = EM_ASM_INT(return globalThis.document?.getElementById('num_threads') ? parseInt(document.getElementById('num_threads').value) : 1);

#ifdef SINGLETHREADED
// Single-threaded
Expand All @@ -363,7 +363,7 @@ void register_tasks()
#else
emscripten_atomic_fence();

numTasks = EM_ASM_INT(return (typeof document !== 'undefined' && document.getElementById('num_threads')) ? parseInt(document.getElementById('num_threads').value) : 1);
numTasks = EM_ASM_INT(return globalThis.document?.getElementById('num_threads') ? parseInt(document.getElementById('num_threads').value) : 1);
if (numTasks < 1) numTasks = 1;
if (numTasks > emscripten_num_logical_cores()) numTasks = emscripten_num_logical_cores();

Expand Down Expand Up @@ -481,7 +481,7 @@ void main_tick()
}
#endif

int new_use_sse = EM_ASM_INT(return (typeof document !== 'undefined' && document.getElementById('use_sse')) ? document.getElementById('use_sse').checked : false);
int new_use_sse = EM_ASM_INT(return globalThis.document?.getElementById('use_sse') ? document.getElementById('use_sse').checked : false);

if (numItersDoneOnCanvas >= minItersBeforeDisplaying || new_use_sse != use_sse)
{
Expand All @@ -498,12 +498,12 @@ void main_tick()
use_sse = new_use_sse;

numItersPerFrame = EM_ASM_INT({
if (typeof location !== 'undefined') {
if (globalThis.location) {
var updatesPerFrame = (new RegExp("[\\?&]updates=([^&#]*)")).exec(location.href);
if (updatesPerFrame) return updatesPerFrame[1];
}
if (arguments_ && arguments_.length >= 1) return parseInt(arguments_[0]);
if (typeof document !== 'undefined' && document.getElementById('updates_per_frame')) return parseInt(document.getElementById('updates_per_frame').value);
if (globalThis.document?.getElementById('updates_per_frame')) return parseInt(document.getElementById('updates_per_frame').value);
return 50;
});
if (numItersPerFrame < 10) numItersPerFrame = 10;
Expand Down
4 changes: 2 additions & 2 deletions test/test_other.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5821,12 +5821,12 @@ def test_browser_language_detection(self):
self.assertContained(f'LANG=({expected_lang}|en_US.UTF-8|C.UTF-8)', output, regex=True)

# Accept-Language: fr,fr-FR;q=0.8,en-US;q=0.5,en;q=0.3
create_file('pre.js', 'var navigator = { language: "fr" };')
create_file('pre.js', 'delete global.navigator; globalThis.navigator = { language: "fr" };')
output = self.do_runf('test_browser_language_detection.c', cflags=['--pre-js', 'pre.js'])
self.assertContained('LANG=fr.UTF-8', output)

# Accept-Language: fr-FR,fr;q=0.8,en-US;q=0.5,en;q=0.3
create_file('pre.js', r'var navigator = { language: "fr-FR" };')
create_file('pre.js', r'delete global.navigator; globalThis.navigator = { language: "fr-FR" };')
self.cflags += ['--pre-js', 'pre.js']
self.do_runf('test_browser_language_detection.c', 'LANG=fr_FR.UTF-8')

Expand Down