Skip to content

Commit 19791cb

Browse files
committed
Remove unused internal setting: BULK_MEMORY. NFC
It looks like the last usage of this setting was removed in emscripten-core#22873.
1 parent 9c04c53 commit 19791cb

File tree

5 files changed

+2
-8
lines changed

5 files changed

+2
-8
lines changed

emcc.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
from tools.response_file import substitute_response_files
4545
from tools import config
4646
from tools import cache
47+
from tools import feature_matrix
4748
from tools.settings import default_setting, user_settings, settings, COMPILE_TIME_SETTINGS
4849
from tools.utils import read_file
4950

@@ -432,7 +433,7 @@ def phase_setup(options, state):
432433
settings.SHARED_MEMORY = 1
433434

434435
if settings.SHARED_MEMORY:
435-
settings.BULK_MEMORY = 1
436+
feature_matrix.enable_feature(feature_matrix.Feature.BULK_MEMORY, 'SHARED_MEMORY', override=True)
436437

437438
if 'DISABLE_EXCEPTION_CATCHING' in user_settings and 'EXCEPTION_CATCHING_ALLOWED' in user_settings:
438439
# If we get here then the user specified both DISABLE_EXCEPTION_CATCHING and EXCEPTION_CATCHING_ALLOWED

src/settings_internal.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,6 @@ var POST_JS_FILES = [];
254254
// Set when -pthread / -sPTHREADS is passed
255255
var PTHREADS = false;
256256

257-
var BULK_MEMORY = false;
258-
259257
var MINIFY_WHITESPACE = true;
260258

261259
var ASYNCIFY_IMPORTS_EXCEPT_JS_LIBS = [];

tools/cmdline.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -520,12 +520,10 @@ def consume_arg_file():
520520
settings.DISABLE_EXCEPTION_THROWING = 1
521521
settings.WASM_EXCEPTIONS = 0
522522
elif arg == '-mbulk-memory':
523-
settings.BULK_MEMORY = 1
524523
feature_matrix.enable_feature(feature_matrix.Feature.BULK_MEMORY,
525524
'-mbulk-memory',
526525
override=True)
527526
elif arg == '-mno-bulk-memory':
528-
settings.BULK_MEMORY = 0
529527
feature_matrix.disable_feature(feature_matrix.Feature.BULK_MEMORY)
530528
elif arg == '-msign-ext':
531529
feature_matrix.enable_feature(feature_matrix.Feature.SIGN_EXT,

tools/link.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1473,8 +1473,6 @@ def limit_incoming_module_api():
14731473
# TODO(sbc): Find make a generic way to expose the feature matrix to JS
14741474
# compiler rather then adding them all ad-hoc as internal settings
14751475
settings.SUPPORTS_PROMISE_ANY = feature_matrix.caniuse(feature_matrix.Feature.PROMISE_ANY)
1476-
if not settings.BULK_MEMORY:
1477-
settings.BULK_MEMORY = feature_matrix.caniuse(feature_matrix.Feature.BULK_MEMORY)
14781476
default_setting('WASM_BIGINT', feature_matrix.caniuse(feature_matrix.Feature.JS_BIGINT_INTEGRATION))
14791477

14801478
if settings.AUDIO_WORKLET:

tools/settings.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@
9595
'SUPPORT_LONGJMP',
9696
'WASM_OBJECT_FILES',
9797
'WASM_WORKERS',
98-
'BULK_MEMORY',
9998

10099
# Internal settings used during compilation
101100
'EXCEPTION_CATCHING_ALLOWED',

0 commit comments

Comments
 (0)