Update safari version, update pass name, fixes

Author: dschuff

emcc.py

@@ -385,12 +385,6 @@ def get_clang_flags(user_args):
     if '-mbulk-memory' not in user_args:
       flags.append('-mbulk-memory')
 
-  # In emscripten we currently disable bulk memory by default.
-  # This should be removed/updated when we als update the default browser targets.
-  #if '-mbulk-memory' not in user_args and '-mno-bulk-memory' not in user_args:
-    # Bulk memory may be enabled via threads or directly via -s.
-  #  if not settings.BULK_MEMORY:
-  #    flags.append('-mno-bulk-memory')
   if '-mnontrapping-fptoint' not in user_args and '-mno-nontrapping-fptoint' not in user_args:
     flags.append('-mno-nontrapping-fptoint')
 

test/test_other.py

@@ -8511,7 +8511,7 @@ def test_binaryen_warn_mem(self):
     self.run_process([EMCC, test_file('hello_world.c'), '-sINITIAL_MEMORY=' + str(16 * 1024 * 1024), '--pre-js', 'pre.js', '-sWASM_ASYNC_COMPILATION=0', '-sIMPORTED_MEMORY'])
     out = self.run_js('a.out.js', assert_returncode=NON_ZERO)
     self.assertContained('LinkError', out)
-    self.assertContained("memory import 2 has a larger maximum size 800 than the module's declared maximum", out)
+    self.assertContained("memory import 1 has a larger maximum size 800 than the module's declared maximum", out)
     self.assertNotContained('hello, world!', out)
     # and with memory growth, all should be good
     self.run_process([EMCC, test_file('hello_world.c'), '-sINITIAL_MEMORY=' + str(16 * 1024 * 1024), '--pre-js', 'pre.js', '-sALLOW_MEMORY_GROWTH', '-sWASM_ASYNC_COMPILATION=0', '-sIMPORTED_MEMORY'])
@@ -10458,18 +10458,10 @@ def compile(flags):
     compile(['-mnontrapping-fptoint', '-c'])
     verify_features_sec('nontrapping-fptoint', True)
 
-    compile(['-sMIN_SAFARI_VERSION=120000'])
-    verify_features_sec_linked('sign-ext', False)
-
     compile(['-sMIN_SAFARI_VERSION=140000'])
-    verify_features_sec_linked('bulk-memory', True) # XXX fix before commit
+    verify_features_sec_linked('bulk-memory', False)
     verify_features_sec_linked('nontrapping-fptoint', False)
 
-    compile(['-sMIN_SAFARI_VERSION=140100', '-pthread'])
-    verify_features_sec_linked('atomics', True)
-    verify_features_sec_linked('bulk-memory', True)
-
-    # BIGINT causes binaryen to not run, and keeps the target_features section after link
     # Setting this SAFARI_VERSION should enable bulk memory because it links in emscripten_memcpy_bulkmem
     # However it does not enable nontrapping-fptoint yet because it has no effect at compile time and
     # no libraries include nontrapping yet.
@@ -10484,14 +10476,6 @@ def compile(flags):
     # -mno-bulk-memory at link time overrides MIN_SAFARI_VERSION
     verify_features_sec_linked('bulk-memory', False)
 
-    # feature_matrix has the (IMO strange) behavior that enabling one feature supported by 
-    # a particular browser version will cause all other features supported by that version
-    # to be enabled as well.
-    # TODO: is this test redundant with test_signext_lowering?
-    compile(['-sWASM_BIGINT'])
-    verify_features_sec_linked('bulk-memory', True)
-    verify_features_sec_linked('nontrapping-fptoint', True)
-
   def test_js_preprocess(self):
     # Use stderr rather than stdout here because stdout is redirected to the output JS file itself.
     create_file('lib.js', '''

tools/feature_matrix.py

@@ -56,7 +56,7 @@ class Feature(IntEnum):
   Feature.BULK_MEMORY: {
     'chrome': 75,
     'firefox': 79,
-    'safari': 150000,
+    'safari': 140100, # TODO: Reset this to 150000 when we update the default.
   },
   Feature.MUTABLE_GLOBALS: {
     'chrome': 74,

tools/link.py

@@ -342,7 +342,7 @@ def get_binaryen_passes():
     passes += ['--signext-lowering']
   if not feature_matrix.caniuse(feature_matrix.Feature.BULK_MEMORY):
     logger.debug('lowering bulk-memory feature due to incompatible target browser engines')
-    passes += ['--memory-copy-fill-lowering']
+    passes += ['--llvm-memory-copy-fill-lowering']
   if optimizing:
     passes += ['--post-emscripten']
     if settings.SIDE_MODULE:

tools/system_libs.py

@@ -2191,10 +2191,6 @@ def get_files(self):
         filenames=['standalone.c',
                    'standalone_wasm_stdio.c',
                    '__main_void.c'])
-    files += files_in_path(
-        path='system/lib/libc',
-        filenames=['emscripten_memcpy.c', 'emscripten_memset.c',
-                   ]) # XXX why do we need the C files here but not the S files?
     # It is more efficient to use JS methods for time, normally.
     files += files_in_path(
         path='system/lib/libc/musl/src/time',