From 5ea876593af4e9232fc477aa10a0bc36c90f8726 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Mon, 12 Jun 2017 23:32:17 -0400
Subject: [PATCH 01/78] Add SINGLE_FILE option to embed all subresources into
 emitted JS

As discussed in #5279, subresource paths are converted into base64 data URIs.
---
 emcc.py         | 32 +++++++++++++++++++++-----------
 src/settings.js |  7 +++++++
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/emcc.py b/emcc.py
index 654d26cda16f..2d16e0879c44 100755
--- a/emcc.py
+++ b/emcc.py
@@ -27,7 +27,7 @@
 if __name__ == '__main__':
   ToolchainProfiler.record_process_start()
 
-import os, sys, shutil, tempfile, subprocess, shlex, time, re, logging, urllib
+import os, sys, shutil, tempfile, subprocess, shlex, time, re, logging, urllib, base64
 from subprocess import PIPE
 from tools import shared, jsrun, system_libs
 from tools.shared import execute, suffix, unsuffixed, unsuffixed_basename, WINDOWS, safe_move
@@ -513,6 +513,16 @@ def filter_emscripten_options(argv):
 
   # ---------------- Utilities ---------------
 
+  # Returns the subresource location for run-time access
+  def get_subresource_location(path):
+    if shared.Settings.SINGLE_FILE:
+      f = open(path, 'rb')
+      data = base64.b64encode(f.read())
+      f.close()
+      return 'data:application/octet-stream;base64,' + data
+    else:
+      return os.path.basename(path)
+
   seen_names = {}
   def uniquename(name):
     if name not in seen_names:
@@ -799,7 +809,7 @@ def detect_fixed_language_mode(args):
         options.separate_asm = True
         logging.warning('forcing separate asm output (--separate-asm), because -s PRECISE_F32=2 or -s USE_PTHREADS=2 was passed.')
       if options.separate_asm:
-        shared.Settings.SEPARATE_ASM = os.path.basename(asm_target)
+        shared.Settings.SEPARATE_ASM = get_subresource_location(asm_target)
 
       if 'EMCC_STRICT' in os.environ:
         shared.Settings.STRICT = os.environ.get('EMCC_STRICT') != '0'
@@ -1116,9 +1126,9 @@ def check(input_file):
 
       if shared.Settings.BINARYEN:
         # set file locations, so that JS glue can find what it needs
-        shared.Settings.WASM_TEXT_FILE = os.path.basename(wasm_text_target)
-        shared.Settings.WASM_BINARY_FILE = os.path.basename(wasm_binary_target)
-        shared.Settings.ASMJS_CODE_FILE = os.path.basename(asm_target)
+        shared.Settings.WASM_TEXT_FILE = get_subresource_location(wasm_text_target)
+        shared.Settings.WASM_BINARY_FILE = get_subresource_location(wasm_binary_target)
+        shared.Settings.ASMJS_CODE_FILE = get_subresource_location(asm_target)
 
         shared.Settings.ASM_JS = 2 # when targeting wasm, we use a wasm Memory, but that is not compatible with asm.js opts
         shared.Settings.GLOBAL_BASE = 1024 # leave some room for mapping global vars
@@ -1624,12 +1634,12 @@ def repl(m):
             # Copy into temp dir as well, so can be run there too
             shared.safe_copy(memfile, os.path.join(shared.get_emscripten_temp_dir(), os.path.basename(memfile)))
           if not shared.Settings.BINARYEN:
-            return 'memoryInitializer = "%s";' % os.path.basename(memfile)
+            return 'memoryInitializer = "%s";' % get_subresource_location(memfile)
           else:
             # with wasm, we may have the mem init file in the wasm binary already
             return ('memoryInitializer = Module["wasmJSMethod"].indexOf("asmjs") >= 0 || '
                     'Module["wasmJSMethod"].indexOf("interpret-asm2wasm") >= 0 ? "%s" : null;'
-                    % os.path.basename(memfile))
+                    % get_subresource_location(memfile))
         src = re.sub(shared.JS.memory_initializer_pattern, repl, open(final).read(), count=1)
         open(final + '.mem.js', 'w').write(src)
         final += '.mem.js'
@@ -2412,7 +2422,7 @@ def generate_html(target, options, js_target, target_basename,
             meminitXHR.responseType = 'arraybuffer';
             meminitXHR.send(null);
           })();
-''' % os.path.basename(memfile)) + script.inline
+''' % get_subresource_location(memfile)) + script.inline
 
   # Download .asm.js if --separate-asm was passed in an asm.js build, or if 'asmjs' is one
   # of the wasm run methods.
@@ -2431,7 +2441,7 @@ def generate_html(target, options, js_target, target_basename,
       }, 1); // delaying even 1ms is enough to allow compilation memory to be reclaimed
     };
     document.body.appendChild(script);
-''' % (os.path.basename(asm_target), script.inline)
+''' % (get_subresource_location(asm_target), script.inline)
     else:
       # may need to modify the asm code, load it as text, modify, and load asynchronously
       script.inline = '''
@@ -2454,7 +2464,7 @@ def generate_html(target, options, js_target, target_basename,
       document.body.appendChild(script);
     };
     codeXHR.send(null);
-''' % (os.path.basename(asm_target), '\n'.join(asm_mods), script.inline)
+''' % (get_subresource_location(asm_target), '\n'.join(asm_mods), script.inline)
 
   if shared.Settings.BINARYEN and not shared.Settings.BINARYEN_ASYNC_COMPILATION:
     # We need to load the wasm file before anything else, it has to be synchronously ready TODO: optimize
@@ -2468,7 +2478,7 @@ def generate_html(target, options, js_target, target_basename,
 %s
           };
           wasmXHR.send(null);
-''' % (os.path.basename(wasm_binary_target), script.inline)
+''' % (get_subresource_location(wasm_binary_target), script.inline)
 
   html = open(target, 'wb')
   html_contents = shell.replace('{{{ SCRIPT }}}', script.replacement())
diff --git a/src/settings.js b/src/settings.js
index c4c668e78c7e..d25ad52ad6fb 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -856,6 +856,13 @@ var FETCH = 0; // If nonzero, enables emscripten_fetch API.
 
 var ASMFS = 0; // If set to 1, uses the multithreaded filesystem that is implemented within the asm.js module, using emscripten_fetch. Implies -s FETCH=1.
 
+var SINGLE_FILE = 0; // If set to 1, embeds all subresources in the emitted JS file
+                     // by converting their file names into base64 data URIs.
+                     //
+                     // Note that using this option may require a change to consuming
+                     // pages' Content Security Policies -- specifically, adding data:
+                     // to their connect-src directives.
+
 var WASM_TEXT_FILE = ''; // name of the file containing wasm text, if relevant
 var WASM_BINARY_FILE = ''; // name of the file containing wasm binary, if relevant
 var ASMJS_CODE_FILE = ''; // name of the file containing asm.js, if relevant

From 3a562fa81b3bb07899c17cac4a661d95a985961c Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Tue, 13 Jun 2017 18:08:23 -0400
Subject: [PATCH 02/78] misc cleanup as suggested by @kripken (#5296)

---
 emcc.py         | 32 +++++++++++---------------------
 src/settings.js |  4 +++-
 tools/shared.py | 13 ++++++++++++-
 3 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/emcc.py b/emcc.py
index 2d16e0879c44..420f69fd444d 100755
--- a/emcc.py
+++ b/emcc.py
@@ -27,7 +27,7 @@
 if __name__ == '__main__':
   ToolchainProfiler.record_process_start()
 
-import os, sys, shutil, tempfile, subprocess, shlex, time, re, logging, urllib, base64
+import os, sys, shutil, tempfile, subprocess, shlex, time, re, logging, urllib
 from subprocess import PIPE
 from tools import shared, jsrun, system_libs
 from tools.shared import execute, suffix, unsuffixed, unsuffixed_basename, WINDOWS, safe_move
@@ -513,16 +513,6 @@ def filter_emscripten_options(argv):
 
   # ---------------- Utilities ---------------
 
-  # Returns the subresource location for run-time access
-  def get_subresource_location(path):
-    if shared.Settings.SINGLE_FILE:
-      f = open(path, 'rb')
-      data = base64.b64encode(f.read())
-      f.close()
-      return 'data:application/octet-stream;base64,' + data
-    else:
-      return os.path.basename(path)
-
   seen_names = {}
   def uniquename(name):
     if name not in seen_names:
@@ -809,7 +799,7 @@ def detect_fixed_language_mode(args):
         options.separate_asm = True
         logging.warning('forcing separate asm output (--separate-asm), because -s PRECISE_F32=2 or -s USE_PTHREADS=2 was passed.')
       if options.separate_asm:
-        shared.Settings.SEPARATE_ASM = get_subresource_location(asm_target)
+        shared.Settings.SEPARATE_ASM = shared.JS.get_subresource_location(asm_target)
 
       if 'EMCC_STRICT' in os.environ:
         shared.Settings.STRICT = os.environ.get('EMCC_STRICT') != '0'
@@ -1126,9 +1116,9 @@ def check(input_file):
 
       if shared.Settings.BINARYEN:
         # set file locations, so that JS glue can find what it needs
-        shared.Settings.WASM_TEXT_FILE = get_subresource_location(wasm_text_target)
-        shared.Settings.WASM_BINARY_FILE = get_subresource_location(wasm_binary_target)
-        shared.Settings.ASMJS_CODE_FILE = get_subresource_location(asm_target)
+        shared.Settings.WASM_TEXT_FILE = shared.JS.get_subresource_location(wasm_text_target)
+        shared.Settings.WASM_BINARY_FILE = shared.JS.get_subresource_location(wasm_binary_target)
+        shared.Settings.ASMJS_CODE_FILE = shared.JS.get_subresource_location(asm_target)
 
         shared.Settings.ASM_JS = 2 # when targeting wasm, we use a wasm Memory, but that is not compatible with asm.js opts
         shared.Settings.GLOBAL_BASE = 1024 # leave some room for mapping global vars
@@ -1634,12 +1624,12 @@ def repl(m):
             # Copy into temp dir as well, so can be run there too
             shared.safe_copy(memfile, os.path.join(shared.get_emscripten_temp_dir(), os.path.basename(memfile)))
           if not shared.Settings.BINARYEN:
-            return 'memoryInitializer = "%s";' % get_subresource_location(memfile)
+            return 'memoryInitializer = "%s";' % shared.JS.get_subresource_location(memfile)
           else:
             # with wasm, we may have the mem init file in the wasm binary already
             return ('memoryInitializer = Module["wasmJSMethod"].indexOf("asmjs") >= 0 || '
                     'Module["wasmJSMethod"].indexOf("interpret-asm2wasm") >= 0 ? "%s" : null;'
-                    % get_subresource_location(memfile))
+                    % shared.JS.get_subresource_location(memfile))
         src = re.sub(shared.JS.memory_initializer_pattern, repl, open(final).read(), count=1)
         open(final + '.mem.js', 'w').write(src)
         final += '.mem.js'
@@ -2422,7 +2412,7 @@ def generate_html(target, options, js_target, target_basename,
             meminitXHR.responseType = 'arraybuffer';
             meminitXHR.send(null);
           })();
-''' % get_subresource_location(memfile)) + script.inline
+''' % shared.JS.get_subresource_location(memfile)) + script.inline
 
   # Download .asm.js if --separate-asm was passed in an asm.js build, or if 'asmjs' is one
   # of the wasm run methods.
@@ -2441,7 +2431,7 @@ def generate_html(target, options, js_target, target_basename,
       }, 1); // delaying even 1ms is enough to allow compilation memory to be reclaimed
     };
     document.body.appendChild(script);
-''' % (get_subresource_location(asm_target), script.inline)
+''' % (shared.JS.get_subresource_location(asm_target), script.inline)
     else:
       # may need to modify the asm code, load it as text, modify, and load asynchronously
       script.inline = '''
@@ -2464,7 +2454,7 @@ def generate_html(target, options, js_target, target_basename,
       document.body.appendChild(script);
     };
     codeXHR.send(null);
-''' % (get_subresource_location(asm_target), '\n'.join(asm_mods), script.inline)
+''' % (shared.JS.get_subresource_location(asm_target), '\n'.join(asm_mods), script.inline)
 
   if shared.Settings.BINARYEN and not shared.Settings.BINARYEN_ASYNC_COMPILATION:
     # We need to load the wasm file before anything else, it has to be synchronously ready TODO: optimize
@@ -2478,7 +2468,7 @@ def generate_html(target, options, js_target, target_basename,
 %s
           };
           wasmXHR.send(null);
-''' % (get_subresource_location(wasm_binary_target), script.inline)
+''' % (shared.JS.get_subresource_location(wasm_binary_target), script.inline)
 
   html = open(target, 'wb')
   html_contents = shell.replace('{{{ SCRIPT }}}', script.replacement())
diff --git a/src/settings.js b/src/settings.js
index d25ad52ad6fb..3afa115dd346 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -857,7 +857,9 @@ var FETCH = 0; // If nonzero, enables emscripten_fetch API.
 var ASMFS = 0; // If set to 1, uses the multithreaded filesystem that is implemented within the asm.js module, using emscripten_fetch. Implies -s FETCH=1.
 
 var SINGLE_FILE = 0; // If set to 1, embeds all subresources in the emitted JS file
-                     // by converting their file names into base64 data URIs.
+                     // by converting their file names into base64 data URIs. Embedded
+                     // subresources may include (but aren't limited to) wasm, asm.js,
+                     // and static memory initialization code.
                      //
                      // Note that using this option may require a change to consuming
                      // pages' Content Security Policies -- specifically, adding data:
diff --git a/tools/shared.py b/tools/shared.py
index e56cb31897a0..38cdf0951e47 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -1,5 +1,5 @@
 from toolchain_profiler import ToolchainProfiler
-import shutil, time, os, sys, json, tempfile, copy, shlex, atexit, subprocess, hashlib, cPickle, re, errno
+import shutil, time, os, sys, base64, json, tempfile, copy, shlex, atexit, subprocess, hashlib, cPickle, re, errno
 from subprocess import Popen, PIPE, STDOUT
 from tempfile import mkstemp
 from distutils.spawn import find_executable
@@ -2277,6 +2277,17 @@ class JS:
   def to_nice_ident(ident): # limited version of the JS function toNiceIdent
     return ident.replace('%', '$').replace('@', '_').replace('.', '_')
 
+  # Returns the subresource location for run-time access
+  @staticmethod
+  def get_subresource_location(path):
+    if Settings.SINGLE_FILE:
+      f = open(path, 'rb')
+      data = base64.b64encode(f.read())
+      f.close()
+      return 'data:application/octet-stream;base64,' + data
+    else:
+      return os.path.basename(path)
+
   @staticmethod
   def make_initializer(sig, settings=None):
     settings = settings or Settings

From d2edd4c8b8e54b4428cea0656273c6267db23e4e Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Tue, 13 Jun 2017 18:57:03 -0400
Subject: [PATCH 03/78] replace --memory-init-file 0 logic with
 SINGLE_FILE-style embedding (#5296)

---
 emcc.py          | 17 ++++-------
 src/postamble.js |  2 --
 tools/shared.py  | 73 ++----------------------------------------------
 3 files changed, 7 insertions(+), 85 deletions(-)

diff --git a/emcc.py b/emcc.py
index 420f69fd444d..db560c6a18b2 100755
--- a/emcc.py
+++ b/emcc.py
@@ -1605,7 +1605,9 @@ def get_final():
 
     with ToolchainProfiler.profile_block('memory initializer'):
       memfile = None
-      if shared.Settings.MEM_INIT_METHOD > 0:
+      embed_memfile = shared.Settings.MEM_INIT_METHOD == 0 and (not shared.Settings.MAIN_MODULE and not shared.Settings.SIDE_MODULE and options.debug_level < 4)
+
+      if shared.Settings.MEM_INIT_METHOD > 0 or embed_memfile:
         memfile = target + '.mem'
         shared.try_delete(memfile)
         def repl(m):
@@ -1624,12 +1626,12 @@ def repl(m):
             # Copy into temp dir as well, so can be run there too
             shared.safe_copy(memfile, os.path.join(shared.get_emscripten_temp_dir(), os.path.basename(memfile)))
           if not shared.Settings.BINARYEN:
-            return 'memoryInitializer = "%s";' % shared.JS.get_subresource_location(memfile)
+            return 'memoryInitializer = "%s";' % shared.JS.get_subresource_location(memfile, embed_memfile)
           else:
             # with wasm, we may have the mem init file in the wasm binary already
             return ('memoryInitializer = Module["wasmJSMethod"].indexOf("asmjs") >= 0 || '
                     'Module["wasmJSMethod"].indexOf("interpret-asm2wasm") >= 0 ? "%s" : null;'
-                    % shared.JS.get_subresource_location(memfile))
+                    % shared.JS.get_subresource_location(memfile, embed_memfile))
         src = re.sub(shared.JS.memory_initializer_pattern, repl, open(final).read(), count=1)
         open(final + '.mem.js', 'w').write(src)
         final += '.mem.js'
@@ -1641,15 +1643,6 @@ def repl(m):
             logging.debug('wrote memory initialization to %s', memfile)
           else:
             logging.debug('did not see memory initialization')
-      elif not shared.Settings.MAIN_MODULE and not shared.Settings.SIDE_MODULE and options.debug_level < 4:
-        # not writing a binary init, but we can at least optimize them by splitting them up
-        src = open(final).read()
-        src = shared.JS.optimize_initializer(src)
-        if src is not None:
-          logging.debug('optimizing memory initialization')
-          open(final + '.mem.js', 'w').write(src)
-          final += '.mem.js'
-          src = None
 
       if shared.Settings.USE_PTHREADS:
         target_dir = os.path.dirname(os.path.abspath(target))
diff --git a/src/postamble.js b/src/postamble.js
index d711240c721c..10de96879a5f 100644
--- a/src/postamble.js
+++ b/src/postamble.js
@@ -33,7 +33,6 @@ if (memoryInitializer) (function(s) {
   }
 })(memoryInitializer);
 #else
-#if MEM_INIT_METHOD == 1
 #if USE_PTHREADS
 if (memoryInitializer && !ENVIRONMENT_IS_PTHREAD) {
 #else
@@ -94,7 +93,6 @@ if (memoryInitializer) {
   }
 }
 #endif
-#endif
 
 #if CYBERDWARF
   Module['cyberdwarf'] = _cyberdwarf_Debugger(cyberDWARFFile);
diff --git a/tools/shared.py b/tools/shared.py
index 38cdf0951e47..15808dd9e7f9 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -2279,8 +2279,8 @@ def to_nice_ident(ident): # limited version of the JS function toNiceIdent
 
   # Returns the subresource location for run-time access
   @staticmethod
-  def get_subresource_location(path):
-    if Settings.SINGLE_FILE:
+  def get_subresource_location(path, force_data_uri=False):
+    if Settings.SINGLE_FILE or force_data_uri:
       f = open(path, 'rb')
       data = base64.b64encode(f.read())
       f.close()
@@ -2400,75 +2400,6 @@ def align(x, by):
     while x % by != 0: x += 1
     return x
 
-  INITIALIZER_CHUNK_SIZE = 10240
-
-  @staticmethod
-  def collect_initializers(src):
-    ret = []
-    max_offset = -1
-    for init in re.finditer(JS.memory_initializer_pattern, src):
-      contents = init.group(1).split(',')
-      offset = sum([int(x) if x[0] != 'R' else 0 for x in init.group(2).split('+')])
-      ret.append((offset, contents))
-      assert offset > max_offset
-      max_offset = offset
-    return ret
-
-  @staticmethod
-  def split_initializer(contents):
-    # given a memory initializer (see memory_initializer_pattern), split it up into multiple initializers to avoid long runs of zeros or a single overly-large allocator
-    ret = []
-    l = len(contents)
-    maxx = JS.INITIALIZER_CHUNK_SIZE
-    i = 0
-    start = 0
-    while 1:
-      if i - start >= maxx or (i > start and i == l):
-        #print >> sys.stderr, 'new', start, i-start
-        ret.append((start, contents[start:i]))
-        start = i
-      if i == l: break
-      if contents[i] != '0':
-        i += 1
-      else:
-        # look for a sequence of zeros
-        j = i + 1
-        while j < l and contents[j] == '0': j += 1
-        if j-i > maxx/10 or j-start >= maxx:
-          #print >> sys.stderr, 'skip', start, i-start, j-start
-          ret.append((start, contents[start:i])) # skip over the zeros starting at i and ending at j
-          start = j
-        i = j
-    return ret
-
-  @staticmethod
-  def replace_initializers(src, inits):
-    class State:
-      first = True
-    def rep(m):
-      if not State.first: return ''
-      # write out all the new initializers in place of the first old one
-      State.first = False
-      def gen_init(init):
-        offset, contents = init
-        return '/* memory initializer */ allocate([%s], "i8", ALLOC_NONE, Runtime.GLOBAL_BASE%s);' % (
-          ','.join(contents),
-          '' if offset == 0 else ('+%d' % offset)
-        )
-      return '\n'.join(map(gen_init, inits))
-    return re.sub(JS.memory_initializer_pattern, rep, src)
-
-  @staticmethod
-  def optimize_initializer(src):
-    inits = JS.collect_initializers(src)
-    if len(inits) == 0: return None
-    assert len(inits) == 1
-    init = inits[0]
-    offset, contents = init
-    assert offset == 0 # offset 0, singleton
-    if len(contents) <= JS.INITIALIZER_CHUNK_SIZE: return None
-    return JS.replace_initializers(src, JS.split_initializer(contents))
-
   @staticmethod
   def generate_string_initializer(s):
     if Settings.ASSERTIONS:

From e9b81ccd7cc7c07f4b6130cdbbf95b7e532746f3 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Tue, 13 Jun 2017 20:29:45 -0400
Subject: [PATCH 04/78] parse data URIs in JS to resolve cross-environment and
 CSP issues (#5296)

---
 src/jsifier.js  |  5 +++-
 src/settings.js |  4 ---
 src/shell.js    | 68 ++++++++++++++++++++++++++++++++++++++++++++-----
 3 files changed, 66 insertions(+), 11 deletions(-)

diff --git a/src/jsifier.js b/src/jsifier.js
index 7522d471bf78..f58b596be346 100644
--- a/src/jsifier.js
+++ b/src/jsifier.js
@@ -26,6 +26,8 @@ function JSify(data, functionsOnly) {
   if (mainPass) {
     var shellFile = SHELL_FILE ? SHELL_FILE : (BUILD_AS_SHARED_LIB || SIDE_MODULE ? 'shell_sharedlib.js' : 'shell.js');
 
+    var thirdPartyFiles = ['../third_party/sodiumutil/dist/sodiumutil.js'];
+
     // We will start to print out the data, but must do so carefully - we are
     // dealing with potentially *huge* strings. Convenient replacements and
     // manipulations may create in-memory copies, and we may OOM.
@@ -45,7 +47,8 @@ function JSify(data, functionsOnly) {
     // else. This lets us not hold any strings in memory, we simply print
     // things out as they are ready.
 
-    var shellParts = read(shellFile).split('{{BODY}}');
+    var thirdParty = thirdPartyFiles.map(function(f) { return read(f) }).join('\n');
+    var shellParts = read(shellFile).replace('{{THIRD_PARTY}}', thirdParty).split('{{BODY}}');
     print(processMacros(preprocess(shellParts[0], shellFile)));
     var preFile = BUILD_AS_SHARED_LIB || SIDE_MODULE ? 'preamble_sharedlib.js' : 'preamble.js';
     var pre = processMacros(preprocess(read(preFile).replace('{{RUNTIME}}', getRuntime()), preFile));
diff --git a/src/settings.js b/src/settings.js
index 3afa115dd346..4555e1cf05de 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -860,10 +860,6 @@ var SINGLE_FILE = 0; // If set to 1, embeds all subresources in the emitted JS f
                      // by converting their file names into base64 data URIs. Embedded
                      // subresources may include (but aren't limited to) wasm, asm.js,
                      // and static memory initialization code.
-                     //
-                     // Note that using this option may require a change to consuming
-                     // pages' Content Security Policies -- specifically, adding data:
-                     // to their connect-src directives.
 
 var WASM_TEXT_FILE = ''; // name of the file containing wasm text, if relevant
 var WASM_BINARY_FILE = ''; // name of the file containing wasm binary, if relevant
diff --git a/src/shell.js b/src/shell.js
index 789de77778b9..0da0fe1f257e 100644
--- a/src/shell.js
+++ b/src/shell.js
@@ -71,6 +71,8 @@ if (!ENVIRONMENT_IS_PTHREAD) PthreadWorkerInit = {};
 var currentScriptUrl = ENVIRONMENT_IS_WORKER ? undefined : document.currentScript.src;
 #endif
 
+{{THIRD_PARTY}}
+
 if (ENVIRONMENT_IS_NODE) {
   // Expose functionality in the same simple way that the shells work
   // Note that we pollute the global namespace here, otherwise we break in node
@@ -81,10 +83,13 @@ if (ENVIRONMENT_IS_NODE) {
   var nodePath;
 
   Module['read'] = function shell_read(filename, binary) {
-    if (!nodeFS) nodeFS = require('fs');
-    if (!nodePath) nodePath = require('path');
-    filename = nodePath['normalize'](filename);
-    var ret = nodeFS['readFileSync'](filename);
+    var ret = parseDataURI(filename);
+    if (!ret) {
+      if (!nodeFS) nodeFS = require('fs');
+      if (!nodePath) nodePath = require('path');
+      filename = nodePath['normalize'](filename);
+      ret = nodeFS['readFileSync'](filename);
+    }
     return binary ? ret : ret.toString();
   };
 
@@ -131,16 +136,26 @@ else if (ENVIRONMENT_IS_SHELL) {
   if (typeof printErr != 'undefined') Module['printErr'] = printErr; // not present in v8 or older sm
 
   if (typeof read != 'undefined') {
-    Module['read'] = read;
+    Module['read'] = function shell_read(f) {
+      var data = parseDataURI(f);
+      if (data) {
+        return sodiumUtil.to_string(data);
+      }
+      return read(f);
+    };
   } else {
     Module['read'] = function shell_read() { throw 'no read() available' };
   }
 
   Module['readBinary'] = function readBinary(f) {
+    var data = parseDataURI(f);
+    if (data) {
+      return data;
+    }
     if (typeof readbuffer === 'function') {
       return new Uint8Array(readbuffer(f));
     }
-    var data = read(f, 'binary');
+    data = read(f, 'binary');
     assert(typeof data === 'object');
     return data;
   };
@@ -163,6 +178,10 @@ else if (ENVIRONMENT_IS_SHELL) {
 }
 else if (ENVIRONMENT_IS_WEB || ENVIRONMENT_IS_WORKER) {
   Module['read'] = function shell_read(url) {
+    var data = parseDataURI(url);
+    if (data) {
+      return sodiumUtil.to_string(data);
+    }
     var xhr = new XMLHttpRequest();
     xhr.open('GET', url, false);
     xhr.send(null);
@@ -171,6 +190,10 @@ else if (ENVIRONMENT_IS_WEB || ENVIRONMENT_IS_WORKER) {
 
   if (ENVIRONMENT_IS_WORKER) {
     Module['readBinary'] = function readBinary(url) {
+      var data = parseDataURI(f);
+      if (data) {
+        return data;
+      }
       var xhr = new XMLHttpRequest();
       xhr.open('GET', url, false);
       xhr.responseType = 'arraybuffer';
@@ -180,6 +203,17 @@ else if (ENVIRONMENT_IS_WEB || ENVIRONMENT_IS_WORKER) {
   }
 
   Module['readAsync'] = function readAsync(url, onload, onerror) {
+    try {
+      var data = parseDataURI(url);
+      if (data) {
+        setTimeout(function () { onload(data.buffer); }, 0);
+        return;
+      }
+    }
+    catch (err) {
+      setTimeout(function () { onerror(err); }, 0);
+      return;
+    }
     var xhr = new XMLHttpRequest();
     xhr.open('GET', url, true);
     xhr.responseType = 'arraybuffer';
@@ -228,6 +262,28 @@ else {
   throw 'Unknown runtime environment. Where are we?';
 }
 
+// If filename is a base64 data URI, parses and returns data (Buffer on node,
+// Uint8Array otherwise). If filename is not a base64 data URI, returns undefined.
+function parseDataURI(filename) {
+  var dataURIPrefix = 'data:application/octet-stream;base64,';
+
+  if (!(
+    String.prototype.startsWith ?
+      filename.startsWith(dataURIPrefix) :
+      filename.indexOf(dataURIPrefix) === 0
+  )) {
+    return;
+  }
+
+  var data = filename.slice(dataURIPrefix.length);
+
+  if (ENVIRONMENT_IS_NODE) {
+    return Buffer.from(data, 'base64');
+  }
+
+  return sodiumUtil.from_base64(data);
+}
+
 function globalEval(x) {
   {{{ makeEval('eval.call(null, x);') }}}
 }

From cb300b69b9ddf005704f189f2376523811f19bcb Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Wed, 14 Jun 2017 01:49:34 -0400
Subject: [PATCH 05/78] minor cleanup (#5296)

---
 emcc.py         |  4 +++-
 src/shell.js    | 14 +++++++-------
 tools/shared.py |  4 ++--
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/emcc.py b/emcc.py
index db560c6a18b2..8dd65e646c16 100755
--- a/emcc.py
+++ b/emcc.py
@@ -1605,7 +1605,7 @@ def get_final():
 
     with ToolchainProfiler.profile_block('memory initializer'):
       memfile = None
-      embed_memfile = shared.Settings.MEM_INIT_METHOD == 0 and (not shared.Settings.MAIN_MODULE and not shared.Settings.SIDE_MODULE and options.debug_level < 4)
+      embed_memfile = (Settings.SINGLE_FILE or shared.Settings.MEM_INIT_METHOD == 0) and (not shared.Settings.MAIN_MODULE and not shared.Settings.SIDE_MODULE and options.debug_level < 4)
 
       if shared.Settings.MEM_INIT_METHOD > 0 or embed_memfile:
         memfile = target + '.mem'
@@ -1637,6 +1637,8 @@ def repl(m):
         final += '.mem.js'
         src = None
         js_transform_tempfiles[-1] = final # simple text substitution preserves comment line number mappings
+        if embed_memfile:
+          os.remove(memfile)
         if DEBUG:
           if os.path.exists(memfile):
             save_intermediate('meminit')
diff --git a/src/shell.js b/src/shell.js
index 0da0fe1f257e..949b11e0f35f 100644
--- a/src/shell.js
+++ b/src/shell.js
@@ -83,7 +83,7 @@ if (ENVIRONMENT_IS_NODE) {
   var nodePath;
 
   Module['read'] = function shell_read(filename, binary) {
-    var ret = parseDataURI(filename);
+    var ret = tryParseAsDataURI(filename);
     if (!ret) {
       if (!nodeFS) nodeFS = require('fs');
       if (!nodePath) nodePath = require('path');
@@ -137,7 +137,7 @@ else if (ENVIRONMENT_IS_SHELL) {
 
   if (typeof read != 'undefined') {
     Module['read'] = function shell_read(f) {
-      var data = parseDataURI(f);
+      var data = tryParseAsDataURI(f);
       if (data) {
         return sodiumUtil.to_string(data);
       }
@@ -148,7 +148,7 @@ else if (ENVIRONMENT_IS_SHELL) {
   }
 
   Module['readBinary'] = function readBinary(f) {
-    var data = parseDataURI(f);
+    var data = tryParseAsDataURI(f);
     if (data) {
       return data;
     }
@@ -178,7 +178,7 @@ else if (ENVIRONMENT_IS_SHELL) {
 }
 else if (ENVIRONMENT_IS_WEB || ENVIRONMENT_IS_WORKER) {
   Module['read'] = function shell_read(url) {
-    var data = parseDataURI(url);
+    var data = tryParseAsDataURI(url);
     if (data) {
       return sodiumUtil.to_string(data);
     }
@@ -190,7 +190,7 @@ else if (ENVIRONMENT_IS_WEB || ENVIRONMENT_IS_WORKER) {
 
   if (ENVIRONMENT_IS_WORKER) {
     Module['readBinary'] = function readBinary(url) {
-      var data = parseDataURI(f);
+      var data = tryParseAsDataURI(f);
       if (data) {
         return data;
       }
@@ -204,7 +204,7 @@ else if (ENVIRONMENT_IS_WEB || ENVIRONMENT_IS_WORKER) {
 
   Module['readAsync'] = function readAsync(url, onload, onerror) {
     try {
-      var data = parseDataURI(url);
+      var data = tryParseAsDataURI(url);
       if (data) {
         setTimeout(function () { onload(data.buffer); }, 0);
         return;
@@ -264,7 +264,7 @@ else {
 
 // If filename is a base64 data URI, parses and returns data (Buffer on node,
 // Uint8Array otherwise). If filename is not a base64 data URI, returns undefined.
-function parseDataURI(filename) {
+function tryParseAsDataURI(filename) {
   var dataURIPrefix = 'data:application/octet-stream;base64,';
 
   if (!(
diff --git a/tools/shared.py b/tools/shared.py
index 15808dd9e7f9..404ea97344fb 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -2279,8 +2279,8 @@ def to_nice_ident(ident): # limited version of the JS function toNiceIdent
 
   # Returns the subresource location for run-time access
   @staticmethod
-  def get_subresource_location(path, force_data_uri=False):
-    if Settings.SINGLE_FILE or force_data_uri:
+  def get_subresource_location(path, data_uri=Settings.SINGLE_FILE):
+    if data_uri:
       f = open(path, 'rb')
       data = base64.b64encode(f.read())
       f.close()

From 2e33fb00e9482fe1a83b73a3f6f0316d91da8d1b Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Wed, 14 Jun 2017 11:12:17 -0400
Subject: [PATCH 06/78] handle EMTERPRETIFY_FILE (#5296)

---
 emcc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emcc.py b/emcc.py
index 8dd65e646c16..0056f9689561 100755
--- a/emcc.py
+++ b/emcc.py
@@ -2389,7 +2389,7 @@ def generate_html(target, options, js_target, target_basename,
 %s
           };
           emterpretXHR.send(null);
-''' % (shared.Settings.EMTERPRETIFY_FILE, script.inline)
+''' % (shared.JS.get_subresource_location(shared.Settings.EMTERPRETIFY_FILE), script.inline)
 
   if options.memory_init_file:
     # start to load the memory init file in the HTML, in parallel with the JS

From 32bee1e954b735f3cefca65b414bd6951bad0c18 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Wed, 14 Jun 2017 20:49:40 -0400
Subject: [PATCH 07/78] HTML worker fix (#5296)

---
 emcc.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/emcc.py b/emcc.py
index 0056f9689561..2870883b5cc6 100755
--- a/emcc.py
+++ b/emcc.py
@@ -2364,10 +2364,10 @@ def generate_html(target, options, js_target, target_basename,
     // note: no support for code mods (PRECISE_F32==2)
     console.log('running code on the main thread');
     var script = document.createElement('script');
-    script.src = "%s.js";
+    script.src = "%s";
     document.body.appendChild(script);
   }
-''' % proxy_worker_filename
+''' % shared.JS.get_subresource_location(proxy_worker_filename + '.js')
   else:
     # Normal code generation path
     script.src = base_js_target

From a21e1d89d7f5262b01133e536bdaa374b12fb304 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Wed, 14 Jun 2017 21:10:59 -0400
Subject: [PATCH 08/78] document SINGLE_FILE + HTML output (#5296)

---
 src/settings.js | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/settings.js b/src/settings.js
index 4555e1cf05de..f0ae35bc5b99 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -47,7 +47,9 @@ var INVOKE_RUN = 1; // Whether we will run the main() function. Disable if you e
 var NO_EXIT_RUNTIME = 0; // If set, the runtime is not quit when main() completes (allowing code to
                          // run afterwards, for example from the browser main event loop).
 var MEM_INIT_METHOD = 0; // How to represent the initial memory content.
-                         // 0: keep array literal representing the initial memory data
+                         // 0: embed a base64 string literal representing the initial memory data;
+                         //    if using this in combination with HTML output, your Content Security
+                         //    Policy may need to be modified (see SINGLE_FILE for more details)
                          // 1: create a *.mem file containing the binary data of the initial memory;
                          //    use the --memory-init-file command line switch to select this method
                          // 2: embed a string literal representing that initial memory data
@@ -856,10 +858,25 @@ var FETCH = 0; // If nonzero, enables emscripten_fetch API.
 
 var ASMFS = 0; // If set to 1, uses the multithreaded filesystem that is implemented within the asm.js module, using emscripten_fetch. Implies -s FETCH=1.
 
-var SINGLE_FILE = 0; // If set to 1, embeds all subresources in the emitted JS file
+var SINGLE_FILE = 0; // If set to 1, embeds all subresources in the emitted file
                      // by converting their file names into base64 data URIs. Embedded
                      // subresources may include (but aren't limited to) wasm, asm.js,
                      // and static memory initialization code.
+                     //
+                     // MEM_INIT_METHOD 0 uses the same logic as SINGLE_FILE, so the following
+                     // information applies to that as well:
+                     //
+                     // If used when generating JavaScript output, the subresource data URIs
+                     // will be parsed directly in JavaScript for ensured compatibility
+                     // across runtime environments.
+                     //
+                     // If used when generating HTML output, <script> elements will be
+                     // inserted with data URI src attributes and other subresource data URIs
+                     // will be requested via XHR. This means that your Content Security Policy
+                     // may need to be updated to ensure that the script-src and/or connect-src
+                     // directives whitelist data:. If you aren't using Content Security Policy,
+                     // or your CSP header doesn't include either script-src or connect-src,
+                     // then you can safely ignore this warning.
 
 var WASM_TEXT_FILE = ''; // name of the file containing wasm text, if relevant
 var WASM_BINARY_FILE = ''; // name of the file containing wasm binary, if relevant

From e1241411b187c98ddb4441b6eca34b0027a4b7a6 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Wed, 14 Jun 2017 21:26:49 -0400
Subject: [PATCH 09/78] include sodiumutil only when needed (#5296)

---
 src/jsifier.js  | 6 +++++-
 tools/shared.py | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/jsifier.js b/src/jsifier.js
index f58b596be346..03beb49890d9 100644
--- a/src/jsifier.js
+++ b/src/jsifier.js
@@ -26,7 +26,11 @@ function JSify(data, functionsOnly) {
   if (mainPass) {
     var shellFile = SHELL_FILE ? SHELL_FILE : (BUILD_AS_SHARED_LIB || SIDE_MODULE ? 'shell_sharedlib.js' : 'shell.js');
 
-    var thirdPartyFiles = ['../third_party/sodiumutil/dist/sodiumutil.js'];
+    var thirdPartyFiles = [];
+    
+    if (INCLUDE_THIRD_PARTY_SODIUMUTIL) {
+      thirdPartyFiles.push('../third_party/sodiumutil/dist/sodiumutil.js');
+    }
 
     // We will start to print out the data, but must do so carefully - we are
     // dealing with potentially *huge* strings. Convenient replacements and
diff --git a/tools/shared.py b/tools/shared.py
index 404ea97344fb..ecfb526b7d42 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -2281,6 +2281,7 @@ def to_nice_ident(ident): # limited version of the JS function toNiceIdent
   @staticmethod
   def get_subresource_location(path, data_uri=Settings.SINGLE_FILE):
     if data_uri:
+      Settings.INCLUDE_THIRD_PARTY_SODIUMUTIL = 1
       f = open(path, 'rb')
       data = base64.b64encode(f.read())
       f.close()

From 01b12b53c2cee6a99fc908f9f4e1f9c4a20584eb Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Wed, 14 Jun 2017 22:04:11 -0400
Subject: [PATCH 10/78] minor fixes (#5296)

---
 emcc.py         | 2 +-
 src/settings.js | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/emcc.py b/emcc.py
index 2870883b5cc6..78f52a76e155 100755
--- a/emcc.py
+++ b/emcc.py
@@ -1605,7 +1605,7 @@ def get_final():
 
     with ToolchainProfiler.profile_block('memory initializer'):
       memfile = None
-      embed_memfile = (Settings.SINGLE_FILE or shared.Settings.MEM_INIT_METHOD == 0) and (not shared.Settings.MAIN_MODULE and not shared.Settings.SIDE_MODULE and options.debug_level < 4)
+      embed_memfile = (shared.Settings.SINGLE_FILE or shared.Settings.MEM_INIT_METHOD == 0) and (not shared.Settings.MAIN_MODULE and not shared.Settings.SIDE_MODULE and options.debug_level < 4)
 
       if shared.Settings.MEM_INIT_METHOD > 0 or embed_memfile:
         memfile = target + '.mem'
diff --git a/src/settings.js b/src/settings.js
index f0ae35bc5b99..e3cf7f1ae5fe 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -881,3 +881,6 @@ var SINGLE_FILE = 0; // If set to 1, embeds all subresources in the emitted file
 var WASM_TEXT_FILE = ''; // name of the file containing wasm text, if relevant
 var WASM_BINARY_FILE = ''; // name of the file containing wasm binary, if relevant
 var ASMJS_CODE_FILE = ''; // name of the file containing asm.js, if relevant
+
+var INCLUDE_THIRD_PARTY_SODIUMUTIL = 0; // If set to 1, sodiumutil will be included in the bundle.
+                                        // Automatically set as needed, specifically for SINGLE_FILE.

From 0c82c164a31e9cc22f440400fcbad95e3cb55a98 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Wed, 14 Jun 2017 22:53:04 -0400
Subject: [PATCH 11/78] binaryen get_subresource_location timing fix (#5296)

---
 emcc.py         | 25 +++++++++++++++++++++----
 tools/shared.py | 10 +++++++++-
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/emcc.py b/emcc.py
index 78f52a76e155..0c1adb51bebd 100755
--- a/emcc.py
+++ b/emcc.py
@@ -1115,10 +1115,10 @@ def check(input_file):
         os.environ['EMCC_WASM_BACKEND_BINARYEN'] = '1'
 
       if shared.Settings.BINARYEN:
-        # set file locations, so that JS glue can find what it needs
-        shared.Settings.WASM_TEXT_FILE = shared.JS.get_subresource_location(wasm_text_target)
-        shared.Settings.WASM_BINARY_FILE = shared.JS.get_subresource_location(wasm_binary_target)
-        shared.Settings.ASMJS_CODE_FILE = shared.JS.get_subresource_location(asm_target)
+        # placeholder strings for JS glue, to be replaced with subresource locations in do_binaryen
+        shared.Settings.WASM_TEXT_FILE = shared.FilenameReplacementStrings.WASM_TEXT_FILE
+        shared.Settings.WASM_BINARY_FILE = shared.FilenameReplacementStrings.WASM_BINARY_FILE
+        shared.Settings.ASMJS_CODE_FILE = shared.FilenameReplacementStrings.ASMJS_CODE_FILE
 
         shared.Settings.ASM_JS = 2 # when targeting wasm, we use a wasm Memory, but that is not compatible with asm.js opts
         shared.Settings.GLOBAL_BASE = 1024 # leave some room for mapping global vars
@@ -2316,6 +2316,23 @@ def do_binaryen(final, target, asm_target, options, memfile, wasm_binary_target,
           passes.append('minifyWhitespace')
         final = shared.Building.js_optimizer_no_asmjs(final, passes)
       if DEBUG: save_intermediate('postclean', 'js')
+  # replace placeholder strings with correct subresource locations
+  f = open(final, 'r')
+  js = f.read()
+  f.close()
+  f = open(final, 'w')
+  for tup in [
+    (wasm_text_target, shared.FilenameReplacementStrings.WASM_TEXT_FILE),
+    (wasm_binary_target, shared.FilenameReplacementStrings.WASM_BINARY_FILE),
+    (asm_target, shared.FilenameReplacementStrings.ASMJS_CODE_FILE)
+  ]:
+    if not os.path.isfile(tup[0]):
+      continue
+    js = js.replace(tup[1], shared.JS.get_subresource_location(tup[0]))
+    if shared.Settings.SINGLE_FILE:
+      os.remove(tup[0])
+  f.write(js)
+  f.close()
   return final
 
 
diff --git a/tools/shared.py b/tools/shared.py
index ecfb526b7d42..e9f57d74c736 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -2265,6 +2265,12 @@ def reconfigure_cache():
   global Cache
   Cache = cache.Cache(debug=DEBUG_CACHE)
 
+# Placeholder strings used for SINGLE_FILE
+class FilenameReplacementStrings:
+  WASM_TEXT_FILE = 'FILENAME_REPLACEMENT_STRINGS_WASM_TEXT_FILE'
+  WASM_BINARY_FILE = 'FILENAME_REPLACEMENT_STRINGS_WASM_BINARY_FILE'
+  ASMJS_CODE_FILE = 'FILENAME_REPLACEMENT_STRINGS_ASMJS_CODE_FILE'
+
 class JS:
   memory_initializer_pattern = '/\* memory initializer \*/ allocate\(\[([\d, ]*)\], "i8", ALLOC_NONE, ([\d+Runtime\.GLOBAL_BASEHgb]+)\);'
   no_memory_initializer_pattern = '/\* no memory initializer \*/'
@@ -2279,7 +2285,9 @@ def to_nice_ident(ident): # limited version of the JS function toNiceIdent
 
   # Returns the subresource location for run-time access
   @staticmethod
-  def get_subresource_location(path, data_uri=Settings.SINGLE_FILE):
+  def get_subresource_location(path, data_uri=None):
+    if data_uri is None:
+      data_uri = Settings.SINGLE_FILE
     if data_uri:
       Settings.INCLUDE_THIRD_PARTY_SODIUMUTIL = 1
       f = open(path, 'rb')

From 4fb1605ad003fcebf42335ea0b20f971f64574f4 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Wed, 14 Jun 2017 23:19:19 -0400
Subject: [PATCH 12/78] handle SINGLE_FILE in getBinary (#5296)

---
 src/preamble.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/preamble.js b/src/preamble.js
index e3521d04076d..da1e44f0db98 100644
--- a/src/preamble.js
+++ b/src/preamble.js
@@ -2218,6 +2218,9 @@ function integrateWasmJS(Module) {
     } else if (Module['readBinary']) {
       binary = Module['readBinary'](wasmBinaryFile);
     } else {
+      binary = tryParseAsDataURI(wasmBinaryFile);
+    }
+    if (!binary) {
       throw "on the web, we need the wasm binary to be preloaded and set on Module['wasmBinary']. emcc.py will do that for you when generating HTML (but not JS)";
     }
     return binary;

From 998f937ede60b9c4fbbd38a1a1613e781665d225 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Fri, 16 Jun 2017 01:42:34 -0400
Subject: [PATCH 13/78] follow replacement string convention (#5296)

---
 tools/shared.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/shared.py b/tools/shared.py
index e9f57d74c736..87994ab8ebf0 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -2267,9 +2267,9 @@ def reconfigure_cache():
 
 # Placeholder strings used for SINGLE_FILE
 class FilenameReplacementStrings:
-  WASM_TEXT_FILE = 'FILENAME_REPLACEMENT_STRINGS_WASM_TEXT_FILE'
-  WASM_BINARY_FILE = 'FILENAME_REPLACEMENT_STRINGS_WASM_BINARY_FILE'
-  ASMJS_CODE_FILE = 'FILENAME_REPLACEMENT_STRINGS_ASMJS_CODE_FILE'
+  WASM_TEXT_FILE = '{{{ FILENAME_REPLACEMENT_STRINGS_WASM_TEXT_FILE }}}'
+  WASM_BINARY_FILE = '{{{ FILENAME_REPLACEMENT_STRINGS_WASM_BINARY_FILE }}}'
+  ASMJS_CODE_FILE = '{{{ FILENAME_REPLACEMENT_STRINGS_ASMJS_CODE_FILE }}}'
 
 class JS:
   memory_initializer_pattern = '/\* memory initializer \*/ allocate\(\[([\d, ]*)\], "i8", ALLOC_NONE, ([\d+Runtime\.GLOBAL_BASEHgb]+)\);'

From 549a9b07eed425b72276de609d67a0205a6502b8 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Fri, 16 Jun 2017 01:48:23 -0400
Subject: [PATCH 14/78] skip unneeded work for non-SINGLE_FILE compilation
 (#5296)

---
 emcc.py | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/emcc.py b/emcc.py
index 0c1adb51bebd..330e2ef625fe 100755
--- a/emcc.py
+++ b/emcc.py
@@ -1115,10 +1115,16 @@ def check(input_file):
         os.environ['EMCC_WASM_BACKEND_BINARYEN'] = '1'
 
       if shared.Settings.BINARYEN:
-        # placeholder strings for JS glue, to be replaced with subresource locations in do_binaryen
-        shared.Settings.WASM_TEXT_FILE = shared.FilenameReplacementStrings.WASM_TEXT_FILE
-        shared.Settings.WASM_BINARY_FILE = shared.FilenameReplacementStrings.WASM_BINARY_FILE
-        shared.Settings.ASMJS_CODE_FILE = shared.FilenameReplacementStrings.ASMJS_CODE_FILE
+        if shared.Settings.SINGLE_FILE:
+          # placeholder strings for JS glue, to be replaced with subresource locations in do_binaryen
+          shared.Settings.WASM_TEXT_FILE = shared.FilenameReplacementStrings.WASM_TEXT_FILE
+          shared.Settings.WASM_BINARY_FILE = shared.FilenameReplacementStrings.WASM_BINARY_FILE
+          shared.Settings.ASMJS_CODE_FILE = shared.FilenameReplacementStrings.ASMJS_CODE_FILE
+        else:
+          # set file locations, so that JS glue can find what it needs
+          shared.Settings.WASM_TEXT_FILE = shared.JS.get_subresource_location(wasm_text_target)
+          shared.Settings.WASM_BINARY_FILE = shared.JS.get_subresource_location(wasm_binary_target)
+          shared.Settings.ASMJS_CODE_FILE = shared.JS.get_subresource_location(asm_target)
 
         shared.Settings.ASM_JS = 2 # when targeting wasm, we use a wasm Memory, but that is not compatible with asm.js opts
         shared.Settings.GLOBAL_BASE = 1024 # leave some room for mapping global vars
@@ -2321,18 +2327,18 @@ def do_binaryen(final, target, asm_target, options, memfile, wasm_binary_target,
   js = f.read()
   f.close()
   f = open(final, 'w')
-  for tup in [
-    (wasm_text_target, shared.FilenameReplacementStrings.WASM_TEXT_FILE),
-    (wasm_binary_target, shared.FilenameReplacementStrings.WASM_BINARY_FILE),
-    (asm_target, shared.FilenameReplacementStrings.ASMJS_CODE_FILE)
-  ]:
-    if not os.path.isfile(tup[0]):
-      continue
-    js = js.replace(tup[1], shared.JS.get_subresource_location(tup[0]))
-    if shared.Settings.SINGLE_FILE:
+  if shared.Settings.SINGLE_FILE:
+    for tup in [
+      (wasm_text_target, shared.FilenameReplacementStrings.WASM_TEXT_FILE),
+      (wasm_binary_target, shared.FilenameReplacementStrings.WASM_BINARY_FILE),
+      (asm_target, shared.FilenameReplacementStrings.ASMJS_CODE_FILE)
+    ]:
+      if not os.path.isfile(tup[0]):
+        continue
+      js = js.replace(tup[1], shared.JS.get_subresource_location(tup[0]))
       os.remove(tup[0])
-  f.write(js)
-  f.close()
+    f.write(js)
+    f.close()
   return final
 
 

From 9e5c34a662f188c0c7d3a675fce2aca3d1312889 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Sat, 17 Jun 2017 14:01:02 -0400
Subject: [PATCH 15/78] add myself to AUTHORS (#5296)

---
 AUTHORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS b/AUTHORS
index 9637e855a69d..d2970b361bd1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -297,3 +297,4 @@ a license to everyone to use it as detailed in LICENSE.)
 * Matjaž Drolc <mdrolc@gmail.com>
 * James Swift <james@3dengineer.com> (copyright owned by PSPDFKit GmbH)
 * Sam Clegg <sbc@chromium.org> (copyright owned by Google, Inc.
+* Ryan Lester <ryan@cyph.com> (copyright owned by Cyph, Inc.)

From eeb547a20499bd285b4a96f8afee28fc177c872f Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Sat, 17 Jun 2017 15:21:37 -0400
Subject: [PATCH 16/78] switch from sodiumutil to first-party base64 and UTF-8
 implementations

---
 src/jsifier.js  |  9 +--------
 src/settings.js |  3 ---
 src/shell.js    | 39 ++++++++++++++++++++++++++++++---------
 tools/shared.py |  1 -
 4 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/src/jsifier.js b/src/jsifier.js
index a157d5f10887..a0597907cc34 100644
--- a/src/jsifier.js
+++ b/src/jsifier.js
@@ -26,12 +26,6 @@ function JSify(data, functionsOnly) {
   if (mainPass) {
     var shellFile = SHELL_FILE ? SHELL_FILE : (BUILD_AS_SHARED_LIB || SIDE_MODULE ? 'shell_sharedlib.js' : 'shell.js');
 
-    var thirdPartyFiles = [];
-    
-    if (INCLUDE_THIRD_PARTY_SODIUMUTIL) {
-      thirdPartyFiles.push('../third_party/sodiumutil/dist/sodiumutil.js');
-    }
-
     // We will start to print out the data, but must do so carefully - we are
     // dealing with potentially *huge* strings. Convenient replacements and
     // manipulations may create in-memory copies, and we may OOM.
@@ -51,8 +45,7 @@ function JSify(data, functionsOnly) {
     // else. This lets us not hold any strings in memory, we simply print
     // things out as they are ready.
 
-    var thirdParty = thirdPartyFiles.map(function(f) { return read(f) }).join('\n');
-    var shellParts = read(shellFile).replace('{{THIRD_PARTY}}', thirdParty).split('{{BODY}}');
+    var shellParts = read(shellFile).split('{{BODY}}');
     print(processMacros(preprocess(shellParts[0], shellFile)));
     var preFile = BUILD_AS_SHARED_LIB || SIDE_MODULE ? 'preamble_sharedlib.js' : 'preamble.js';
     var pre = processMacros(preprocess(read(preFile).replace('{{RUNTIME}}', getRuntime()), preFile));
diff --git a/src/settings.js b/src/settings.js
index 811f77c87701..31eada49713d 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -882,6 +882,3 @@ var SINGLE_FILE = 0; // If set to 1, embeds all subresources in the emitted file
 var WASM_TEXT_FILE = ''; // name of the file containing wasm text, if relevant
 var WASM_BINARY_FILE = ''; // name of the file containing wasm binary, if relevant
 var ASMJS_CODE_FILE = ''; // name of the file containing asm.js, if relevant
-
-var INCLUDE_THIRD_PARTY_SODIUMUTIL = 0; // If set to 1, sodiumutil will be included in the bundle.
-                                        // Automatically set as needed, specifically for SINGLE_FILE.
diff --git a/src/shell.js b/src/shell.js
index 949b11e0f35f..0b1a637c1ad8 100644
--- a/src/shell.js
+++ b/src/shell.js
@@ -71,8 +71,6 @@ if (!ENVIRONMENT_IS_PTHREAD) PthreadWorkerInit = {};
 var currentScriptUrl = ENVIRONMENT_IS_WORKER ? undefined : document.currentScript.src;
 #endif
 
-{{THIRD_PARTY}}
-
 if (ENVIRONMENT_IS_NODE) {
   // Expose functionality in the same simple way that the shells work
   // Note that we pollute the global namespace here, otherwise we break in node
@@ -139,7 +137,7 @@ else if (ENVIRONMENT_IS_SHELL) {
     Module['read'] = function shell_read(f) {
       var data = tryParseAsDataURI(f);
       if (data) {
-        return sodiumUtil.to_string(data);
+        return bytesToString(data);
       }
       return read(f);
     };
@@ -180,7 +178,7 @@ else if (ENVIRONMENT_IS_WEB || ENVIRONMENT_IS_WORKER) {
   Module['read'] = function shell_read(url) {
     var data = tryParseAsDataURI(url);
     if (data) {
-      return sodiumUtil.to_string(data);
+      return bytesToString(data);
     }
     var xhr = new XMLHttpRequest();
     xhr.open('GET', url, false);
@@ -209,8 +207,7 @@ else if (ENVIRONMENT_IS_WEB || ENVIRONMENT_IS_WORKER) {
         setTimeout(function () { onload(data.buffer); }, 0);
         return;
       }
-    }
-    catch (err) {
+    } catch (err) {
       setTimeout(function () { onerror(err); }, 0);
       return;
     }
@@ -258,8 +255,32 @@ else if (ENVIRONMENT_IS_WEB || ENVIRONMENT_IS_WORKER) {
   }
 }
 else {
-  // Unreachable because SHELL is dependant on the others
-  throw 'Unknown runtime environment. Where are we?';
+  // Unreachable because SHELL is dependent on the others
+  throw new Error('Unknown runtime environment. Where are we?');
+}
+
+function base64ToBytes(s) {
+  try {
+    var decoded = atob(s);
+    var bytes = new Uint8Array(decoded.length);
+    for (i = 0 ; i < decoded.length ; ++i) {
+      bytes[i] = decoded.charCodeAt(i);
+    }
+    return bytes;
+  } catch (_) {
+    throw new Error('Converting base64 string to bytes failed.');
+  }
+}
+
+function bytesToString(bytes) {
+  if (typeof TextDecoder !== 'undefined') {
+    return new TextDecoder('utf-8').decode(bytes);
+  }
+  var s = '';
+  for (var i = 0 ; i < bytes.length ; ++i) {
+      s += String.fromCharCode(bytes[i]);
+  }
+  return s;
 }
 
 // If filename is a base64 data URI, parses and returns data (Buffer on node,
@@ -281,7 +302,7 @@ function tryParseAsDataURI(filename) {
     return Buffer.from(data, 'base64');
   }
 
-  return sodiumUtil.from_base64(data);
+  return base64ToBytes(data);
 }
 
 function globalEval(x) {
diff --git a/tools/shared.py b/tools/shared.py
index 78b90bf4e9ee..140fdad6fccf 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -2330,7 +2330,6 @@ def get_subresource_location(path, data_uri=None):
     if data_uri is None:
       data_uri = Settings.SINGLE_FILE
     if data_uri:
-      Settings.INCLUDE_THIRD_PARTY_SODIUMUTIL = 1
       f = open(path, 'rb')
       data = base64.b64encode(f.read())
       f.close()

From b43f8ea42c42eb85139ecc8c4ca4e167cd99ab3c Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Sat, 17 Jun 2017 21:12:22 -0400
Subject: [PATCH 17/78] document encoding functions' behaviour (#5296)

---
 src/shell.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/shell.js b/src/shell.js
index 0b1a637c1ad8..ef21c0f11538 100644
--- a/src/shell.js
+++ b/src/shell.js
@@ -259,6 +259,8 @@ else {
   throw new Error('Unknown runtime environment. Where are we?');
 }
 
+// Converts a string of base64 into a byte array.
+// Throws error on invalid input.
 function base64ToBytes(s) {
   try {
     var decoded = atob(s);
@@ -272,6 +274,8 @@ function base64ToBytes(s) {
   }
 }
 
+// Converts a byte array into a string.
+// Returns invalid output on invalid input.
 function bytesToString(bytes) {
   if (typeof TextDecoder !== 'undefined') {
     return new TextDecoder('utf-8').decode(bytes);

From c16ca3e3836f3d48fe2e7100fe447be2adb0e492 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Sat, 17 Jun 2017 22:37:41 -0400
Subject: [PATCH 18/78] possible minor fix (#5296)

---
 emcc.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/emcc.py b/emcc.py
index 25167d7d3ccc..55f0a50bda2e 100755
--- a/emcc.py
+++ b/emcc.py
@@ -1643,8 +1643,6 @@ def repl(m):
         final += '.mem.js'
         src = None
         js_transform_tempfiles[-1] = final # simple text substitution preserves comment line number mappings
-        if embed_memfile:
-          os.remove(memfile)
         if DEBUG:
           if os.path.exists(memfile):
             save_intermediate('meminit')
@@ -1809,6 +1807,9 @@ def get_eliminate():
         if options.proxy_to_worker:
           generate_worker_js(target, js_target, target_basename)
 
+      if embed_memfile:
+        shared.try_delete(memfile)
+
       for f in generated_text_files_with_native_eols:
         tools.line_endings.convert_line_endings_in_file(f, os.linesep, options.output_eol)
     log_time('final emitting')
@@ -2335,7 +2336,7 @@ def do_binaryen(final, target, asm_target, options, memfile, wasm_binary_target,
       if not os.path.isfile(tup[0]):
         continue
       js = js.replace(tup[1], shared.JS.get_subresource_location(tup[0]))
-      os.remove(tup[0])
+      shared.try_delete(tup[0])
     f.write(js)
     f.close()
   return final

From bc0074eea9e95466812b5ae77a18fe833bf502a2 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Mon, 19 Jun 2017 12:53:51 -0400
Subject: [PATCH 19/78] minor fix (#5296)

---
 emcc.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/emcc.py b/emcc.py
index 55f0a50bda2e..881d80df9f52 100755
--- a/emcc.py
+++ b/emcc.py
@@ -2323,11 +2323,11 @@ def do_binaryen(final, target, asm_target, options, memfile, wasm_binary_target,
         final = shared.Building.js_optimizer_no_asmjs(final, passes)
       if DEBUG: save_intermediate('postclean', 'js')
   # replace placeholder strings with correct subresource locations
-  f = open(final, 'r')
-  js = f.read()
-  f.close()
-  f = open(final, 'w')
   if shared.Settings.SINGLE_FILE:
+    f = open(final, 'r')
+    js = f.read()
+    f.close()
+    f = open(final, 'w')
     for tup in [
       (wasm_text_target, shared.FilenameReplacementStrings.WASM_TEXT_FILE),
       (wasm_binary_target, shared.FilenameReplacementStrings.WASM_BINARY_FILE),

From 19cbb0263225cb418b21133797361c88a705e3a6 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Mon, 19 Jun 2017 15:15:37 -0400
Subject: [PATCH 20/78] getBinary minor cleanup (#5296)

---
 src/preamble.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/preamble.js b/src/preamble.js
index fc0d5247c0ee..3182dcebadf9 100644
--- a/src/preamble.js
+++ b/src/preamble.js
@@ -2223,19 +2223,17 @@ function integrateWasmJS(Module) {
   }
 
   function getBinary() {
-    var binary;
     if (Module['wasmBinary']) {
-      binary = Module['wasmBinary'];
-      binary = new Uint8Array(binary);
+      return new Uint8Array(Module['wasmBinary']);
+    }
+    var binary = tryParseAsDataURI(wasmBinaryFile);
+    if (binary) {
+      return binary;
     } else if (Module['readBinary']) {
-      binary = Module['readBinary'](wasmBinaryFile);
+      return Module['readBinary'](wasmBinaryFile);
     } else {
-      binary = tryParseAsDataURI(wasmBinaryFile);
-    }
-    if (!binary) {
       throw "on the web, we need the wasm binary to be preloaded and set on Module['wasmBinary']. emcc.py will do that for you when generating HTML (but not JS)";
     }
-    return binary;
   }
 
   function getBinaryPromise() {

From 77657950fd2345834b4463ca4408f27bbd2f79ff Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Mon, 19 Jun 2017 16:04:49 -0400
Subject: [PATCH 21/78] merge bytesToString into intArrayToString (#5296)

---
 src/preamble.js |  6 ++++++
 src/shell.js    | 17 ++---------------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/preamble.js b/src/preamble.js
index 3182dcebadf9..d1a510236fb5 100644
--- a/src/preamble.js
+++ b/src/preamble.js
@@ -1714,6 +1714,12 @@ function intArrayFromString(stringy, dontAddNull, length) {
 {{{ maybeExport('intArrayFromString') }}}
 
 function intArrayToString(array) {
+  if (typeof TextDecoder !== 'undefined') {
+    return new TextDecoder('utf-8').decode(array);
+  }
+  else if (typeof Buffer !== 'undefined') {
+    return Buffer.from(array.buffer || array).toString();
+  }
   var ret = [];
   for (var i = 0; i < array.length; i++) {
     var chr = array[i];
diff --git a/src/shell.js b/src/shell.js
index ef21c0f11538..e2f001f9f0dd 100644
--- a/src/shell.js
+++ b/src/shell.js
@@ -137,7 +137,7 @@ else if (ENVIRONMENT_IS_SHELL) {
     Module['read'] = function shell_read(f) {
       var data = tryParseAsDataURI(f);
       if (data) {
-        return bytesToString(data);
+        return intArrayToString(data);
       }
       return read(f);
     };
@@ -178,7 +178,7 @@ else if (ENVIRONMENT_IS_WEB || ENVIRONMENT_IS_WORKER) {
   Module['read'] = function shell_read(url) {
     var data = tryParseAsDataURI(url);
     if (data) {
-      return bytesToString(data);
+      return intArrayToString(data);
     }
     var xhr = new XMLHttpRequest();
     xhr.open('GET', url, false);
@@ -274,19 +274,6 @@ function base64ToBytes(s) {
   }
 }
 
-// Converts a byte array into a string.
-// Returns invalid output on invalid input.
-function bytesToString(bytes) {
-  if (typeof TextDecoder !== 'undefined') {
-    return new TextDecoder('utf-8').decode(bytes);
-  }
-  var s = '';
-  for (var i = 0 ; i < bytes.length ; ++i) {
-      s += String.fromCharCode(bytes[i]);
-  }
-  return s;
-}
-
 // If filename is a base64 data URI, parses and returns data (Buffer on node,
 // Uint8Array otherwise). If filename is not a base64 data URI, returns undefined.
 function tryParseAsDataURI(filename) {

From 73d1c9192d177ee9866391a960d39f8eea215f4d Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Mon, 19 Jun 2017 17:13:57 -0400
Subject: [PATCH 22/78] handle data URI parsing in HTML output (#5296)

---
 emcc.py            | 137 +++++++++++++++++++++++++++++++++++++--------
 src/postamble.js   |  11 +++-
 src/proxyClient.js |  12 +++-
 src/settings.js    |  31 ++++------
 4 files changed, 144 insertions(+), 47 deletions(-)

diff --git a/emcc.py b/emcc.py
index d019730e1dff..783e882d54ce 100755
--- a/emcc.py
+++ b/emcc.py
@@ -2386,8 +2386,14 @@ def generate_html(target, options, js_target, target_basename,
   } else {
     // note: no support for code mods (PRECISE_F32==2)
     console.log('running code on the main thread');
+    var filename = '%s';
+    var fileBytes = tryParseAsDataURI(filename);
     var script = document.createElement('script');
-    script.src = "%s";
+    if (fileBytes) {
+      script.innerHTML = intArrayToString(fileBytes);
+    } else {
+      script.src = filename;
+    }
     document.body.appendChild(script);
   }
 ''' % shared.JS.get_subresource_location(proxy_worker_filename + '.js')
@@ -2404,14 +2410,24 @@ def generate_html(target, options, js_target, target_basename,
     # We need to load the emterpreter file before anything else, it has to be synchronously ready
     script.un_src()
     script.inline = '''
-          var emterpretXHR = new XMLHttpRequest();
-          emterpretXHR.open('GET', '%s', true);
-          emterpretXHR.responseType = 'arraybuffer';
-          emterpretXHR.onload = function() {
-            Module.emterpreterFile = emterpretXHR.response;
+          var filename = '%s';
+          var fileBytes = tryParseAsDataURI(filename);
+          function onEmterpretFileLoad() {
 %s
-          };
-          emterpretXHR.send(null);
+          }
+          if (fileBytes) {
+            Module.emterpreterFile = fileBytes.buffer;
+            onEmterpretFileLoad();
+          } else {
+            var emterpretXHR = new XMLHttpRequest();
+            emterpretXHR.open('GET', filename, true);
+            emterpretXHR.responseType = 'arraybuffer';
+            emterpretXHR.onload = function() {
+              Module.emterpreterFile = emterpretXHR.response;
+              onEmterpretFileLoad();
+            };
+            emterpretXHR.send(null);
+          }
 ''' % (shared.JS.get_subresource_location(shared.Settings.EMTERPRETIFY_FILE), script.inline)
 
   if options.memory_init_file:
@@ -2420,6 +2436,10 @@ def generate_html(target, options, js_target, target_basename,
     script.inline = ('''
           (function() {
             var memoryInitializer = '%s';
+            Module['memoryInitializerBytes'] = tryParseAsDataURI(memoryInitializer);
+            if (Module['memoryInitializerBytes']) {
+              return;
+            }
             if (typeof Module['locateFile'] === 'function') {
               memoryInitializer = Module['locateFile'](memoryInitializer);
             } else if (Module['memoryInitializerPrefixURL']) {
@@ -2441,8 +2461,14 @@ def generate_html(target, options, js_target, target_basename,
     if len(asm_mods) == 0:
       # just load the asm, then load the rest
       script.inline = '''
+    var filename = '%s';
+    var fileBytes = tryParseAsDataURI(filename);
     var script = document.createElement('script');
-    script.src = "%s";
+    if (fileBytes) {
+      script.innerHTML = intArrayToString(fileBytes);
+    } else {
+      script.src = filename;
+    }
     script.onload = function() {
       setTimeout(function() {
         %s
@@ -2453,10 +2479,10 @@ def generate_html(target, options, js_target, target_basename,
     else:
       # may need to modify the asm code, load it as text, modify, and load asynchronously
       script.inline = '''
-    var codeXHR = new XMLHttpRequest();
-    codeXHR.open('GET', '%s', true);
-    codeXHR.onload = function() {
-      var code = codeXHR.responseText;
+    var codeXHR;
+    var filename = '%s';
+    var fileBytes = tryParseAsDataURI(filename);
+    function onCodeLoad(code) {
       %s
       var blob = new Blob([code], { type: 'text/javascript' });
       codeXHR = null;
@@ -2470,24 +2496,91 @@ def generate_html(target, options, js_target, target_basename,
         URL.revokeObjectURL(script.src);
       };
       document.body.appendChild(script);
-    };
-    codeXHR.send(null);
+    }
+    if (fileBytes) {
+      onCodeLoad(intArrayToString(fileBytes));
+    } else {
+      codeXHR = new XMLHttpRequest();
+      codeXHR.open('GET', filename, true);
+      codeXHR.onload = function() {
+        onCodeLoad(codeXHR.responseText);
+      };
+      codeXHR.send(null);
+    }
 ''' % (shared.JS.get_subresource_location(asm_target), '\n'.join(asm_mods), script.inline)
 
   if shared.Settings.BINARYEN and not shared.Settings.BINARYEN_ASYNC_COMPILATION:
     # We need to load the wasm file before anything else, it has to be synchronously ready TODO: optimize
     script.un_src()
     script.inline = '''
-          var wasmXHR = new XMLHttpRequest();
-          wasmXHR.open('GET', '%s', true);
-          wasmXHR.responseType = 'arraybuffer';
-          wasmXHR.onload = function() {
-            Module.wasmBinary = wasmXHR.response;
+          var filename = '%s';
+          var fileBytes = tryParseAsDataURI(filename);
+          function onWasmLoad() {
 %s
-          };
-          wasmXHR.send(null);
+          }
+          if (fileBytes) {
+            Module.wasmBinary = fileBytes.buffer;
+            onWasmLoad();
+          } else {
+            var wasmXHR = new XMLHttpRequest();
+            wasmXHR.open('GET', filename, true);
+            wasmXHR.responseType = 'arraybuffer';
+            wasmXHR.onload = function() {
+              Module.wasmBinary = wasmXHR.response;
+              onWasmLoad();
+            };
+            wasmXHR.send(null);
+          }
 ''' % (shared.JS.get_subresource_location(wasm_binary_target), script.inline)
 
+  if script.inline:
+    # add functions copied from preamble.js and shell.js
+    script.inline += '''
+      function intArrayToString(array) {
+        if (typeof TextDecoder !== 'undefined') {
+          return new TextDecoder('utf-8').decode(array);
+        }
+        var ret = [];
+        for (var i = 0; i < array.length; i++) {
+          var chr = array[i];
+          if (chr > 0xFF) {
+            chr &= 0xFF;
+          }
+          ret.push(String.fromCharCode(chr));
+        }
+        return ret.join('');
+      }
+
+      function base64ToBytes(s) {
+        try {
+          var decoded = atob(s);
+          var bytes = new Uint8Array(decoded.length);
+          for (i = 0 ; i < decoded.length ; ++i) {
+            bytes[i] = decoded.charCodeAt(i);
+          }
+          return bytes;
+        } catch (_) {
+          throw new Error('Converting base64 string to bytes failed.');
+        }
+      }
+
+      function tryParseAsDataURI(filename) {
+        var dataURIPrefix = 'data:application/octet-stream;base64,';
+
+        if (!(
+          String.prototype.startsWith ?
+            filename.startsWith(dataURIPrefix) :
+            filename.indexOf(dataURIPrefix) === 0
+        )) {
+          return;
+        }
+
+        var data = filename.slice(dataURIPrefix.length);
+
+        return base64ToBytes(data);
+      }
+'''
+
   html = open(target, 'wb')
   html_contents = shell.replace('{{{ SCRIPT }}}', script.replacement())
   html_contents = tools.line_endings.convert_line_endings(html_contents, '\n', options.output_eol)
diff --git a/src/postamble.js b/src/postamble.js
index 10de96879a5f..4f71743412a5 100644
--- a/src/postamble.js
+++ b/src/postamble.js
@@ -43,8 +43,15 @@ if (memoryInitializer) {
   } else if (Module['memoryInitializerPrefixURL']) {
     memoryInitializer = Module['memoryInitializerPrefixURL'] + memoryInitializer;
   }
-  if (ENVIRONMENT_IS_NODE || ENVIRONMENT_IS_SHELL) {
-    var data = Module['readBinary'](memoryInitializer);
+  var data = Module['memoryInitializerBytes'];
+  if (!data) {
+    if (ENVIRONMENT_IS_NODE || ENVIRONMENT_IS_SHELL) {
+      data = Module['readBinary'](memoryInitializer);
+    } else {
+      data = tryParseAsDataURI(memoryInitializer);
+    }
+  }
+  if (data) {
     HEAPU8.set(data, Runtime.GLOBAL_BASE);
   } else {
     addRunDependency('memory initializer');
diff --git a/src/proxyClient.js b/src/proxyClient.js
index 392843b299a8..ec9241b0ce29 100644
--- a/src/proxyClient.js
+++ b/src/proxyClient.js
@@ -97,7 +97,14 @@ var frameId = 0;
 
 // Worker
 
-var worker = new Worker('{{{ filename }}}.js');
+var filename = '{{{ filename }}}.js';
+var workerURL = filename;
+var fileBytes = tryParseAsDataURI(filename);
+if (fileBytes) {
+  workerURL = URL.createObjectURL(new Blob([fileBytes], {type: 'application/javascript'}));
+}
+
+var worker = new Worker(workerURL);
 
 WebGLClient.prefetch();
 
@@ -108,7 +115,7 @@ setTimeout(function() {
     height: Module.canvas.height,
     boundingClientRect: cloneObject(Module.canvas.getBoundingClientRect()),
     URL: document.URL,
-    currentScriptUrl: '{{{ filename }}}.js',
+    currentScriptUrl: filename,
     preMain: true });
 }, 0); // delay til next frame, to make sure html is ready
 
@@ -119,6 +126,7 @@ worker.onmessage = function worker_onmessage(event) {
   if (!workerResponded) {
     workerResponded = true;
     if (Module.setStatus) Module.setStatus('');
+    if (workerURL !== filename) URL.revokeObjectURL(workerURL);
   }
 
   var data = event.data;
diff --git a/src/settings.js b/src/settings.js
index 31eada49713d..0a52d48657a6 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -47,9 +47,7 @@ var INVOKE_RUN = 1; // Whether we will run the main() function. Disable if you e
 var NO_EXIT_RUNTIME = 0; // If set, the runtime is not quit when main() completes (allowing code to
                          // run afterwards, for example from the browser main event loop).
 var MEM_INIT_METHOD = 0; // How to represent the initial memory content.
-                         // 0: embed a base64 string literal representing the initial memory data;
-                         //    if using this in combination with HTML output, your Content Security
-                         //    Policy may need to be modified (see SINGLE_FILE for more details)
+                         // 0: embed a base64 string literal representing the initial memory data
                          // 1: create a *.mem file containing the binary data of the initial memory;
                          //    use the --memory-init-file command line switch to select this method
                          // 2: embed a string literal representing that initial memory data
@@ -859,25 +857,16 @@ var FETCH = 0; // If nonzero, enables emscripten_fetch API.
 
 var ASMFS = 0; // If set to 1, uses the multithreaded filesystem that is implemented within the asm.js module, using emscripten_fetch. Implies -s FETCH=1.
 
-var SINGLE_FILE = 0; // If set to 1, embeds all subresources in the emitted file
-                     // by converting their file names into base64 data URIs. Embedded
-                     // subresources may include (but aren't limited to) wasm, asm.js,
-                     // and static memory initialization code.
+var SINGLE_FILE = 0; // If set to 1, embeds all subresources in the emitted file as base64 string
+                     // literals. Embedded subresources may include (but aren't limited to)
+                     // wasm, asm.js, and static memory initialization code.
                      //
-                     // MEM_INIT_METHOD 0 uses the same logic as SINGLE_FILE, so the following
-                     // information applies to that as well:
-                     //
-                     // If used when generating JavaScript output, the subresource data URIs
-                     // will be parsed directly in JavaScript for ensured compatibility
-                     // across runtime environments.
-                     //
-                     // If used when generating HTML output, <script> elements will be
-                     // inserted with data URI src attributes and other subresource data URIs
-                     // will be requested via XHR. This means that your Content Security Policy
-                     // may need to be updated to ensure that the script-src and/or connect-src
-                     // directives whitelist data:. If you aren't using Content Security Policy,
-                     // or your CSP header doesn't include either script-src or connect-src,
-                     // then you can safely ignore this warning.
+                     // When using code that depends on this option, your Content Security Policy
+                     // may need to be updated. Specifically, embedding asm.js requires the
+                     // script-src directive to whitelist 'unsafe-inline', and using a Worker
+                     // requires the child-src directive to whitelist blob:. If you aren't using
+                     // Content Security Policy, or your CSP header doesn't include either
+                     // script-src or child-src, then you can safely ignore this warning.
 
 var WASM_TEXT_FILE = ''; // name of the file containing wasm text, if relevant
 var WASM_BINARY_FILE = ''; // name of the file containing wasm binary, if relevant

From a6f46aae11bab68cd8a3d2ec45fdecafab61e6ab Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Mon, 19 Jun 2017 17:17:38 -0400
Subject: [PATCH 23/78] move data URI parsing functions to preamble.js and
 rename for consistency (#5296)

---
 emcc.py         |  6 +++---
 src/preamble.js | 39 +++++++++++++++++++++++++++++++++++++++
 src/shell.js    | 37 -------------------------------------
 3 files changed, 42 insertions(+), 40 deletions(-)

diff --git a/emcc.py b/emcc.py
index 783e882d54ce..7cc0369f6b3d 100755
--- a/emcc.py
+++ b/emcc.py
@@ -2534,7 +2534,7 @@ def generate_html(target, options, js_target, target_basename,
 ''' % (shared.JS.get_subresource_location(wasm_binary_target), script.inline)
 
   if script.inline:
-    # add functions copied from preamble.js and shell.js
+    # add functions copied from preamble.js
     script.inline += '''
       function intArrayToString(array) {
         if (typeof TextDecoder !== 'undefined') {
@@ -2551,7 +2551,7 @@ def generate_html(target, options, js_target, target_basename,
         return ret.join('');
       }
 
-      function base64ToBytes(s) {
+      function intArrayFromBase64(s) {
         try {
           var decoded = atob(s);
           var bytes = new Uint8Array(decoded.length);
@@ -2577,7 +2577,7 @@ def generate_html(target, options, js_target, target_basename,
 
         var data = filename.slice(dataURIPrefix.length);
 
-        return base64ToBytes(data);
+        return intArrayFromBase64(data);
       }
 '''
 
diff --git a/src/preamble.js b/src/preamble.js
index d1a510236fb5..41783cad10c0 100644
--- a/src/preamble.js
+++ b/src/preamble.js
@@ -1735,6 +1735,45 @@ function intArrayToString(array) {
 }
 {{{ maybeExport('intArrayToString') }}}
 
+// Converts a string of base64 into a byte array.
+// Throws error on invalid input.
+function intArrayFromBase64(s) {
+  try {
+    var decoded = atob(s);
+    var bytes = new Uint8Array(decoded.length);
+    for (i = 0 ; i < decoded.length ; ++i) {
+      bytes[i] = decoded.charCodeAt(i);
+    }
+    return bytes;
+  } catch (_) {
+    throw new Error('Converting base64 string to bytes failed.');
+  }
+}
+{{{ maybeExport('intArrayFromBase64') }}}
+
+// If filename is a base64 data URI, parses and returns data (Buffer on node,
+// Uint8Array otherwise). If filename is not a base64 data URI, returns undefined.
+function tryParseAsDataURI(filename) {
+  var dataURIPrefix = 'data:application/octet-stream;base64,';
+
+  if (!(
+    String.prototype.startsWith ?
+      filename.startsWith(dataURIPrefix) :
+      filename.indexOf(dataURIPrefix) === 0
+  )) {
+    return;
+  }
+
+  var data = filename.slice(dataURIPrefix.length);
+
+  if (ENVIRONMENT_IS_NODE) {
+    return Buffer.from(data, 'base64');
+  }
+
+  return intArrayFromBase64(data);
+}
+{{{ maybeExport('tryParseAsDataURI') }}}
+
 // Deprecated: This function should not be called because it is unsafe and does not provide
 // a maximum length limit of how many bytes it is allowed to write. Prefer calling the
 // function stringToUTF8Array() instead, which takes in a maximum length that can be used
diff --git a/src/shell.js b/src/shell.js
index e2f001f9f0dd..c94b30c74634 100644
--- a/src/shell.js
+++ b/src/shell.js
@@ -259,43 +259,6 @@ else {
   throw new Error('Unknown runtime environment. Where are we?');
 }
 
-// Converts a string of base64 into a byte array.
-// Throws error on invalid input.
-function base64ToBytes(s) {
-  try {
-    var decoded = atob(s);
-    var bytes = new Uint8Array(decoded.length);
-    for (i = 0 ; i < decoded.length ; ++i) {
-      bytes[i] = decoded.charCodeAt(i);
-    }
-    return bytes;
-  } catch (_) {
-    throw new Error('Converting base64 string to bytes failed.');
-  }
-}
-
-// If filename is a base64 data URI, parses and returns data (Buffer on node,
-// Uint8Array otherwise). If filename is not a base64 data URI, returns undefined.
-function tryParseAsDataURI(filename) {
-  var dataURIPrefix = 'data:application/octet-stream;base64,';
-
-  if (!(
-    String.prototype.startsWith ?
-      filename.startsWith(dataURIPrefix) :
-      filename.indexOf(dataURIPrefix) === 0
-  )) {
-    return;
-  }
-
-  var data = filename.slice(dataURIPrefix.length);
-
-  if (ENVIRONMENT_IS_NODE) {
-    return Buffer.from(data, 'base64');
-  }
-
-  return base64ToBytes(data);
-}
-
 function globalEval(x) {
   {{{ makeEval('eval.call(null, x);') }}}
 }

From 06ed6dc928bb471b952061ad29b2c4aecdd92f29 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Tue, 20 Jun 2017 23:31:26 -0400
Subject: [PATCH 24/78] factor out duplicated functions to arrayUtils.js
 (#5296)

---
 emcc.py           | 50 +++-----------------------------
 src/arrayUtils.js | 68 +++++++++++++++++++++++++++++++++++++++++++
 src/jsifier.js    |  1 +
 src/preamble.js   | 73 -----------------------------------------------
 4 files changed, 73 insertions(+), 119 deletions(-)
 create mode 100644 src/arrayUtils.js

diff --git a/emcc.py b/emcc.py
index 7cc0369f6b3d..e96b7de093b7 100755
--- a/emcc.py
+++ b/emcc.py
@@ -2534,52 +2534,10 @@ def generate_html(target, options, js_target, target_basename,
 ''' % (shared.JS.get_subresource_location(wasm_binary_target), script.inline)
 
   if script.inline:
-    # add functions copied from preamble.js
-    script.inline += '''
-      function intArrayToString(array) {
-        if (typeof TextDecoder !== 'undefined') {
-          return new TextDecoder('utf-8').decode(array);
-        }
-        var ret = [];
-        for (var i = 0; i < array.length; i++) {
-          var chr = array[i];
-          if (chr > 0xFF) {
-            chr &= 0xFF;
-          }
-          ret.push(String.fromCharCode(chr));
-        }
-        return ret.join('');
-      }
-
-      function intArrayFromBase64(s) {
-        try {
-          var decoded = atob(s);
-          var bytes = new Uint8Array(decoded.length);
-          for (i = 0 ; i < decoded.length ; ++i) {
-            bytes[i] = decoded.charCodeAt(i);
-          }
-          return bytes;
-        } catch (_) {
-          throw new Error('Converting base64 string to bytes failed.');
-        }
-      }
-
-      function tryParseAsDataURI(filename) {
-        var dataURIPrefix = 'data:application/octet-stream;base64,';
-
-        if (!(
-          String.prototype.startsWith ?
-            filename.startsWith(dataURIPrefix) :
-            filename.indexOf(dataURIPrefix) === 0
-        )) {
-          return;
-        }
-
-        var data = filename.slice(dataURIPrefix.length);
-
-        return intArrayFromBase64(data);
-      }
-'''
+    # add functions needed for data URI parsing
+    f = open('src/arrayUtils.js', 'r')
+    script.inline += re.sub('#if .*?#endif', '', f.read(), flags=re.DOTALL)
+    f.close()
 
   html = open(target, 'wb')
   html_contents = shell.replace('{{{ SCRIPT }}}', script.replacement())
diff --git a/src/arrayUtils.js b/src/arrayUtils.js
new file mode 100644
index 000000000000..f7b6c8089c6c
--- /dev/null
+++ b/src/arrayUtils.js
@@ -0,0 +1,68 @@
+if (typeof maybeExport === 'undefined') {
+	function maybeExport () {}
+}
+
+/** @type {function(string, boolean=, number=)} */
+function intArrayFromString(stringy, dontAddNull, length) {
+  var len = length > 0 ? length : lengthBytesUTF8(stringy)+1;
+  var u8array = new Array(len);
+  var numBytesWritten = stringToUTF8Array(stringy, u8array, 0, u8array.length);
+  if (dontAddNull) u8array.length = numBytesWritten;
+  return u8array;
+}
+{{{ maybeExport('intArrayFromString') }}}
+
+function intArrayToString(array) {
+  var ret = [];
+  for (var i = 0; i < array.length; i++) {
+    var chr = array[i];
+    if (chr > 0xFF) {
+#if ASSERTIONS
+      assert(false, 'Character code ' + chr + ' (' + String.fromCharCode(chr) + ')  at offset ' + i + ' not in 0x00-0xFF.');
+#endif
+      chr &= 0xFF;
+    }
+    ret.push(String.fromCharCode(chr));
+  }
+  return ret.join('');
+}
+{{{ maybeExport('intArrayToString') }}}
+
+// Converts a string of base64 into a byte array.
+// Throws error on invalid input.
+function intArrayFromBase64(s) {
+  try {
+    var decoded = atob(s);
+    var bytes = new Uint8Array(decoded.length);
+    for (i = 0 ; i < decoded.length ; ++i) {
+      bytes[i] = decoded.charCodeAt(i);
+    }
+    return bytes;
+  } catch (_) {
+    throw new Error('Converting base64 string to bytes failed.');
+  }
+}
+{{{ maybeExport('intArrayFromBase64') }}}
+
+// If filename is a base64 data URI, parses and returns data (Buffer on node,
+// Uint8Array otherwise). If filename is not a base64 data URI, returns undefined.
+function tryParseAsDataURI(filename) {
+  var dataURIPrefix = 'data:application/octet-stream;base64,';
+
+  if (!(
+    String.prototype.startsWith ?
+      filename.startsWith(dataURIPrefix) :
+      filename.indexOf(dataURIPrefix) === 0
+  )) {
+    return;
+  }
+
+  var data = filename.slice(dataURIPrefix.length);
+
+  if (typeof Buffer !== 'undefined') {
+    return Buffer.from(data, 'base64');
+  }
+
+  return intArrayFromBase64(data);
+}
+{{{ maybeExport('tryParseAsDataURI') }}}
diff --git a/src/jsifier.js b/src/jsifier.js
index a0597907cc34..adf835978765 100644
--- a/src/jsifier.js
+++ b/src/jsifier.js
@@ -422,6 +422,7 @@ function JSify(data, functionsOnly) {
     // "Final shape that will be created").
     print('// EMSCRIPTEN_END_FUNCS\n');
 
+    print(read('arrayUtils.js'));
     if (HEADLESS) {
       print('if (!ENVIRONMENT_IS_WEB) {');
       print(read('headlessCanvas.js'));
diff --git a/src/preamble.js b/src/preamble.js
index 41783cad10c0..1ca1004c1c4b 100644
--- a/src/preamble.js
+++ b/src/preamble.js
@@ -1701,79 +1701,6 @@ function addOnPostRun(cb) {
 }
 {{{ maybeExport('addOnPostRun') }}}
 
-// Tools
-
-/** @type {function(string, boolean=, number=)} */
-function intArrayFromString(stringy, dontAddNull, length) {
-  var len = length > 0 ? length : lengthBytesUTF8(stringy)+1;
-  var u8array = new Array(len);
-  var numBytesWritten = stringToUTF8Array(stringy, u8array, 0, u8array.length);
-  if (dontAddNull) u8array.length = numBytesWritten;
-  return u8array;
-}
-{{{ maybeExport('intArrayFromString') }}}
-
-function intArrayToString(array) {
-  if (typeof TextDecoder !== 'undefined') {
-    return new TextDecoder('utf-8').decode(array);
-  }
-  else if (typeof Buffer !== 'undefined') {
-    return Buffer.from(array.buffer || array).toString();
-  }
-  var ret = [];
-  for (var i = 0; i < array.length; i++) {
-    var chr = array[i];
-    if (chr > 0xFF) {
-#if ASSERTIONS
-      assert(false, 'Character code ' + chr + ' (' + String.fromCharCode(chr) + ')  at offset ' + i + ' not in 0x00-0xFF.');
-#endif
-      chr &= 0xFF;
-    }
-    ret.push(String.fromCharCode(chr));
-  }
-  return ret.join('');
-}
-{{{ maybeExport('intArrayToString') }}}
-
-// Converts a string of base64 into a byte array.
-// Throws error on invalid input.
-function intArrayFromBase64(s) {
-  try {
-    var decoded = atob(s);
-    var bytes = new Uint8Array(decoded.length);
-    for (i = 0 ; i < decoded.length ; ++i) {
-      bytes[i] = decoded.charCodeAt(i);
-    }
-    return bytes;
-  } catch (_) {
-    throw new Error('Converting base64 string to bytes failed.');
-  }
-}
-{{{ maybeExport('intArrayFromBase64') }}}
-
-// If filename is a base64 data URI, parses and returns data (Buffer on node,
-// Uint8Array otherwise). If filename is not a base64 data URI, returns undefined.
-function tryParseAsDataURI(filename) {
-  var dataURIPrefix = 'data:application/octet-stream;base64,';
-
-  if (!(
-    String.prototype.startsWith ?
-      filename.startsWith(dataURIPrefix) :
-      filename.indexOf(dataURIPrefix) === 0
-  )) {
-    return;
-  }
-
-  var data = filename.slice(dataURIPrefix.length);
-
-  if (ENVIRONMENT_IS_NODE) {
-    return Buffer.from(data, 'base64');
-  }
-
-  return intArrayFromBase64(data);
-}
-{{{ maybeExport('tryParseAsDataURI') }}}
-
 // Deprecated: This function should not be called because it is unsafe and does not provide
 // a maximum length limit of how many bytes it is allowed to write. Prefer calling the
 // function stringToUTF8Array() instead, which takes in a maximum length that can be used

From 8c74983ba4feb42749d67a8c4c0843372c0eda16 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Mon, 26 Jun 2017 17:45:37 -0400
Subject: [PATCH 25/78] embed ASMJS_CODE_FILE only when needed (#5296)

---
 emcc.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/emcc.py b/emcc.py
index e96b7de093b7..efc2dbdcb65e 100755
--- a/emcc.py
+++ b/emcc.py
@@ -2329,13 +2329,14 @@ def do_binaryen(final, target, asm_target, options, memfile, wasm_binary_target,
     f.close()
     f = open(final, 'w')
     for tup in [
-      (wasm_text_target, shared.FilenameReplacementStrings.WASM_TEXT_FILE),
-      (wasm_binary_target, shared.FilenameReplacementStrings.WASM_BINARY_FILE),
-      (asm_target, shared.FilenameReplacementStrings.ASMJS_CODE_FILE)
+      (wasm_text_target, shared.FilenameReplacementStrings.WASM_TEXT_FILE, True),
+      (wasm_binary_target, shared.FilenameReplacementStrings.WASM_BINARY_FILE, True),
+      (asm_target, shared.FilenameReplacementStrings.ASMJS_CODE_FILE, not shared.Building.is_wasm_only())
     ]:
-      if not os.path.isfile(tup[0]):
-        continue
-      js = js.replace(tup[1], shared.JS.get_subresource_location(tup[0]))
+      if tup[2] and os.path.isfile(tup[0]):
+        js = js.replace(tup[1], shared.JS.get_subresource_location(tup[0]))
+      else:
+        js = js.replace(tup[1], '')
       shared.try_delete(tup[0])
     f.write(js)
     f.close()

From 0539459aa73798f9f59f41934995dfd8bbb5805f Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Tue, 27 Jun 2017 13:18:54 -0400
Subject: [PATCH 26/78] embed mem init only when needed (#5296)

---
 emcc.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/emcc.py b/emcc.py
index efc2dbdcb65e..76712f5b45b9 100755
--- a/emcc.py
+++ b/emcc.py
@@ -1631,13 +1631,10 @@ def repl(m):
           if DEBUG:
             # Copy into temp dir as well, so can be run there too
             shared.safe_copy(memfile, os.path.join(shared.get_emscripten_temp_dir(), os.path.basename(memfile)))
-          if not shared.Settings.BINARYEN:
+          if not shared.Settings.BINARYEN or 'asmjs' in shared.Settings.BINARYEN_METHOD or 'interpret-asm2wasm' in shared.Settings.BINARYEN_METHOD:
             return 'memoryInitializer = "%s";' % shared.JS.get_subresource_location(memfile, embed_memfile)
           else:
-            # with wasm, we may have the mem init file in the wasm binary already
-            return ('memoryInitializer = Module["wasmJSMethod"].indexOf("asmjs") >= 0 || '
-                    'Module["wasmJSMethod"].indexOf("interpret-asm2wasm") >= 0 ? "%s" : null;'
-                    % shared.JS.get_subresource_location(memfile, embed_memfile))
+            return 'memoryInitializer = null;'
         src = re.sub(shared.JS.memory_initializer_pattern, repl, open(final).read(), count=1)
         open(final + '.mem.js', 'w').write(src)
         final += '.mem.js'

From ec5cc8d5aa910769e636259ab2249caea10d0c36 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Tue, 27 Jun 2017 15:03:45 -0400
Subject: [PATCH 27/78] mem init method 0 fix (#5296)

---
 emcc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emcc.py b/emcc.py
index 76712f5b45b9..19f5528bb086 100755
--- a/emcc.py
+++ b/emcc.py
@@ -1624,7 +1624,7 @@ def repl(m):
           while membytes and membytes[-1] == 0:
             membytes.pop()
           if not membytes: return ''
-          if not options.memory_init_file:
+          if shared.Settings.MEM_INIT_METHOD == 2:
             # memory initializer in a string literal
             return "memoryInitializer = '%s';" % shared.JS.generate_string_initializer(list(membytes))
           open(memfile, 'wb').write(''.join(map(chr, membytes)))

From 962576f08ab5f5d326956aaae1a57f0c0fdb5a1b Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Wed, 28 Jun 2017 03:55:36 -0400
Subject: [PATCH 28/78] handle ASSERTIONS in arrayUtils.js (#5296)

---
 emcc.py           | 2 +-
 src/arrayUtils.js | 6 +++---
 src/jsifier.js    | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/emcc.py b/emcc.py
index 19f5528bb086..4f45f131ed2c 100755
--- a/emcc.py
+++ b/emcc.py
@@ -2534,7 +2534,7 @@ def generate_html(target, options, js_target, target_basename,
   if script.inline:
     # add functions needed for data URI parsing
     f = open('src/arrayUtils.js', 'r')
-    script.inline += re.sub('#if .*?#endif', '', f.read(), flags=re.DOTALL)
+    script.inline += f.read()
     f.close()
 
   html = open(target, 'wb')
diff --git a/src/arrayUtils.js b/src/arrayUtils.js
index f7b6c8089c6c..07992fedf5df 100644
--- a/src/arrayUtils.js
+++ b/src/arrayUtils.js
@@ -17,9 +17,9 @@ function intArrayToString(array) {
   for (var i = 0; i < array.length; i++) {
     var chr = array[i];
     if (chr > 0xFF) {
-#if ASSERTIONS
-      assert(false, 'Character code ' + chr + ' (' + String.fromCharCode(chr) + ')  at offset ' + i + ' not in 0x00-0xFF.');
-#endif
+      if (typeof ASSERTIONS === 'boolean' && ASSERTIONS) {
+        assert(false, 'Character code ' + chr + ' (' + String.fromCharCode(chr) + ')  at offset ' + i + ' not in 0x00-0xFF.');
+      }
       chr &= 0xFF;
     }
     ret.push(String.fromCharCode(chr));
diff --git a/src/jsifier.js b/src/jsifier.js
index adf835978765..a9e4d71d7514 100644
--- a/src/jsifier.js
+++ b/src/jsifier.js
@@ -422,6 +422,7 @@ function JSify(data, functionsOnly) {
     // "Final shape that will be created").
     print('// EMSCRIPTEN_END_FUNCS\n');
 
+    if (ASSERTIONS) print('var ASSERTIONS = true;\n');
     print(read('arrayUtils.js'));
     if (HEADLESS) {
       print('if (!ENVIRONMENT_IS_WEB) {');

From 584b21cecf7297ba52955a566ae6028515ff1a94 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Thu, 29 Jun 2017 13:52:51 -0400
Subject: [PATCH 29/78] html output condition comment (#5296)

---
 emcc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emcc.py b/emcc.py
index 4f45f131ed2c..9c3334a356a0 100755
--- a/emcc.py
+++ b/emcc.py
@@ -2531,8 +2531,8 @@ def generate_html(target, options, js_target, target_basename,
           }
 ''' % (shared.JS.get_subresource_location(wasm_binary_target), script.inline)
 
+  # when script.inline isn't empty, add required helper functions such as tryParseAsDataURI
   if script.inline:
-    # add functions needed for data URI parsing
     f = open('src/arrayUtils.js', 'r')
     script.inline += f.read()
     f.close()

From 362b79e187cf3f667b744299d9a386674ea4327d Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Thu, 29 Jun 2017 13:56:32 -0400
Subject: [PATCH 30/78] html output closure (#5296)

---
 emcc.py | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/emcc.py b/emcc.py
index 9c3334a356a0..680f997e254d 100755
--- a/emcc.py
+++ b/emcc.py
@@ -2432,22 +2432,20 @@ def generate_html(target, options, js_target, target_basename,
     # start to load the memory init file in the HTML, in parallel with the JS
     script.un_src()
     script.inline = ('''
-          (function() {
-            var memoryInitializer = '%s';
-            Module['memoryInitializerBytes'] = tryParseAsDataURI(memoryInitializer);
-            if (Module['memoryInitializerBytes']) {
-              return;
-            }
-            if (typeof Module['locateFile'] === 'function') {
-              memoryInitializer = Module['locateFile'](memoryInitializer);
-            } else if (Module['memoryInitializerPrefixURL']) {
-              memoryInitializer = Module['memoryInitializerPrefixURL'] + memoryInitializer;
-            }
-            var meminitXHR = Module['memoryInitializerRequest'] = new XMLHttpRequest();
-            meminitXHR.open('GET', memoryInitializer, true);
-            meminitXHR.responseType = 'arraybuffer';
-            meminitXHR.send(null);
-          })();
+          var memoryInitializer = '%s';
+          Module['memoryInitializerBytes'] = tryParseAsDataURI(memoryInitializer);
+          if (Module['memoryInitializerBytes']) {
+            return;
+          }
+          if (typeof Module['locateFile'] === 'function') {
+            memoryInitializer = Module['locateFile'](memoryInitializer);
+          } else if (Module['memoryInitializerPrefixURL']) {
+            memoryInitializer = Module['memoryInitializerPrefixURL'] + memoryInitializer;
+          }
+          var meminitXHR = Module['memoryInitializerRequest'] = new XMLHttpRequest();
+          meminitXHR.open('GET', memoryInitializer, true);
+          meminitXHR.responseType = 'arraybuffer';
+          meminitXHR.send(null);
 ''' % shared.JS.get_subresource_location(memfile)) + script.inline
 
   # Download .asm.js if --separate-asm was passed in an asm.js build, or if 'asmjs' is one
@@ -2534,7 +2532,7 @@ def generate_html(target, options, js_target, target_basename,
   # when script.inline isn't empty, add required helper functions such as tryParseAsDataURI
   if script.inline:
     f = open('src/arrayUtils.js', 'r')
-    script.inline += f.read()
+    script.inline = '(function () {' + script.inline + f.read() + '})();'
     f.close()
 
   html = open(target, 'wb')

From f0cb8da008f659d2928e88752b0d25d257b665df Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Thu, 29 Jun 2017 14:00:54 -0400
Subject: [PATCH 31/78] do_binaryen SINGLE_FILE string replacement loop cleanup
 (#5296)

---
 emcc.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/emcc.py b/emcc.py
index 680f997e254d..644ff344af8e 100755
--- a/emcc.py
+++ b/emcc.py
@@ -2325,16 +2325,16 @@ def do_binaryen(final, target, asm_target, options, memfile, wasm_binary_target,
     js = f.read()
     f.close()
     f = open(final, 'w')
-    for tup in [
+    for target, replacement_string, should_embed in [
       (wasm_text_target, shared.FilenameReplacementStrings.WASM_TEXT_FILE, True),
       (wasm_binary_target, shared.FilenameReplacementStrings.WASM_BINARY_FILE, True),
       (asm_target, shared.FilenameReplacementStrings.ASMJS_CODE_FILE, not shared.Building.is_wasm_only())
     ]:
-      if tup[2] and os.path.isfile(tup[0]):
-        js = js.replace(tup[1], shared.JS.get_subresource_location(tup[0]))
+      if should_embed and os.path.isfile(target):
+        js = js.replace(replacement_string, shared.JS.get_subresource_location(target))
       else:
-        js = js.replace(tup[1], '')
-      shared.try_delete(tup[0])
+        js = js.replace(replacement_string, '')
+      shared.try_delete(target)
     f.write(js)
     f.close()
   return final

From 63e225abf2ac608f3219848f835c8385cb536d01 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Thu, 29 Jun 2017 14:16:53 -0400
Subject: [PATCH 32/78] arrayUtils maybeExport fix (#5296)

---
 src/arrayUtils.js | 8 +-------
 src/jsifier.js    | 7 +++++++
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/arrayUtils.js b/src/arrayUtils.js
index 07992fedf5df..d693b73ac12b 100644
--- a/src/arrayUtils.js
+++ b/src/arrayUtils.js
@@ -1,6 +1,4 @@
-if (typeof maybeExport === 'undefined') {
-	function maybeExport () {}
-}
+// All functions here should be maybeExported from jsifier.js
 
 /** @type {function(string, boolean=, number=)} */
 function intArrayFromString(stringy, dontAddNull, length) {
@@ -10,7 +8,6 @@ function intArrayFromString(stringy, dontAddNull, length) {
   if (dontAddNull) u8array.length = numBytesWritten;
   return u8array;
 }
-{{{ maybeExport('intArrayFromString') }}}
 
 function intArrayToString(array) {
   var ret = [];
@@ -26,7 +23,6 @@ function intArrayToString(array) {
   }
   return ret.join('');
 }
-{{{ maybeExport('intArrayToString') }}}
 
 // Converts a string of base64 into a byte array.
 // Throws error on invalid input.
@@ -42,7 +38,6 @@ function intArrayFromBase64(s) {
     throw new Error('Converting base64 string to bytes failed.');
   }
 }
-{{{ maybeExport('intArrayFromBase64') }}}
 
 // If filename is a base64 data URI, parses and returns data (Buffer on node,
 // Uint8Array otherwise). If filename is not a base64 data URI, returns undefined.
@@ -65,4 +60,3 @@ function tryParseAsDataURI(filename) {
 
   return intArrayFromBase64(data);
 }
-{{{ maybeExport('tryParseAsDataURI') }}}
diff --git a/src/jsifier.js b/src/jsifier.js
index a9e4d71d7514..15b3a1e98dd8 100644
--- a/src/jsifier.js
+++ b/src/jsifier.js
@@ -423,7 +423,14 @@ function JSify(data, functionsOnly) {
     print('// EMSCRIPTEN_END_FUNCS\n');
 
     if (ASSERTIONS) print('var ASSERTIONS = true;\n');
+
     print(read('arrayUtils.js'));
+    // Export all arrayUtils.js functions
+    print(processMacros("{{{ maybeExport('intArrayFromString') }}}"))
+    print(processMacros("{{{ maybeExport('intArrayToString') }}}"))
+    print(processMacros("{{{ maybeExport('intArrayFromBase64') }}}"))
+    print(processMacros("{{{ maybeExport('tryParseAsDataURI') }}}"))
+
     if (HEADLESS) {
       print('if (!ENVIRONMENT_IS_WEB) {');
       print(read('headlessCanvas.js'));

From 3711653ea4e9c255a7fa5f0d5c5de7697ff8433f Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Thu, 29 Jun 2017 16:03:50 -0400
Subject: [PATCH 33/78] SINGLE_FILE regression tests (#5296)

---
 tests/test_other.py | 51 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/tests/test_other.py b/tests/test_other.py
index 944be334115e..1562e1740d01 100644
--- a/tests/test_other.py
+++ b/tests/test_other.py
@@ -7664,3 +7664,54 @@ def test_native_link_error_message(self):
     Popen([LLVM_AR, 'r', 'hello_world.a', 'hello_world.o'], env=get_clang_native_env(), stdout=PIPE, stderr=PIPE).communicate()
     out, err = Popen([PYTHON, EMCC, 'hello_world.a', '-o', 'hello_world.js'], stdout=PIPE, stderr=PIPE).communicate()
     assert 'exists but was not an LLVM bitcode file suitable for Emscripten. Perhaps accidentally mixing native built object files with Emscripten?' in err
+
+  def test_single_file(self):
+    for single_file_enabled in [True, False]:
+      for meminit0_enabled in [True, False]:
+        for debug_enabled in [True, False]:
+          for emterpreter_enabled in [True, False]:
+            for wasm_enabled in [True, False]:
+              for asmjs_fallback_enabled in [True, False]:
+                # skip unhelpful option combinations
+                if (
+                  (asmjs_fallback_enabled and not wasm_enabled)
+                ):
+                  continue
+
+                with clean_write_access_to_canonical_temp_dir():
+                  expect_asmjs_code = asmjs_fallback_enabled and wasm_enabled
+                  expect_emterpretify_file = emterpreter_enabled
+                  expect_meminit = not meminit0_enabled
+                  expect_wasm = wasm_enabled
+                  expect_wast = debug_enabled and wasm_enabled
+
+                  cmd = [PYTHON, EMCC, path_from_root('tests', 'core', 'test_i64.c')]
+
+                  if single_file_enabled:
+                    expect_asmjs_code = False
+                    expect_emterpretify_file = False
+                    expect_meminit = False
+                    expect_wasm = False
+                    expect_wast = False
+                    cmd += ['-s', 'SINGLE_FILE=1']
+                  if meminit0_enabled:
+                    cmd += ['--memory-init-file', '0']
+                  if debug_enabled:
+                    cmd += ['-g4']
+                  if emterpreter_enabled:
+                    cmd += ['-s', 'EMTERPRETIFY=1', '-s', "EMTERPRETIFY_FILE='a.out.dat'"]
+                  if wasm_enabled:
+                    cmd += ['-s', 'WASM=1']
+                  if asmjs_fallback_enabled:
+                    cmd += ['-s', "BINARYEN_METHOD='native-wasm,asmjs'"]
+
+                  print ' '.join(cmd)
+                  proc = Popen(cmd, stdout=PIPE, stderr=PIPE)
+                  output, err = proc.communicate()
+                  assert proc.returncode == 0
+                  assert expect_asmjs_code == os.path.exists('a.out.asm.js')
+                  assert expect_emterpretify_file == os.path.exists('a.out.dat')
+                  assert expect_meminit == os.path.exists('a.out.js.mem')
+                  assert expect_wasm == os.path.exists('a.out.wasm')
+                  assert expect_wast == os.path.exists('a.out.wast')
+                  self.assertContained('hello, world!', run_js('a.out.js'))

From dc1b69e9d79eec2ba2b0e42d56f46dbcde36340b Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Thu, 29 Jun 2017 18:50:32 -0400
Subject: [PATCH 34/78] test fixes (#5296)

---
 tests/test_other.py | 41 +++++++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/tests/test_other.py b/tests/test_other.py
index 1562e1740d01..eeb0e774f4e3 100644
--- a/tests/test_other.py
+++ b/tests/test_other.py
@@ -7666,26 +7666,26 @@ def test_native_link_error_message(self):
     assert 'exists but was not an LLVM bitcode file suitable for Emscripten. Perhaps accidentally mixing native built object files with Emscripten?' in err
 
   def test_single_file(self):
-    for single_file_enabled in [True, False]:
-      for meminit0_enabled in [True, False]:
-        for debug_enabled in [True, False]:
-          for emterpreter_enabled in [True, False]:
-            for wasm_enabled in [True, False]:
-              for asmjs_fallback_enabled in [True, False]:
-                # skip unhelpful option combinations
-                if (
-                  (asmjs_fallback_enabled and not wasm_enabled)
-                ):
-                  continue
-
-                with clean_write_access_to_canonical_temp_dir():
+    with clean_write_access_to_canonical_temp_dir():
+      for single_file_enabled in [True, False]:
+        for meminit1_enabled in [True, False]:
+          for debug_enabled in [True, False]:
+            for emterpreter_enabled in [False]:
+              for wasm_enabled in [True, False]:
+                for asmjs_fallback_enabled in [True, False]:
+                  # skip unhelpful option combinations
+                  if (
+                    (asmjs_fallback_enabled and not wasm_enabled)
+                  ):
+                    continue
+
                   expect_asmjs_code = asmjs_fallback_enabled and wasm_enabled
                   expect_emterpretify_file = emterpreter_enabled
-                  expect_meminit = not meminit0_enabled
+                  expect_meminit = (meminit1_enabled and not wasm_enabled) or (wasm_enabled and asmjs_fallback_enabled)
                   expect_wasm = wasm_enabled
                   expect_wast = debug_enabled and wasm_enabled
 
-                  cmd = [PYTHON, EMCC, path_from_root('tests', 'core', 'test_i64.c')]
+                  cmd = [PYTHON, EMCC, path_from_root('tests', 'hello_world.c')]
 
                   if single_file_enabled:
                     expect_asmjs_code = False
@@ -7694,8 +7694,8 @@ def test_single_file(self):
                     expect_wasm = False
                     expect_wast = False
                     cmd += ['-s', 'SINGLE_FILE=1']
-                  if meminit0_enabled:
-                    cmd += ['--memory-init-file', '0']
+                  if meminit1_enabled:
+                    cmd += ['--memory-init-file', '1']
                   if debug_enabled:
                     cmd += ['-g4']
                   if emterpreter_enabled:
@@ -7705,13 +7705,18 @@ def test_single_file(self):
                   if asmjs_fallback_enabled:
                     cmd += ['-s', "BINARYEN_METHOD='native-wasm,asmjs'"]
 
+                  for x in os.listdir('.'):
+                    if x.startswith('emcc-') or x.startswith('a.out'):
+                      os.unlink(x)
+
                   print ' '.join(cmd)
                   proc = Popen(cmd, stdout=PIPE, stderr=PIPE)
                   output, err = proc.communicate()
+                  print(os.listdir('.'))
                   assert proc.returncode == 0
                   assert expect_asmjs_code == os.path.exists('a.out.asm.js')
                   assert expect_emterpretify_file == os.path.exists('a.out.dat')
-                  assert expect_meminit == os.path.exists('a.out.js.mem')
+                  assert expect_meminit == (os.path.exists('a.out.mem') or os.path.exists('a.out.js.mem'))
                   assert expect_wasm == os.path.exists('a.out.wasm')
                   assert expect_wast == os.path.exists('a.out.wast')
                   self.assertContained('hello, world!', run_js('a.out.js'))

From bd11a5e484a24c0c328b109ca4de8662e6d1ebf7 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Thu, 29 Jun 2017 18:51:22 -0400
Subject: [PATCH 35/78] SINGLE_FILE embed_memfile fix (#5296)

---
 emcc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emcc.py b/emcc.py
index 644ff344af8e..cbb225fdaa49 100755
--- a/emcc.py
+++ b/emcc.py
@@ -1611,7 +1611,7 @@ def get_final():
 
     with ToolchainProfiler.profile_block('memory initializer'):
       memfile = None
-      embed_memfile = (shared.Settings.SINGLE_FILE or shared.Settings.MEM_INIT_METHOD == 0) and (not shared.Settings.MAIN_MODULE and not shared.Settings.SIDE_MODULE and options.debug_level < 4)
+      embed_memfile = shared.Settings.SINGLE_FILE or (shared.Settings.MEM_INIT_METHOD == 0 and (not shared.Settings.MAIN_MODULE and not shared.Settings.SIDE_MODULE and options.debug_level < 4))
 
       if shared.Settings.MEM_INIT_METHOD > 0 or embed_memfile:
         memfile = target + '.mem'

From 2e630bdf7239c1d4d7936ce4be18a7feeb351489 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Fri, 30 Jun 2017 13:48:21 -0400
Subject: [PATCH 36/78] test cleanup (#5296)

---
 tests/test_other.py | 104 +++++++++++++++++++++-----------------------
 1 file changed, 50 insertions(+), 54 deletions(-)

diff --git a/tests/test_other.py b/tests/test_other.py
index eeb0e774f4e3..863ebd438fc5 100644
--- a/tests/test_other.py
+++ b/tests/test_other.py
@@ -7666,57 +7666,53 @@ def test_native_link_error_message(self):
     assert 'exists but was not an LLVM bitcode file suitable for Emscripten. Perhaps accidentally mixing native built object files with Emscripten?' in err
 
   def test_single_file(self):
-    with clean_write_access_to_canonical_temp_dir():
-      for single_file_enabled in [True, False]:
-        for meminit1_enabled in [True, False]:
-          for debug_enabled in [True, False]:
-            for emterpreter_enabled in [False]:
-              for wasm_enabled in [True, False]:
-                for asmjs_fallback_enabled in [True, False]:
-                  # skip unhelpful option combinations
-                  if (
-                    (asmjs_fallback_enabled and not wasm_enabled)
-                  ):
-                    continue
-
-                  expect_asmjs_code = asmjs_fallback_enabled and wasm_enabled
-                  expect_emterpretify_file = emterpreter_enabled
-                  expect_meminit = (meminit1_enabled and not wasm_enabled) or (wasm_enabled and asmjs_fallback_enabled)
-                  expect_wasm = wasm_enabled
-                  expect_wast = debug_enabled and wasm_enabled
-
-                  cmd = [PYTHON, EMCC, path_from_root('tests', 'hello_world.c')]
-
-                  if single_file_enabled:
-                    expect_asmjs_code = False
-                    expect_emterpretify_file = False
-                    expect_meminit = False
-                    expect_wasm = False
-                    expect_wast = False
-                    cmd += ['-s', 'SINGLE_FILE=1']
-                  if meminit1_enabled:
-                    cmd += ['--memory-init-file', '1']
-                  if debug_enabled:
-                    cmd += ['-g4']
-                  if emterpreter_enabled:
-                    cmd += ['-s', 'EMTERPRETIFY=1', '-s', "EMTERPRETIFY_FILE='a.out.dat'"]
-                  if wasm_enabled:
-                    cmd += ['-s', 'WASM=1']
-                  if asmjs_fallback_enabled:
-                    cmd += ['-s', "BINARYEN_METHOD='native-wasm,asmjs'"]
-
-                  for x in os.listdir('.'):
-                    if x.startswith('emcc-') or x.startswith('a.out'):
-                      os.unlink(x)
-
-                  print ' '.join(cmd)
-                  proc = Popen(cmd, stdout=PIPE, stderr=PIPE)
-                  output, err = proc.communicate()
-                  print(os.listdir('.'))
-                  assert proc.returncode == 0
-                  assert expect_asmjs_code == os.path.exists('a.out.asm.js')
-                  assert expect_emterpretify_file == os.path.exists('a.out.dat')
-                  assert expect_meminit == (os.path.exists('a.out.mem') or os.path.exists('a.out.js.mem'))
-                  assert expect_wasm == os.path.exists('a.out.wasm')
-                  assert expect_wast == os.path.exists('a.out.wast')
-                  self.assertContained('hello, world!', run_js('a.out.js'))
+    for single_file_enabled in [True, False]:
+      for meminit1_enabled in [True, False]:
+        for debug_enabled in [True, False]:
+          for emterpreter_enabled in [True, False]:
+            for wasm_enabled in [True, False]:
+              for asmjs_fallback_enabled in [True, False]:
+                # skip unhelpful option combinations
+                if (
+                  (asmjs_fallback_enabled and not wasm_enabled)
+                ):
+                  continue
+
+                expect_asmjs_code = asmjs_fallback_enabled and wasm_enabled
+                expect_emterpretify_file = emterpreter_enabled
+                expect_meminit = (meminit1_enabled and not wasm_enabled) or (wasm_enabled and asmjs_fallback_enabled)
+                expect_wasm = wasm_enabled
+                expect_wast = debug_enabled and wasm_enabled
+
+                cmd = [PYTHON, EMCC, path_from_root('tests', 'hello_world.c')]
+
+                if single_file_enabled:
+                  expect_asmjs_code = False
+                  expect_emterpretify_file = False
+                  expect_meminit = False
+                  expect_wasm = False
+                  expect_wast = False
+                  cmd += ['-s', 'SINGLE_FILE=1']
+                if meminit1_enabled:
+                  cmd += ['--memory-init-file', '1']
+                if debug_enabled:
+                  cmd += ['-g4']
+                if emterpreter_enabled:
+                  cmd += ['-s', 'EMTERPRETIFY=1', '-s', "EMTERPRETIFY_FILE='a.out.dat'"]
+                if wasm_enabled:
+                  cmd += ['-s', 'WASM=1']
+                if asmjs_fallback_enabled:
+                  cmd += ['-s', "BINARYEN_METHOD='native-wasm,asmjs'"]
+
+                print ' '.join(cmd)
+                self.clear()
+                proc = Popen(cmd, stdout=PIPE, stderr=PIPE)
+                output, err = proc.communicate()
+                print(os.listdir('.'))
+                assert proc.returncode == 0
+                assert expect_asmjs_code == os.path.exists('a.out.asm.js')
+                assert expect_emterpretify_file == os.path.exists('a.out.dat')
+                assert expect_meminit == (os.path.exists('a.out.mem') or os.path.exists('a.out.js.mem'))
+                assert expect_wasm == os.path.exists('a.out.wasm')
+                assert expect_wast == os.path.exists('a.out.wast')
+                self.assertContained('hello, world!', run_js('a.out.js'))

From 5dece1f2dfb05342822b8ae4bc2283abf405a8bc Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Fri, 30 Jun 2017 13:49:35 -0400
Subject: [PATCH 37/78] arrayUtils.js embedding fix (#5296)

---
 emcc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emcc.py b/emcc.py
index cbb225fdaa49..7823b013a797 100755
--- a/emcc.py
+++ b/emcc.py
@@ -2531,7 +2531,7 @@ def generate_html(target, options, js_target, target_basename,
 
   # when script.inline isn't empty, add required helper functions such as tryParseAsDataURI
   if script.inline:
-    f = open('src/arrayUtils.js', 'r')
+    f = open(shared.path_from_root('src/arrayUtils.js'), 'r')
     script.inline = '(function () {' + script.inline + f.read() + '})();'
     f.close()
 

From ca3af499792ae1ad31b1abd6e89470eac5771905 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Wed, 5 Jul 2017 12:36:58 -0400
Subject: [PATCH 38/78] node tryParseAsDataURI fix/cleanup (#5296)

---
 src/arrayUtils.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/arrayUtils.js b/src/arrayUtils.js
index d693b73ac12b..1b8a507216ff 100644
--- a/src/arrayUtils.js
+++ b/src/arrayUtils.js
@@ -54,8 +54,8 @@ function tryParseAsDataURI(filename) {
 
   var data = filename.slice(dataURIPrefix.length);
 
-  if (typeof Buffer !== 'undefined') {
-    return Buffer.from(data, 'base64');
+  if (typeof ENVIRONMENT_IS_NODE === 'boolean' && ENVIRONMENT_IS_NODE) {
+    return Buffer.from ? Buffer.from(data, 'base64') : new Buffer(data, 'base64');
   }
 
   return intArrayFromBase64(data);

From 638732b99e771c7a6d6681953a89e6acec69f0cc Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Wed, 5 Jul 2017 17:59:05 -0400
Subject: [PATCH 39/78] base64 conversion cleanup (#5296)

---
 src/arrayUtils.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/arrayUtils.js b/src/arrayUtils.js
index 1b8a507216ff..39b6a5b8f0b0 100644
--- a/src/arrayUtils.js
+++ b/src/arrayUtils.js
@@ -27,6 +27,13 @@ function intArrayToString(array) {
 // Converts a string of base64 into a byte array.
 // Throws error on invalid input.
 function intArrayFromBase64(s) {
+  if (typeof ENVIRONMENT_IS_NODE === 'boolean' && ENVIRONMENT_IS_NODE) {
+    try {
+      return new Uint8Array(Buffer.from(s, 'base64').buffer);
+    }
+    catch (_) {}
+  }
+
   try {
     var decoded = atob(s);
     var bytes = new Uint8Array(decoded.length);
@@ -52,11 +59,5 @@ function tryParseAsDataURI(filename) {
     return;
   }
 
-  var data = filename.slice(dataURIPrefix.length);
-
-  if (typeof ENVIRONMENT_IS_NODE === 'boolean' && ENVIRONMENT_IS_NODE) {
-    return Buffer.from ? Buffer.from(data, 'base64') : new Buffer(data, 'base64');
-  }
-
-  return intArrayFromBase64(data);
+  return intArrayFromBase64(filename.slice(dataURIPrefix.length));
 }

From 200fb16de76fb24cd88f1ee629b5e33f480afdad Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Mon, 10 Jul 2017 18:16:39 -0400
Subject: [PATCH 40/78] node intArrayFromBase64 fix (#5296)

---
 src/arrayUtils.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/arrayUtils.js b/src/arrayUtils.js
index 39b6a5b8f0b0..d6fd4ecb9fa1 100644
--- a/src/arrayUtils.js
+++ b/src/arrayUtils.js
@@ -28,10 +28,8 @@ function intArrayToString(array) {
 // Throws error on invalid input.
 function intArrayFromBase64(s) {
   if (typeof ENVIRONMENT_IS_NODE === 'boolean' && ENVIRONMENT_IS_NODE) {
-    try {
-      return new Uint8Array(Buffer.from(s, 'base64').buffer);
-    }
-    catch (_) {}
+    var buf = Buffer.from ? Buffer.from(s, 'base64') : new Buffer(s, 'base64');
+    return new Uint8Array(buf.buffer, buf.byteOffset, buf.byteLength);
   }
 
   try {

From fd28b2f851c22ed22ff4bbf3b8c77991d78d85d0 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Mon, 10 Jul 2017 18:21:40 -0400
Subject: [PATCH 41/78] -g4 -> -g in SINGLE_FILE test to work around
 pre-exising bug (#5296)

---
 tests/test_other.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_other.py b/tests/test_other.py
index 8d64d990b40b..49f4f4930b3b 100644
--- a/tests/test_other.py
+++ b/tests/test_other.py
@@ -7734,7 +7734,7 @@ def test_single_file(self):
                 if meminit1_enabled:
                   cmd += ['--memory-init-file', '1']
                 if debug_enabled:
-                  cmd += ['-g4']
+                  cmd += ['-g']
                 if emterpreter_enabled:
                   cmd += ['-s', 'EMTERPRETIFY=1', '-s', "EMTERPRETIFY_FILE='a.out.dat'"]
                 if wasm_enabled:

From ee6459790b14c27bca22aa926c3a1f490099d224 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Mon, 10 Jul 2017 19:00:40 -0400
Subject: [PATCH 42/78] EMTERPRETIFY_FILE + SINGLE_FILE fixes (#5296)

---
 emcc.py             |  2 +
 tests/test_other.py | 98 ++++++++++++++++++++++++---------------------
 2 files changed, 54 insertions(+), 46 deletions(-)

diff --git a/emcc.py b/emcc.py
index c9b3b74575f4..92fbbc110879 100755
--- a/emcc.py
+++ b/emcc.py
@@ -922,6 +922,8 @@ def check(input_file):
         logging.warning('disabling closure because debug info was requested')
         options.use_closure_compiler = False
 
+      assert not (shared.Settings.EMTERPRETIFY_FILE and shared.Settings.SINGLE_FILE), 'cannot have both EMTERPRETIFY_FILE and SINGLE_FILE enabled at the same time'
+
       assert not (shared.Settings.NO_DYNAMIC_EXECUTION and options.use_closure_compiler), 'cannot have both NO_DYNAMIC_EXECUTION and closure compiler enabled at the same time'
 
       if options.use_closure_compiler:
diff --git a/tests/test_other.py b/tests/test_other.py
index 49f4f4930b3b..b2a300fa7f70 100644
--- a/tests/test_other.py
+++ b/tests/test_other.py
@@ -7708,49 +7708,55 @@ def test_single_file(self):
       for meminit1_enabled in [True, False]:
         for debug_enabled in [True, False]:
           for emterpreter_enabled in [True, False]:
-            for wasm_enabled in [True, False]:
-              for asmjs_fallback_enabled in [True, False]:
-                # skip unhelpful option combinations
-                if (
-                  (asmjs_fallback_enabled and not wasm_enabled)
-                ):
-                  continue
-
-                expect_asmjs_code = asmjs_fallback_enabled and wasm_enabled
-                expect_emterpretify_file = emterpreter_enabled
-                expect_meminit = (meminit1_enabled and not wasm_enabled) or (wasm_enabled and asmjs_fallback_enabled)
-                expect_wasm = wasm_enabled
-                expect_wast = debug_enabled and wasm_enabled
-
-                cmd = [PYTHON, EMCC, path_from_root('tests', 'hello_world.c')]
-
-                if single_file_enabled:
-                  expect_asmjs_code = False
-                  expect_emterpretify_file = False
-                  expect_meminit = False
-                  expect_wasm = False
-                  expect_wast = False
-                  cmd += ['-s', 'SINGLE_FILE=1']
-                if meminit1_enabled:
-                  cmd += ['--memory-init-file', '1']
-                if debug_enabled:
-                  cmd += ['-g']
-                if emterpreter_enabled:
-                  cmd += ['-s', 'EMTERPRETIFY=1', '-s', "EMTERPRETIFY_FILE='a.out.dat'"]
-                if wasm_enabled:
-                  cmd += ['-s', 'WASM=1']
-                if asmjs_fallback_enabled:
-                  cmd += ['-s', "BINARYEN_METHOD='native-wasm,asmjs'"]
-
-                print ' '.join(cmd)
-                self.clear()
-                proc = Popen(cmd, stdout=PIPE, stderr=PIPE)
-                output, err = proc.communicate()
-                print(os.listdir('.'))
-                assert proc.returncode == 0
-                assert expect_asmjs_code == os.path.exists('a.out.asm.js')
-                assert expect_emterpretify_file == os.path.exists('a.out.dat')
-                assert expect_meminit == (os.path.exists('a.out.mem') or os.path.exists('a.out.js.mem'))
-                assert expect_wasm == os.path.exists('a.out.wasm')
-                assert expect_wast == os.path.exists('a.out.wast')
-                self.assertContained('hello, world!', run_js('a.out.js'))
+            for emterpreter_file_enabled in [True, False]:
+              for wasm_enabled in [True, False]:
+                for asmjs_fallback_enabled in [True, False]:
+                  # skip unhelpful option combinations
+                  if (
+                    (asmjs_fallback_enabled and not wasm_enabled) or
+                    (emterpreter_file_enabled and not emterpreter_enabled)
+                  ):
+                    continue
+
+                  expect_asmjs_code = asmjs_fallback_enabled and wasm_enabled
+                  expect_emterpretify_file = emterpreter_enabled
+                  expect_meminit = (meminit1_enabled and not wasm_enabled) or (wasm_enabled and asmjs_fallback_enabled)
+                  expect_success = not (emterpreter_file_enabled and single_file_enabled)
+                  expect_wasm = wasm_enabled
+                  expect_wast = debug_enabled and wasm_enabled
+
+                  cmd = [PYTHON, EMCC, path_from_root('tests', 'hello_world.c')]
+
+                  if single_file_enabled:
+                    expect_asmjs_code = False
+                    expect_emterpretify_file = False
+                    expect_meminit = False
+                    expect_wasm = False
+                    expect_wast = False
+                    cmd += ['-s', 'SINGLE_FILE=1']
+                  if meminit1_enabled:
+                    cmd += ['--memory-init-file', '1']
+                  if debug_enabled:
+                    cmd += ['-g']
+                  if emterpreter_enabled:
+                    cmd += ['-s', 'EMTERPRETIFY=1']
+                  if emterpreter_file_enabled:
+                    cmd += ['-s', "EMTERPRETIFY_FILE='a.out.dat'"]
+                  if wasm_enabled:
+                    cmd += ['-s', 'WASM=1']
+                  if asmjs_fallback_enabled:
+                    cmd += ['-s', "BINARYEN_METHOD='native-wasm,asmjs'"]
+
+                  print ' '.join(cmd)
+                  self.clear()
+                  proc = Popen(cmd, stdout=PIPE, stderr=PIPE)
+                  output, err = proc.communicate()
+                  print(os.listdir('.'))
+                  assert expect_success == (proc.returncode == 0)
+                  assert expect_asmjs_code == os.path.exists('a.out.asm.js')
+                  assert expect_emterpretify_file == os.path.exists('a.out.dat')
+                  assert expect_meminit == (os.path.exists('a.out.mem') or os.path.exists('a.out.js.mem'))
+                  assert expect_wasm == os.path.exists('a.out.wasm')
+                  assert expect_wast == os.path.exists('a.out.wast')
+                  if expect_success:
+                    self.assertContained('hello, world!', run_js('a.out.js'))

From 6fa3a8896e4e6f52238b3dba67c2a5e38923800a Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Tue, 11 Jul 2017 19:24:30 -0400
Subject: [PATCH 43/78] SINGLE_FILE + emterpreter test fix (#5296)

---
 tests/test_other.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/test_other.py b/tests/test_other.py
index b2a300fa7f70..ac300279acda 100644
--- a/tests/test_other.py
+++ b/tests/test_other.py
@@ -7725,6 +7725,9 @@ def test_single_file(self):
                   expect_wasm = wasm_enabled
                   expect_wast = debug_enabled and wasm_enabled
 
+                  # currently, the emterpreter always fails with JS output
+                  should_run_js = expect_success and not emterpreter_enabled
+
                   cmd = [PYTHON, EMCC, path_from_root('tests', 'hello_world.c')]
 
                   if single_file_enabled:
@@ -7758,5 +7761,5 @@ def test_single_file(self):
                   assert expect_meminit == (os.path.exists('a.out.mem') or os.path.exists('a.out.js.mem'))
                   assert expect_wasm == os.path.exists('a.out.wasm')
                   assert expect_wast == os.path.exists('a.out.wast')
-                  if expect_success:
+                  if should_run_js:
                     self.assertContained('hello, world!', run_js('a.out.js'))

From e3f7566a2645cf75dfa0fabdb0324f0b3d81c62c Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Tue, 11 Jul 2017 19:34:40 -0400
Subject: [PATCH 44/78] arrayUtils maybeExport cleanup (#5296)

---
 src/jsifier.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/jsifier.js b/src/jsifier.js
index 15b3a1e98dd8..e549feb7b967 100644
--- a/src/jsifier.js
+++ b/src/jsifier.js
@@ -426,10 +426,10 @@ function JSify(data, functionsOnly) {
 
     print(read('arrayUtils.js'));
     // Export all arrayUtils.js functions
-    print(processMacros("{{{ maybeExport('intArrayFromString') }}}"))
-    print(processMacros("{{{ maybeExport('intArrayToString') }}}"))
-    print(processMacros("{{{ maybeExport('intArrayFromBase64') }}}"))
-    print(processMacros("{{{ maybeExport('tryParseAsDataURI') }}}"))
+    print(maybeExport('intArrayFromString'));
+    print(maybeExport('intArrayToString'));
+    print(maybeExport('intArrayFromBase64'));
+    print(maybeExport('tryParseAsDataURI'));
 
     if (HEADLESS) {
       print('if (!ENVIRONMENT_IS_WEB) {');

From e0f4e6cb658cc934fa5fb1d6120bf4f4f3370bd6 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Tue, 11 Jul 2017 19:38:53 -0400
Subject: [PATCH 45/78] SINGLE_FILE + EMTERPRETIFY_FILE test fix (#5296)

---
 tests/test_other.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_other.py b/tests/test_other.py
index ac300279acda..ef934eb92cc0 100644
--- a/tests/test_other.py
+++ b/tests/test_other.py
@@ -7719,7 +7719,7 @@ def test_single_file(self):
                     continue
 
                   expect_asmjs_code = asmjs_fallback_enabled and wasm_enabled
-                  expect_emterpretify_file = emterpreter_enabled
+                  expect_emterpretify_file = emterpreter_file_enabled
                   expect_meminit = (meminit1_enabled and not wasm_enabled) or (wasm_enabled and asmjs_fallback_enabled)
                   expect_success = not (emterpreter_file_enabled and single_file_enabled)
                   expect_wasm = wasm_enabled

From 6b8a3e63fbec6a5b0494105f6eba6ea157b4afd8 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Wed, 12 Jul 2017 20:03:43 -0400
Subject: [PATCH 46/78] comment clarification (#5296)

---
 tests/test_other.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_other.py b/tests/test_other.py
index ef934eb92cc0..62a4f0615a19 100644
--- a/tests/test_other.py
+++ b/tests/test_other.py
@@ -7725,7 +7725,7 @@ def test_single_file(self):
                   expect_wasm = wasm_enabled
                   expect_wast = debug_enabled and wasm_enabled
 
-                  # currently, the emterpreter always fails with JS output
+                  # currently, the emterpreter always fails with JS output since we do not preload the emterpreter file, which in non-HTML we would need to do manually
                   should_run_js = expect_success and not emterpreter_enabled
 
                   cmd = [PYTHON, EMCC, path_from_root('tests', 'hello_world.c')]

From 67e41dcb72ef8317ea0116a653d18e8ee75f6a9d Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Fri, 14 Jul 2017 15:37:48 -0400
Subject: [PATCH 47/78] SINGLE_FILE write in binary mode (#5296)

---
 emcc.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/emcc.py b/emcc.py
index 92fbbc110879..208049215471 100755
--- a/emcc.py
+++ b/emcc.py
@@ -2325,10 +2325,10 @@ def do_binaryen(final, target, asm_target, options, memfile, wasm_binary_target,
       if DEBUG: save_intermediate('postclean', 'js')
   # replace placeholder strings with correct subresource locations
   if shared.Settings.SINGLE_FILE:
-    f = open(final, 'r')
+    f = open(final, 'rb')
     js = f.read()
     f.close()
-    f = open(final, 'w')
+    f = open(final, 'wb')
     for target, replacement_string, should_embed in [
       (wasm_text_target, shared.FilenameReplacementStrings.WASM_TEXT_FILE, True),
       (wasm_binary_target, shared.FilenameReplacementStrings.WASM_BINARY_FILE, True),

From 0f72d9248f4ee6545cf11e5a20c09e8427d27a03 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Fri, 14 Jul 2017 16:25:47 -0400
Subject: [PATCH 48/78] try XHR before tryParseAsDataURI where applicable
 (#5296)

---
 emcc.py          | 99 ++++++++++++++++++++++--------------------------
 src/postamble.js | 37 ++++++++++--------
 src/shell.js     | 53 ++++++++++++++------------
 3 files changed, 95 insertions(+), 94 deletions(-)

diff --git a/emcc.py b/emcc.py
index 208049215471..fc70e9717e22 100755
--- a/emcc.py
+++ b/emcc.py
@@ -2412,24 +2412,22 @@ def generate_html(target, options, js_target, target_basename,
     # We need to load the emterpreter file before anything else, it has to be synchronously ready
     script.un_src()
     script.inline = '''
-          var filename = '%s';
-          var fileBytes = tryParseAsDataURI(filename);
-          function onEmterpretFileLoad() {
-%s
-          }
-          if (fileBytes) {
-            Module.emterpreterFile = fileBytes.buffer;
-            onEmterpretFileLoad();
-          } else {
-            var emterpretXHR = new XMLHttpRequest();
-            emterpretXHR.open('GET', filename, true);
-            emterpretXHR.responseType = 'arraybuffer';
-            emterpretXHR.onload = function() {
+          var emterpretURL = '%s';
+          var emterpretXHR = new XMLHttpRequest();
+          emterpretXHR.open('GET', emterpretURL, true);
+          emterpretXHR.responseType = 'arraybuffer';
+          emterpretXHR.onload = function() {
+            if (emterpretXHR.status === 200 || emterpretXHR.status === 0) {
               Module.emterpreterFile = emterpretXHR.response;
-              onEmterpretFileLoad();
-            };
-            emterpretXHR.send(null);
-          }
+            } else {
+              var emterpretURLBytes = tryParseAsDataURI(emterpretURL);
+              if (emterpretURLBytes) {
+                Module.emterpreterFile = emterpretURLBytes.buffer;
+              }
+            }
+%s
+          };
+          emterpretXHR.send(null);
 ''' % (shared.JS.get_subresource_location(shared.Settings.EMTERPRETIFY_FILE), script.inline)
 
   if options.memory_init_file:
@@ -2437,15 +2435,12 @@ def generate_html(target, options, js_target, target_basename,
     script.un_src()
     script.inline = ('''
           var memoryInitializer = '%s';
-          Module['memoryInitializerBytes'] = tryParseAsDataURI(memoryInitializer);
-          if (Module['memoryInitializerBytes']) {
-            return;
-          }
           if (typeof Module['locateFile'] === 'function') {
             memoryInitializer = Module['locateFile'](memoryInitializer);
           } else if (Module['memoryInitializerPrefixURL']) {
             memoryInitializer = Module['memoryInitializerPrefixURL'] + memoryInitializer;
           }
+          Module['memoryInitializerRequestURL'] = memoryInitializer;
           var meminitXHR = Module['memoryInitializerRequest'] = new XMLHttpRequest();
           meminitXHR.open('GET', memoryInitializer, true);
           meminitXHR.responseType = 'arraybuffer';
@@ -2479,10 +2474,19 @@ def generate_html(target, options, js_target, target_basename,
     else:
       # may need to modify the asm code, load it as text, modify, and load asynchronously
       script.inline = '''
-    var codeXHR;
-    var filename = '%s';
-    var fileBytes = tryParseAsDataURI(filename);
-    function onCodeLoad(code) {
+    var codeURL = '%s';
+    var codeXHR = new XMLHttpRequest();
+    codeXHR.open('GET', codeURL, true);
+    codeXHR.onload = function() {
+      var code;
+      if (codeXHR.status === 200 || codeXHR.status === 0) {
+        code = codeXHR.responseText;
+      } else {
+        var codeURLBytes = tryParseAsDataURI(codeURL);
+        if (codeURLBytes) {
+          code = intArrayToString(codeURLBytes);
+        }
+      }
       %s
       var blob = new Blob([code], { type: 'text/javascript' });
       codeXHR = null;
@@ -2496,41 +2500,30 @@ def generate_html(target, options, js_target, target_basename,
         URL.revokeObjectURL(script.src);
       };
       document.body.appendChild(script);
-    }
-    if (fileBytes) {
-      onCodeLoad(intArrayToString(fileBytes));
-    } else {
-      codeXHR = new XMLHttpRequest();
-      codeXHR.open('GET', filename, true);
-      codeXHR.onload = function() {
-        onCodeLoad(codeXHR.responseText);
-      };
-      codeXHR.send(null);
-    }
+    };
+    codeXHR.send(null);
 ''' % (shared.JS.get_subresource_location(asm_target), '\n'.join(asm_mods), script.inline)
 
   if shared.Settings.BINARYEN and not shared.Settings.BINARYEN_ASYNC_COMPILATION:
     # We need to load the wasm file before anything else, it has to be synchronously ready TODO: optimize
     script.un_src()
     script.inline = '''
-          var filename = '%s';
-          var fileBytes = tryParseAsDataURI(filename);
-          function onWasmLoad() {
-%s
-          }
-          if (fileBytes) {
-            Module.wasmBinary = fileBytes.buffer;
-            onWasmLoad();
-          } else {
-            var wasmXHR = new XMLHttpRequest();
-            wasmXHR.open('GET', filename, true);
-            wasmXHR.responseType = 'arraybuffer';
-            wasmXHR.onload = function() {
+          var wasmURL = '%s';
+          var wasmXHR = new XMLHttpRequest();
+          wasmXHR.open('GET', '%s', true);
+          wasmXHR.responseType = 'arraybuffer';
+          wasmXHR.onload = function() {
+            if (wasmXHR.status === 200 || wasmXHR.status === 0) {
               Module.wasmBinary = wasmXHR.response;
-              onWasmLoad();
-            };
-            wasmXHR.send(null);
-          }
+            } else {
+              var wasmURLBytes = tryParseAsDataURI(wasmURL);
+              if (wasmURLBytes) {
+                Module.wasmBinary = wasmURLBytes.buffer;
+              }
+            }
+%s
+          };
+          wasmXHR.send(null);
 ''' % (shared.JS.get_subresource_location(wasm_binary_target), script.inline)
 
   # when script.inline isn't empty, add required helper functions such as tryParseAsDataURI
diff --git a/src/postamble.js b/src/postamble.js
index 88525b26ae7c..2c6a5488ba7e 100644
--- a/src/postamble.js
+++ b/src/postamble.js
@@ -43,15 +43,8 @@ if (memoryInitializer) {
   } else if (Module['memoryInitializerPrefixURL']) {
     memoryInitializer = Module['memoryInitializerPrefixURL'] + memoryInitializer;
   }
-  var data = Module['memoryInitializerBytes'];
-  if (!data) {
-    if (ENVIRONMENT_IS_NODE || ENVIRONMENT_IS_SHELL) {
-      data = Module['readBinary'](memoryInitializer);
-    } else {
-      data = tryParseAsDataURI(memoryInitializer);
-    }
-  }
-  if (data) {
+  if (ENVIRONMENT_IS_NODE || ENVIRONMENT_IS_SHELL) {
+    var data = Module['readBinary'](memoryInitializer);
     HEAPU8.set(data, Runtime.GLOBAL_BASE);
   } else {
     addRunDependency('memory initializer');
@@ -71,20 +64,32 @@ if (memoryInitializer) {
     }
     function doBrowserLoad() {
       Module['readAsync'](memoryInitializer, applyMemoryInitializer, function() {
-        throw 'could not load memory initializer ' + memoryInitializer;
+        var memoryInitializerBytes  = tryParseAsDataURI(memoryInitializer);
+        if (memoryInitializerBytes) {
+          applyMemoryInitializer(memoryInitializerBytes.buffer);
+        }
+        else {
+          throw 'could not load memory initializer ' + memoryInitializer;
+        }
       });
     }
     if (Module['memoryInitializerRequest']) {
       // a network request has already been created, just use that
       function useRequest() {
         var request = Module['memoryInitializerRequest'];
+        var response = request.response;
         if (request.status !== 200 && request.status !== 0) {
-          // If you see this warning, the issue may be that you are using locateFile or memoryInitializerPrefixURL, and defining them in JS. That
-          // means that the HTML file doesn't know about them, and when it tries to create the mem init request early, does it to the wrong place.
-          // Look in your browser's devtools network console to see what's going on.
-          console.warn('a problem seems to have happened with Module.memoryInitializerRequest, status: ' + request.status + ', retrying ' + memoryInitializer);
-          doBrowserLoad();
-          return;
+          var data = tryParseAsDataURI(Module['memoryInitializerRequestURL']);
+          if (data) {
+            response = data.buffer;
+          } else {
+            // If you see this warning, the issue may be that you are using locateFile or memoryInitializerPrefixURL, and defining them in JS. That
+            // means that the HTML file doesn't know about them, and when it tries to create the mem init request early, does it to the wrong place.
+            // Look in your browser's devtools network console to see what's going on.
+            console.warn('a problem seems to have happened with Module.memoryInitializerRequest, status: ' + request.status + ', retrying ' + memoryInitializer);
+            doBrowserLoad();
+            return;
+          }
         }
         applyMemoryInitializer(request.response);
       }
diff --git a/src/shell.js b/src/shell.js
index c94b30c74634..922a5bb0bdfd 100644
--- a/src/shell.js
+++ b/src/shell.js
@@ -176,47 +176,50 @@ else if (ENVIRONMENT_IS_SHELL) {
 }
 else if (ENVIRONMENT_IS_WEB || ENVIRONMENT_IS_WORKER) {
   Module['read'] = function shell_read(url) {
-    var data = tryParseAsDataURI(url);
-    if (data) {
-      return intArrayToString(data);
+    try {
+      var xhr = new XMLHttpRequest();
+      xhr.open('GET', url, false);
+      xhr.send(null);
+      return xhr.responseText;
+    } catch (err) {
+      var data = tryParseAsDataURI(url);
+      if (data) {
+        return intArrayToString(data);
+      }
+      throw err;
     }
-    var xhr = new XMLHttpRequest();
-    xhr.open('GET', url, false);
-    xhr.send(null);
-    return xhr.responseText;
   };
 
   if (ENVIRONMENT_IS_WORKER) {
     Module['readBinary'] = function readBinary(url) {
-      var data = tryParseAsDataURI(f);
-      if (data) {
-        return data;
+      try {
+        var xhr = new XMLHttpRequest();
+        xhr.open('GET', url, false);
+        xhr.responseType = 'arraybuffer';
+        xhr.send(null);
+        return new Uint8Array(xhr.response);
+      } catch (err) {
+        var data = tryParseAsDataURI(f);
+        if (data) {
+          return data;
+        }
+        throw err;
       }
-      var xhr = new XMLHttpRequest();
-      xhr.open('GET', url, false);
-      xhr.responseType = 'arraybuffer';
-      xhr.send(null);
-      return new Uint8Array(xhr.response);
     };
   }
 
   Module['readAsync'] = function readAsync(url, onload, onerror) {
-    try {
-      var data = tryParseAsDataURI(url);
-      if (data) {
-        setTimeout(function () { onload(data.buffer); }, 0);
-        return;
-      }
-    } catch (err) {
-      setTimeout(function () { onerror(err); }, 0);
-      return;
-    }
     var xhr = new XMLHttpRequest();
     xhr.open('GET', url, true);
     xhr.responseType = 'arraybuffer';
     xhr.onload = function xhr_onload() {
       if (xhr.status == 200 || (xhr.status == 0 && xhr.response)) { // file URLs can return 0
         onload(xhr.response);
+        return;
+      }
+      var data = tryParseAsDataURI(url);
+      if (data) {
+        onload(data.buffer);
       } else {
         onerror();
       }

From 97ae2ed347f42076a65cc8841ddb6bc7f1a569dc Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Thu, 20 Jul 2017 01:02:17 -0400
Subject: [PATCH 49/78] misc cleanup (#5296)

---
 src/postamble.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/postamble.js b/src/postamble.js
index 2c6a5488ba7e..51a45ab7cc72 100644
--- a/src/postamble.js
+++ b/src/postamble.js
@@ -64,11 +64,10 @@ if (memoryInitializer) {
     }
     function doBrowserLoad() {
       Module['readAsync'](memoryInitializer, applyMemoryInitializer, function() {
-        var memoryInitializerBytes  = tryParseAsDataURI(memoryInitializer);
+        var memoryInitializerBytes = tryParseAsDataURI(memoryInitializer);
         if (memoryInitializerBytes) {
           applyMemoryInitializer(memoryInitializerBytes.buffer);
-        }
-        else {
+        } else {
           throw 'could not load memory initializer ' + memoryInitializer;
         }
       });

From 4452cb11e91128bdf6e3bb6007a5f2eb6f1c5568 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Thu, 20 Jul 2017 13:46:52 -0400
Subject: [PATCH 50/78] runtime size optimization (#5296)

---
 emcc.py            | 14 ++++++++++----
 src/arrayUtils.js  | 36 ------------------------------------
 src/base64Utils.js | 37 +++++++++++++++++++++++++++++++++++++
 src/jsifier.js     |  8 ++++++--
 src/postamble.js   | 10 ++++++++--
 src/preamble.js    |  5 ++++-
 src/proxyClient.js |  6 +++++-
 src/settings.js    |  2 ++
 src/shell.js       | 22 ++++++++++++++++++++--
 9 files changed, 92 insertions(+), 48 deletions(-)
 create mode 100644 src/base64Utils.js

diff --git a/emcc.py b/emcc.py
index fc70e9717e22..fc2f3232d09e 100755
--- a/emcc.py
+++ b/emcc.py
@@ -1522,6 +1522,12 @@ def get_final():
         shared.Settings.MEM_INIT_METHOD = 1
       else:
         assert shared.Settings.MEM_INIT_METHOD != 1
+
+      global embed_memfile
+      embed_memfile = shared.Settings.SINGLE_FILE or (shared.Settings.MEM_INIT_METHOD == 0 and (not shared.Settings.MAIN_MODULE and not shared.Settings.SIDE_MODULE and options.debug_level < 4))
+      if embed_memfile:
+        shared.Settings.INCLUDE_BASE64_UTILS = 1
+
       final = shared.Building.emscripten(final, append_ext=False, extra_args=extra_args)
       if DEBUG: save_intermediate('original')
 
@@ -1606,7 +1612,6 @@ def get_final():
 
     with ToolchainProfiler.profile_block('memory initializer'):
       memfile = None
-      embed_memfile = shared.Settings.SINGLE_FILE or (shared.Settings.MEM_INIT_METHOD == 0 and (not shared.Settings.MAIN_MODULE and not shared.Settings.SIDE_MODULE and options.debug_level < 4))
 
       if shared.Settings.MEM_INIT_METHOD > 0 or embed_memfile:
         memfile = target + '.mem'
@@ -2528,9 +2533,10 @@ def generate_html(target, options, js_target, target_basename,
 
   # when script.inline isn't empty, add required helper functions such as tryParseAsDataURI
   if script.inline:
-    f = open(shared.path_from_root('src/arrayUtils.js'), 'r')
-    script.inline = '(function () {' + script.inline + f.read() + '})();'
-    f.close()
+    for file in ['src/arrayUtils.js', 'src/base64Utils.js']:
+      f = open(shared.path_from_root(file), 'r')
+      script.inline = '(function () {' + script.inline + f.read() + '})();'
+      f.close()
 
   html = open(target, 'wb')
   html_contents = shell.replace('{{{ SCRIPT }}}', script.replacement())
diff --git a/src/arrayUtils.js b/src/arrayUtils.js
index d6fd4ecb9fa1..48b42c5e2835 100644
--- a/src/arrayUtils.js
+++ b/src/arrayUtils.js
@@ -23,39 +23,3 @@ function intArrayToString(array) {
   }
   return ret.join('');
 }
-
-// Converts a string of base64 into a byte array.
-// Throws error on invalid input.
-function intArrayFromBase64(s) {
-  if (typeof ENVIRONMENT_IS_NODE === 'boolean' && ENVIRONMENT_IS_NODE) {
-    var buf = Buffer.from ? Buffer.from(s, 'base64') : new Buffer(s, 'base64');
-    return new Uint8Array(buf.buffer, buf.byteOffset, buf.byteLength);
-  }
-
-  try {
-    var decoded = atob(s);
-    var bytes = new Uint8Array(decoded.length);
-    for (i = 0 ; i < decoded.length ; ++i) {
-      bytes[i] = decoded.charCodeAt(i);
-    }
-    return bytes;
-  } catch (_) {
-    throw new Error('Converting base64 string to bytes failed.');
-  }
-}
-
-// If filename is a base64 data URI, parses and returns data (Buffer on node,
-// Uint8Array otherwise). If filename is not a base64 data URI, returns undefined.
-function tryParseAsDataURI(filename) {
-  var dataURIPrefix = 'data:application/octet-stream;base64,';
-
-  if (!(
-    String.prototype.startsWith ?
-      filename.startsWith(dataURIPrefix) :
-      filename.indexOf(dataURIPrefix) === 0
-  )) {
-    return;
-  }
-
-  return intArrayFromBase64(filename.slice(dataURIPrefix.length));
-}
diff --git a/src/base64Utils.js b/src/base64Utils.js
new file mode 100644
index 000000000000..de9a405c0d4a
--- /dev/null
+++ b/src/base64Utils.js
@@ -0,0 +1,37 @@
+// All functions here should be maybeExported from jsifier.js
+
+// Converts a string of base64 into a byte array.
+// Throws error on invalid input.
+function intArrayFromBase64(s) {
+  if (typeof ENVIRONMENT_IS_NODE === 'boolean' && ENVIRONMENT_IS_NODE) {
+    var buf = Buffer.from ? Buffer.from(s, 'base64') : new Buffer(s, 'base64');
+    return new Uint8Array(buf.buffer, buf.byteOffset, buf.byteLength);
+  }
+
+  try {
+    var decoded = atob(s);
+    var bytes = new Uint8Array(decoded.length);
+    for (i = 0 ; i < decoded.length ; ++i) {
+      bytes[i] = decoded.charCodeAt(i);
+    }
+    return bytes;
+  } catch (_) {
+    throw new Error('Converting base64 string to bytes failed.');
+  }
+}
+
+// If filename is a base64 data URI, parses and returns data (Buffer on node,
+// Uint8Array otherwise). If filename is not a base64 data URI, returns undefined.
+function tryParseAsDataURI(filename) {
+  var dataURIPrefix = 'data:application/octet-stream;base64,';
+
+  if (!(
+    String.prototype.startsWith ?
+      filename.startsWith(dataURIPrefix) :
+      filename.indexOf(dataURIPrefix) === 0
+  )) {
+    return;
+  }
+
+  return intArrayFromBase64(filename.slice(dataURIPrefix.length));
+}
diff --git a/src/jsifier.js b/src/jsifier.js
index e549feb7b967..d971cfa2b971 100644
--- a/src/jsifier.js
+++ b/src/jsifier.js
@@ -428,9 +428,13 @@ function JSify(data, functionsOnly) {
     // Export all arrayUtils.js functions
     print(maybeExport('intArrayFromString'));
     print(maybeExport('intArrayToString'));
-    print(maybeExport('intArrayFromBase64'));
-    print(maybeExport('tryParseAsDataURI'));
 
+    if (INCLUDE_BASE64_UTILS) {
+      print(read('base64Utils.js'));
+      // Export all base64Utils.js functions
+      print(maybeExport('intArrayFromBase64'));
+      print(maybeExport('tryParseAsDataURI'));
+    }
     if (HEADLESS) {
       print('if (!ENVIRONMENT_IS_WEB) {');
       print(read('headlessCanvas.js'));
diff --git a/src/postamble.js b/src/postamble.js
index 51a45ab7cc72..8cef1081cafa 100644
--- a/src/postamble.js
+++ b/src/postamble.js
@@ -64,10 +64,13 @@ if (memoryInitializer) {
     }
     function doBrowserLoad() {
       Module['readAsync'](memoryInitializer, applyMemoryInitializer, function() {
+#if INCLUDE_BASE64_UTILS
         var memoryInitializerBytes = tryParseAsDataURI(memoryInitializer);
         if (memoryInitializerBytes) {
           applyMemoryInitializer(memoryInitializerBytes.buffer);
-        } else {
+        } else
+#endif
+        {
           throw 'could not load memory initializer ' + memoryInitializer;
         }
       });
@@ -78,10 +81,13 @@ if (memoryInitializer) {
         var request = Module['memoryInitializerRequest'];
         var response = request.response;
         if (request.status !== 200 && request.status !== 0) {
+#if INCLUDE_BASE64_UTILS
           var data = tryParseAsDataURI(Module['memoryInitializerRequestURL']);
           if (data) {
             response = data.buffer;
-          } else {
+          } else
+#endif
+          {
             // If you see this warning, the issue may be that you are using locateFile or memoryInitializerPrefixURL, and defining them in JS. That
             // means that the HTML file doesn't know about them, and when it tries to create the mem init request early, does it to the wrong place.
             // Look in your browser's devtools network console to see what's going on.
diff --git a/src/preamble.js b/src/preamble.js
index 1c37e12e201c..04a2eda38d46 100644
--- a/src/preamble.js
+++ b/src/preamble.js
@@ -2199,10 +2199,13 @@ function integrateWasmJS(Module) {
       if (Module['wasmBinary']) {
         return new Uint8Array(Module['wasmBinary']);
       }
+#if INCLUDE_BASE64_UTILS
       var binary = tryParseAsDataURI(wasmBinaryFile);
       if (binary) {
         return binary;
-      } else if (Module['readBinary']) {
+      } else
+#endif
+      if (Module['readBinary']) {
         return Module['readBinary'](wasmBinaryFile);
       } else {
         throw "on the web, we need the wasm binary to be preloaded and set on Module['wasmBinary']. emcc.py will do that for you when generating HTML (but not JS)";
diff --git a/src/proxyClient.js b/src/proxyClient.js
index ec9241b0ce29..9bbbcbbf19ce 100644
--- a/src/proxyClient.js
+++ b/src/proxyClient.js
@@ -98,13 +98,17 @@ var frameId = 0;
 // Worker
 
 var filename = '{{{ filename }}}.js';
+
+#if INCLUDE_BASE64_UTILS
 var workerURL = filename;
 var fileBytes = tryParseAsDataURI(filename);
 if (fileBytes) {
   workerURL = URL.createObjectURL(new Blob([fileBytes], {type: 'application/javascript'}));
 }
-
 var worker = new Worker(workerURL);
+#else
+var worker = new Worker(filename);
+#endif
 
 WebGLClient.prefetch();
 
diff --git a/src/settings.js b/src/settings.js
index 0a52d48657a6..871e30e6ddaa 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -871,3 +871,5 @@ var SINGLE_FILE = 0; // If set to 1, embeds all subresources in the emitted file
 var WASM_TEXT_FILE = ''; // name of the file containing wasm text, if relevant
 var WASM_BINARY_FILE = ''; // name of the file containing wasm binary, if relevant
 var ASMJS_CODE_FILE = ''; // name of the file containing asm.js, if relevant
+
+var INCLUDE_BASE64_UTILS = 0; // If set to 1, src/base64Utils.js will be included in the bundle.
diff --git a/src/shell.js b/src/shell.js
index 922a5bb0bdfd..ea195b0e1f63 100644
--- a/src/shell.js
+++ b/src/shell.js
@@ -81,8 +81,13 @@ if (ENVIRONMENT_IS_NODE) {
   var nodePath;
 
   Module['read'] = function shell_read(filename, binary) {
+#if !INCLUDE_BASE64_UTILS
+    var ret;
+#else
     var ret = tryParseAsDataURI(filename);
-    if (!ret) {
+    if (!ret)
+#endif
+    {
       if (!nodeFS) nodeFS = require('fs');
       if (!nodePath) nodePath = require('path');
       filename = nodePath['normalize'](filename);
@@ -135,10 +140,12 @@ else if (ENVIRONMENT_IS_SHELL) {
 
   if (typeof read != 'undefined') {
     Module['read'] = function shell_read(f) {
+#if INCLUDE_BASE64_UTILS
       var data = tryParseAsDataURI(f);
       if (data) {
         return intArrayToString(data);
       }
+#endif
       return read(f);
     };
   } else {
@@ -146,10 +153,14 @@ else if (ENVIRONMENT_IS_SHELL) {
   }
 
   Module['readBinary'] = function readBinary(f) {
+#if INCLUDE_BASE64_UTILS
     var data = tryParseAsDataURI(f);
     if (data) {
       return data;
     }
+#else
+    var data;
+#endif
     if (typeof readbuffer === 'function') {
       return new Uint8Array(readbuffer(f));
     }
@@ -182,10 +193,12 @@ else if (ENVIRONMENT_IS_WEB || ENVIRONMENT_IS_WORKER) {
       xhr.send(null);
       return xhr.responseText;
     } catch (err) {
+#if INCLUDE_BASE64_UTILS
       var data = tryParseAsDataURI(url);
       if (data) {
         return intArrayToString(data);
       }
+#endif
       throw err;
     }
   };
@@ -199,10 +212,12 @@ else if (ENVIRONMENT_IS_WEB || ENVIRONMENT_IS_WORKER) {
         xhr.send(null);
         return new Uint8Array(xhr.response);
       } catch (err) {
+#if INCLUDE_BASE64_UTILS
         var data = tryParseAsDataURI(f);
         if (data) {
           return data;
         }
+#endif
         throw err;
       }
     };
@@ -217,10 +232,13 @@ else if (ENVIRONMENT_IS_WEB || ENVIRONMENT_IS_WORKER) {
         onload(xhr.response);
         return;
       }
+#if INCLUDE_BASE64_UTILS
       var data = tryParseAsDataURI(url);
       if (data) {
         onload(data.buffer);
-      } else {
+      } else
+#endif
+      {
         onerror();
       }
     };

From 3a2ccc4affbc9fd20075b167332bab947d027a02 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Fri, 21 Jul 2017 11:03:24 -0400
Subject: [PATCH 51/78] INCLUDE_BASE64_UTILS -> SUPPORT_BASE64_EMBEDDING
 (#5296)

---
 emcc.py            |  2 +-
 src/jsifier.js     |  2 +-
 src/postamble.js   |  4 ++--
 src/preamble.js    |  2 +-
 src/proxyClient.js |  2 +-
 src/settings.js    |  2 +-
 src/shell.js       | 12 ++++++------
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/emcc.py b/emcc.py
index fc2f3232d09e..0f7f78382a6f 100755
--- a/emcc.py
+++ b/emcc.py
@@ -1526,7 +1526,7 @@ def get_final():
       global embed_memfile
       embed_memfile = shared.Settings.SINGLE_FILE or (shared.Settings.MEM_INIT_METHOD == 0 and (not shared.Settings.MAIN_MODULE and not shared.Settings.SIDE_MODULE and options.debug_level < 4))
       if embed_memfile:
-        shared.Settings.INCLUDE_BASE64_UTILS = 1
+        shared.Settings.SUPPORT_BASE64_EMBEDDING = 1
 
       final = shared.Building.emscripten(final, append_ext=False, extra_args=extra_args)
       if DEBUG: save_intermediate('original')
diff --git a/src/jsifier.js b/src/jsifier.js
index d971cfa2b971..0358c2fd4d18 100644
--- a/src/jsifier.js
+++ b/src/jsifier.js
@@ -429,7 +429,7 @@ function JSify(data, functionsOnly) {
     print(maybeExport('intArrayFromString'));
     print(maybeExport('intArrayToString'));
 
-    if (INCLUDE_BASE64_UTILS) {
+    if (SUPPORT_BASE64_EMBEDDING) {
       print(read('base64Utils.js'));
       // Export all base64Utils.js functions
       print(maybeExport('intArrayFromBase64'));
diff --git a/src/postamble.js b/src/postamble.js
index 8cef1081cafa..c8747011b9fc 100644
--- a/src/postamble.js
+++ b/src/postamble.js
@@ -64,7 +64,7 @@ if (memoryInitializer) {
     }
     function doBrowserLoad() {
       Module['readAsync'](memoryInitializer, applyMemoryInitializer, function() {
-#if INCLUDE_BASE64_UTILS
+#if SUPPORT_BASE64_EMBEDDING
         var memoryInitializerBytes = tryParseAsDataURI(memoryInitializer);
         if (memoryInitializerBytes) {
           applyMemoryInitializer(memoryInitializerBytes.buffer);
@@ -81,7 +81,7 @@ if (memoryInitializer) {
         var request = Module['memoryInitializerRequest'];
         var response = request.response;
         if (request.status !== 200 && request.status !== 0) {
-#if INCLUDE_BASE64_UTILS
+#if SUPPORT_BASE64_EMBEDDING
           var data = tryParseAsDataURI(Module['memoryInitializerRequestURL']);
           if (data) {
             response = data.buffer;
diff --git a/src/preamble.js b/src/preamble.js
index 04a2eda38d46..a581311a106d 100644
--- a/src/preamble.js
+++ b/src/preamble.js
@@ -2199,7 +2199,7 @@ function integrateWasmJS(Module) {
       if (Module['wasmBinary']) {
         return new Uint8Array(Module['wasmBinary']);
       }
-#if INCLUDE_BASE64_UTILS
+#if SUPPORT_BASE64_EMBEDDING
       var binary = tryParseAsDataURI(wasmBinaryFile);
       if (binary) {
         return binary;
diff --git a/src/proxyClient.js b/src/proxyClient.js
index 9bbbcbbf19ce..0edf5982647a 100644
--- a/src/proxyClient.js
+++ b/src/proxyClient.js
@@ -99,7 +99,7 @@ var frameId = 0;
 
 var filename = '{{{ filename }}}.js';
 
-#if INCLUDE_BASE64_UTILS
+#if SUPPORT_BASE64_EMBEDDING
 var workerURL = filename;
 var fileBytes = tryParseAsDataURI(filename);
 if (fileBytes) {
diff --git a/src/settings.js b/src/settings.js
index 871e30e6ddaa..ec0e65e6eb48 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -872,4 +872,4 @@ var WASM_TEXT_FILE = ''; // name of the file containing wasm text, if relevant
 var WASM_BINARY_FILE = ''; // name of the file containing wasm binary, if relevant
 var ASMJS_CODE_FILE = ''; // name of the file containing asm.js, if relevant
 
-var INCLUDE_BASE64_UTILS = 0; // If set to 1, src/base64Utils.js will be included in the bundle.
+var SUPPORT_BASE64_EMBEDDING = 0; // If set to 1, src/base64Utils.js will be included in the bundle.
diff --git a/src/shell.js b/src/shell.js
index ea195b0e1f63..97bbd48a92ed 100644
--- a/src/shell.js
+++ b/src/shell.js
@@ -81,7 +81,7 @@ if (ENVIRONMENT_IS_NODE) {
   var nodePath;
 
   Module['read'] = function shell_read(filename, binary) {
-#if !INCLUDE_BASE64_UTILS
+#if !SUPPORT_BASE64_EMBEDDING
     var ret;
 #else
     var ret = tryParseAsDataURI(filename);
@@ -140,7 +140,7 @@ else if (ENVIRONMENT_IS_SHELL) {
 
   if (typeof read != 'undefined') {
     Module['read'] = function shell_read(f) {
-#if INCLUDE_BASE64_UTILS
+#if SUPPORT_BASE64_EMBEDDING
       var data = tryParseAsDataURI(f);
       if (data) {
         return intArrayToString(data);
@@ -153,7 +153,7 @@ else if (ENVIRONMENT_IS_SHELL) {
   }
 
   Module['readBinary'] = function readBinary(f) {
-#if INCLUDE_BASE64_UTILS
+#if SUPPORT_BASE64_EMBEDDING
     var data = tryParseAsDataURI(f);
     if (data) {
       return data;
@@ -193,7 +193,7 @@ else if (ENVIRONMENT_IS_WEB || ENVIRONMENT_IS_WORKER) {
       xhr.send(null);
       return xhr.responseText;
     } catch (err) {
-#if INCLUDE_BASE64_UTILS
+#if SUPPORT_BASE64_EMBEDDING
       var data = tryParseAsDataURI(url);
       if (data) {
         return intArrayToString(data);
@@ -212,7 +212,7 @@ else if (ENVIRONMENT_IS_WEB || ENVIRONMENT_IS_WORKER) {
         xhr.send(null);
         return new Uint8Array(xhr.response);
       } catch (err) {
-#if INCLUDE_BASE64_UTILS
+#if SUPPORT_BASE64_EMBEDDING
         var data = tryParseAsDataURI(f);
         if (data) {
           return data;
@@ -232,7 +232,7 @@ else if (ENVIRONMENT_IS_WEB || ENVIRONMENT_IS_WORKER) {
         onload(xhr.response);
         return;
       }
-#if INCLUDE_BASE64_UTILS
+#if SUPPORT_BASE64_EMBEDDING
       var data = tryParseAsDataURI(url);
       if (data) {
         onload(data.buffer);

From fa0ed7a5162846fb55c947bfc671cdddad7cdd87 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Fri, 21 Jul 2017 11:06:45 -0400
Subject: [PATCH 52/78] proxyClient SUPPORT_BASE64_EMBEDDING fix (#5296)

---
 src/proxyClient.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/proxyClient.js b/src/proxyClient.js
index 0edf5982647a..09865063ad85 100644
--- a/src/proxyClient.js
+++ b/src/proxyClient.js
@@ -130,7 +130,9 @@ worker.onmessage = function worker_onmessage(event) {
   if (!workerResponded) {
     workerResponded = true;
     if (Module.setStatus) Module.setStatus('');
+#if SUPPORT_BASE64_EMBEDDING
     if (workerURL !== filename) URL.revokeObjectURL(workerURL);
+#endif
   }
 
   var data = event.data;

From 84c9e57d42946f2f5e522944d545e537d9fbd7ab Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Tue, 1 Aug 2017 16:27:25 -0700
Subject: [PATCH 53/78] use regex to remove preprocessor directives from HTML
 output (#5296)

---
 emcc.py            | 2 +-
 src/arrayUtils.js  | 6 +++---
 src/base64Utils.js | 8 ++++----
 tools/shared.py    | 5 +++++
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/emcc.py b/emcc.py
index 0f7f78382a6f..d0753c43301d 100755
--- a/emcc.py
+++ b/emcc.py
@@ -2535,7 +2535,7 @@ def generate_html(target, options, js_target, target_basename,
   if script.inline:
     for file in ['src/arrayUtils.js', 'src/base64Utils.js']:
       f = open(shared.path_from_root(file), 'r')
-      script.inline = '(function () {' + script.inline + f.read() + '})();'
+      script.inline = '(function () {' + script.inline + shared.JS.strip_preprocessor_directives(f.read()) + '})();'
       f.close()
 
   html = open(target, 'wb')
diff --git a/src/arrayUtils.js b/src/arrayUtils.js
index 48b42c5e2835..d313b7222dfc 100644
--- a/src/arrayUtils.js
+++ b/src/arrayUtils.js
@@ -14,9 +14,9 @@ function intArrayToString(array) {
   for (var i = 0; i < array.length; i++) {
     var chr = array[i];
     if (chr > 0xFF) {
-      if (typeof ASSERTIONS === 'boolean' && ASSERTIONS) {
-        assert(false, 'Character code ' + chr + ' (' + String.fromCharCode(chr) + ')  at offset ' + i + ' not in 0x00-0xFF.');
-      }
+#if ASSERTIONS
+      assert(false, 'Character code ' + chr + ' (' + String.fromCharCode(chr) + ')  at offset ' + i + ' not in 0x00-0xFF.');
+#endif
       chr &= 0xFF;
     }
     ret.push(String.fromCharCode(chr));
diff --git a/src/base64Utils.js b/src/base64Utils.js
index de9a405c0d4a..c5c483fcb9a1 100644
--- a/src/base64Utils.js
+++ b/src/base64Utils.js
@@ -3,10 +3,10 @@
 // Converts a string of base64 into a byte array.
 // Throws error on invalid input.
 function intArrayFromBase64(s) {
-  if (typeof ENVIRONMENT_IS_NODE === 'boolean' && ENVIRONMENT_IS_NODE) {
-    var buf = Buffer.from ? Buffer.from(s, 'base64') : new Buffer(s, 'base64');
-    return new Uint8Array(buf.buffer, buf.byteOffset, buf.byteLength);
-  }
+#if ENVIRONMENT_IS_NODE
+  var buf = Buffer.from ? Buffer.from(s, 'base64') : new Buffer(s, 'base64');
+  return new Uint8Array(buf.buffer, buf.byteOffset, buf.byteLength);
+#endif
 
   try {
     var decoded = atob(s);
diff --git a/tools/shared.py b/tools/shared.py
index 8519517971f9..e045acb71dc3 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -2356,6 +2356,11 @@ def get_subresource_location(path, data_uri=None):
     else:
       return os.path.basename(path)
 
+  # Strips all preprocessor directives from a string of JavaScript
+  @staticmethod
+  def strip_preprocessor_directives(s):
+    return re.sub('#if .*?\n.*?\n#endif', '', s, flags=re.DOTALL)
+
   @staticmethod
   def make_initializer(sig, settings=None):
     settings = settings or Settings

From 34d7e0394e6b8d8707310e1bdb893b12eb50b04f Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Tue, 1 Aug 2017 16:31:44 -0700
Subject: [PATCH 54/78] intArrayFromBase64 fixes for older Node and
 SpiderMonkey (#5296)

---
 src/base64Utils.js | 81 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 80 insertions(+), 1 deletion(-)

diff --git a/src/base64Utils.js b/src/base64Utils.js
index c5c483fcb9a1..4ba737f8e6d4 100644
--- a/src/base64Utils.js
+++ b/src/base64Utils.js
@@ -1,13 +1,92 @@
 // All functions here should be maybeExported from jsifier.js
 
+#if ENVIRONMENT_IS_SHELL
+// Copied from https://github.com/strophe/strophejs/blob/e06d027/src/polyfills.js#L149
+
+// This code was written by Tyler Akins and has been placed in the
+// public domain.  It would be nice if you left this header intact.
+// Base64 code from Tyler Akins -- http://rumkin.com
+
+var keyStr = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
+
+var btoa = function (input) {
+  /**
+   * Encodes a string in base64
+   * @param {String} input The string to encode in base64.
+   */
+  var output = '';
+  var chr1, chr2, chr3;
+  var enc1, enc2, enc3, enc4;
+  var i = 0;
+  do {
+    chr1 = input.charCodeAt(i++);
+    chr2 = input.charCodeAt(i++);
+    chr3 = input.charCodeAt(i++);
+
+    enc1 = chr1 >> 2;
+    enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
+    enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
+    enc4 = chr3 & 63;
+
+    if (isNaN(chr2)) {
+      enc2 = ((chr1 & 3) << 4);
+      enc3 = enc4 = 64;
+    } else if (isNaN(chr3)) {
+      enc4 = 64;
+    }
+    output = output + keyStr.charAt(enc1) + keyStr.charAt(enc2) + keyStr.charAt(enc3) + keyStr.charAt(enc4);
+  } while (i < input.length);
+  return output;
+};
+
+var atob = function (input) {
+  /**
+   * Decodes a base64 string.
+   * @param {String} input The string to decode.
+   */
+  var output = '';
+  var chr1, chr2, chr3;
+  var enc1, enc2, enc3, enc4;
+  var i = 0;
+  // remove all characters that are not A-Z, a-z, 0-9, +, /, or =
+  input = input.replace(/[^A-Za-z0-9\+\/\=]/g, '');
+  do {
+    enc1 = keyStr.indexOf(input.charAt(i++));
+    enc2 = keyStr.indexOf(input.charAt(i++));
+    enc3 = keyStr.indexOf(input.charAt(i++));
+    enc4 = keyStr.indexOf(input.charAt(i++));
+
+    chr1 = (enc1 << 2) | (enc2 >> 4);
+    chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
+    chr3 = ((enc3 & 3) << 6) | enc4;
+
+    output = output + String.fromCharCode(chr1);
+
+    if (enc3 !== 64) {
+      output = output + String.fromCharCode(chr2);
+    }
+    if (enc4 !== 64) {
+      output = output + String.fromCharCode(chr3);
+    }
+  } while (i < input.length);
+  return output;
+};
+#endif
+
 // Converts a string of base64 into a byte array.
 // Throws error on invalid input.
 function intArrayFromBase64(s) {
 #if ENVIRONMENT_IS_NODE
-  var buf = Buffer.from ? Buffer.from(s, 'base64') : new Buffer(s, 'base64');
+  var buf;
+  try {
+    buf = Buffer.from(s, 'base64');
+  } catch (_) {
+    buf = new Buffer(s, 'base64');
+  }
   return new Uint8Array(buf.buffer, buf.byteOffset, buf.byteLength);
 #endif
 
+  // Not included in an #else to avoid removal by shared.JS.strip_preprocessor_directives
   try {
     var decoded = atob(s);
     var bytes = new Uint8Array(decoded.length);

From ebb8d7c14f5987f4ade40c49f76eeca65a4f6909 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Sun, 6 Aug 2017 23:16:52 -0700
Subject: [PATCH 55/78] misc base64Utils fixes (#5296)

---
 src/base64Utils.js | 143 ++++++++++++++++++++++-----------------------
 1 file changed, 71 insertions(+), 72 deletions(-)

diff --git a/src/base64Utils.js b/src/base64Utils.js
index 4ba737f8e6d4..362c6414f6ff 100644
--- a/src/base64Utils.js
+++ b/src/base64Utils.js
@@ -1,92 +1,91 @@
 // All functions here should be maybeExported from jsifier.js
 
-#if ENVIRONMENT_IS_SHELL
-// Copied from https://github.com/strophe/strophejs/blob/e06d027/src/polyfills.js#L149
+if (typeof ENVIRONMENT_IS_SHELL === 'boolean' && ENVIRONMENT_IS_SHELL) {
+  // Copied from https://github.com/strophe/strophejs/blob/e06d027/src/polyfills.js#L149
 
-// This code was written by Tyler Akins and has been placed in the
-// public domain.  It would be nice if you left this header intact.
-// Base64 code from Tyler Akins -- http://rumkin.com
+  // This code was written by Tyler Akins and has been placed in the
+  // public domain.  It would be nice if you left this header intact.
+  // Base64 code from Tyler Akins -- http://rumkin.com
 
-var keyStr = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
+  var keyStr = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
 
-var btoa = function (input) {
-  /**
-   * Encodes a string in base64
-   * @param {String} input The string to encode in base64.
-   */
-  var output = '';
-  var chr1, chr2, chr3;
-  var enc1, enc2, enc3, enc4;
-  var i = 0;
-  do {
-    chr1 = input.charCodeAt(i++);
-    chr2 = input.charCodeAt(i++);
-    chr3 = input.charCodeAt(i++);
+  var btoa = function (input) {
+    /**
+     * Encodes a string in base64
+     * @param {String} input The string to encode in base64.
+     */
+    var output = '';
+    var chr1, chr2, chr3;
+    var enc1, enc2, enc3, enc4;
+    var i = 0;
+    do {
+      chr1 = input.charCodeAt(i++);
+      chr2 = input.charCodeAt(i++);
+      chr3 = input.charCodeAt(i++);
 
-    enc1 = chr1 >> 2;
-    enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
-    enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
-    enc4 = chr3 & 63;
+      enc1 = chr1 >> 2;
+      enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
+      enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
+      enc4 = chr3 & 63;
 
-    if (isNaN(chr2)) {
-      enc2 = ((chr1 & 3) << 4);
-      enc3 = enc4 = 64;
-    } else if (isNaN(chr3)) {
-      enc4 = 64;
-    }
-    output = output + keyStr.charAt(enc1) + keyStr.charAt(enc2) + keyStr.charAt(enc3) + keyStr.charAt(enc4);
-  } while (i < input.length);
-  return output;
-};
+      if (isNaN(chr2)) {
+        enc2 = ((chr1 & 3) << 4);
+        enc3 = enc4 = 64;
+      } else if (isNaN(chr3)) {
+        enc4 = 64;
+      }
+      output = output + keyStr.charAt(enc1) + keyStr.charAt(enc2) + keyStr.charAt(enc3) + keyStr.charAt(enc4);
+    } while (i < input.length);
+    return output;
+  };
 
-var atob = function (input) {
-  /**
-   * Decodes a base64 string.
-   * @param {String} input The string to decode.
-   */
-  var output = '';
-  var chr1, chr2, chr3;
-  var enc1, enc2, enc3, enc4;
-  var i = 0;
-  // remove all characters that are not A-Z, a-z, 0-9, +, /, or =
-  input = input.replace(/[^A-Za-z0-9\+\/\=]/g, '');
-  do {
-    enc1 = keyStr.indexOf(input.charAt(i++));
-    enc2 = keyStr.indexOf(input.charAt(i++));
-    enc3 = keyStr.indexOf(input.charAt(i++));
-    enc4 = keyStr.indexOf(input.charAt(i++));
+  var atob = function (input) {
+    /**
+     * Decodes a base64 string.
+     * @param {String} input The string to decode.
+     */
+    var output = '';
+    var chr1, chr2, chr3;
+    var enc1, enc2, enc3, enc4;
+    var i = 0;
+    // remove all characters that are not A-Z, a-z, 0-9, +, /, or =
+    input = input.replace(/[^A-Za-z0-9\+\/\=]/g, '');
+    do {
+      enc1 = keyStr.indexOf(input.charAt(i++));
+      enc2 = keyStr.indexOf(input.charAt(i++));
+      enc3 = keyStr.indexOf(input.charAt(i++));
+      enc4 = keyStr.indexOf(input.charAt(i++));
 
-    chr1 = (enc1 << 2) | (enc2 >> 4);
-    chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
-    chr3 = ((enc3 & 3) << 6) | enc4;
+      chr1 = (enc1 << 2) | (enc2 >> 4);
+      chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
+      chr3 = ((enc3 & 3) << 6) | enc4;
 
-    output = output + String.fromCharCode(chr1);
+      output = output + String.fromCharCode(chr1);
 
-    if (enc3 !== 64) {
-      output = output + String.fromCharCode(chr2);
-    }
-    if (enc4 !== 64) {
-      output = output + String.fromCharCode(chr3);
-    }
-  } while (i < input.length);
-  return output;
-};
-#endif
+      if (enc3 !== 64) {
+        output = output + String.fromCharCode(chr2);
+      }
+      if (enc4 !== 64) {
+        output = output + String.fromCharCode(chr3);
+      }
+    } while (i < input.length);
+    return output;
+  };
+}
 
 // Converts a string of base64 into a byte array.
 // Throws error on invalid input.
 function intArrayFromBase64(s) {
-#if ENVIRONMENT_IS_NODE
-  var buf;
-  try {
-    buf = Buffer.from(s, 'base64');
-  } catch (_) {
-    buf = new Buffer(s, 'base64');
+  if (typeof ENVIRONMENT_IS_NODE === 'boolean' && ENVIRONMENT_IS_NODE) {
+    var buf;
+    try {
+      buf = Buffer.from(s, 'base64');
+    } catch (_) {
+      buf = new Buffer(s, 'base64');
+    }
+    return new Uint8Array(buf.buffer, buf.byteOffset, buf.byteLength);
   }
-  return new Uint8Array(buf.buffer, buf.byteOffset, buf.byteLength);
-#endif
 
-  // Not included in an #else to avoid removal by shared.JS.strip_preprocessor_directives
   try {
     var decoded = atob(s);
     var bytes = new Uint8Array(decoded.length);

From 32f96f259f99d5938fa1a08bdec68386962187c6 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Sun, 6 Aug 2017 23:37:32 -0700
Subject: [PATCH 56/78] limited HTML output preprocessor support (#5296)

---
 emcc.py         |  2 +-
 tools/shared.py | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/emcc.py b/emcc.py
index d0753c43301d..5fa2c20b5416 100755
--- a/emcc.py
+++ b/emcc.py
@@ -2535,7 +2535,7 @@ def generate_html(target, options, js_target, target_basename,
   if script.inline:
     for file in ['src/arrayUtils.js', 'src/base64Utils.js']:
       f = open(shared.path_from_root(file), 'r')
-      script.inline = '(function () {' + script.inline + shared.JS.strip_preprocessor_directives(f.read()) + '})();'
+      script.inline = '(function () {' + script.inline + shared.JS.preprocessor(f.read()) + '})();'
       f.close()
 
   html = open(target, 'wb')
diff --git a/tools/shared.py b/tools/shared.py
index e045acb71dc3..0f772efc2455 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -2356,10 +2356,19 @@ def get_subresource_location(path, data_uri=None):
     else:
       return os.path.basename(path)
 
-  # Strips all preprocessor directives from a string of JavaScript
+  # Runs the preprocessor on a string of JavaScript
+  # WARNING: Currently using a very simplified version that supports only a
+  # small subset of preprocessor directives. Replacing this with a hook into
+  # the real preprocessor is planned.
   @staticmethod
-  def strip_preprocessor_directives(s):
-    return re.sub('#if .*?\n.*?\n#endif', '', s, flags=re.DOTALL)
+  def preprocessor(s):
+    settings = settings or Settings
+    def repl(matchobj):
+      if settings.get(matchobj.group(1)):
+        return matchobj.group(2)
+      else:
+        return ''
+    return re.sub(r'#if (.*?)\n(.*?)\n#endif', repl, s, flags=re.DOTALL)
 
   @staticmethod
   def make_initializer(sig, settings=None):

From 24e4356e783f11cb02b49c18f08964c33ef7c308 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Mon, 7 Aug 2017 00:06:17 -0700
Subject: [PATCH 57/78] run preprocessor on arrayUtils/base64Utils in jsifier
 (#5296)

---
 src/jsifier.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/jsifier.js b/src/jsifier.js
index 0358c2fd4d18..63057ff0a215 100644
--- a/src/jsifier.js
+++ b/src/jsifier.js
@@ -424,13 +424,13 @@ function JSify(data, functionsOnly) {
 
     if (ASSERTIONS) print('var ASSERTIONS = true;\n');
 
-    print(read('arrayUtils.js'));
+    print(preprocess(read('arrayUtils.js')));
     // Export all arrayUtils.js functions
     print(maybeExport('intArrayFromString'));
     print(maybeExport('intArrayToString'));
 
     if (SUPPORT_BASE64_EMBEDDING) {
-      print(read('base64Utils.js'));
+      print(preprocess(read('base64Utils.js')));
       // Export all base64Utils.js functions
       print(maybeExport('intArrayFromBase64'));
       print(maybeExport('tryParseAsDataURI'));

From b42241995c4374ab1ba4913e65feb17dd0122d52 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Mon, 7 Aug 2017 15:51:24 -0700
Subject: [PATCH 58/78] misc touch ups (#5296)

---
 src/preamble.js | 2 +-
 src/shell.js    | 6 ++++--
 tools/shared.py | 8 ++++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/preamble.js b/src/preamble.js
index a581311a106d..9fb795f77e6e 100644
--- a/src/preamble.js
+++ b/src/preamble.js
@@ -2203,7 +2203,7 @@ function integrateWasmJS(Module) {
       var binary = tryParseAsDataURI(wasmBinaryFile);
       if (binary) {
         return binary;
-      } else
+      }
 #endif
       if (Module['readBinary']) {
         return Module['readBinary'](wasmBinaryFile);
diff --git a/src/shell.js b/src/shell.js
index 97bbd48a92ed..7062f962053a 100644
--- a/src/shell.js
+++ b/src/shell.js
@@ -187,20 +187,22 @@ else if (ENVIRONMENT_IS_SHELL) {
 }
 else if (ENVIRONMENT_IS_WEB || ENVIRONMENT_IS_WORKER) {
   Module['read'] = function shell_read(url) {
+#if SUPPORT_BASE64_EMBEDDING
     try {
+#endif
       var xhr = new XMLHttpRequest();
       xhr.open('GET', url, false);
       xhr.send(null);
       return xhr.responseText;
-    } catch (err) {
 #if SUPPORT_BASE64_EMBEDDING
+    } catch (err) {
       var data = tryParseAsDataURI(url);
       if (data) {
         return intArrayToString(data);
       }
-#endif
       throw err;
     }
+#endif
   };
 
   if (ENVIRONMENT_IS_WORKER) {
diff --git a/tools/shared.py b/tools/shared.py
index 0f772efc2455..1599a5fe1eae 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -2357,9 +2357,13 @@ def get_subresource_location(path, data_uri=None):
       return os.path.basename(path)
 
   # Runs the preprocessor on a string of JavaScript
+  #
   # WARNING: Currently using a very simplified version that supports only a
-  # small subset of preprocessor directives. Replacing this with a hook into
-  # the real preprocessor is planned.
+  # small subset of preprocessor directives. Specifically, it will work with
+  # "#if NAME_OF_SETTING ... #endif". Anything other than that, including
+  # "#if !NAME_OF_SETTING ... #endif", is unsupported.
+  #
+  # TODO: Replace this with a hook into the real preprocessor.
   @staticmethod
   def preprocessor(s):
     settings = settings or Settings

From 1104ee0bd07ee5b076eda48124b6dfbc666a6f06 Mon Sep 17 00:00:00 2001
From: Alon Zakai <alonzakai@gmail.com>
Date: Mon, 21 Aug 2017 13:29:36 -0700
Subject: [PATCH 59/78] clean up global var embed_memfile

---
 emcc.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/emcc.py b/emcc.py
index 5fa2c20b5416..0a34ae2465da 100755
--- a/emcc.py
+++ b/emcc.py
@@ -276,6 +276,10 @@ def do_minify(self):
       self.cleanup_shell = True
 
 
+def embed_memfile(options):
+  return shared.Settings.SINGLE_FILE or (shared.Settings.MEM_INIT_METHOD == 0 and (not shared.Settings.MAIN_MODULE and not shared.Settings.SIDE_MODULE and options.debug_level < 4))
+
+
 #
 # Main run() function
 #
@@ -1523,9 +1527,7 @@ def get_final():
       else:
         assert shared.Settings.MEM_INIT_METHOD != 1
 
-      global embed_memfile
-      embed_memfile = shared.Settings.SINGLE_FILE or (shared.Settings.MEM_INIT_METHOD == 0 and (not shared.Settings.MAIN_MODULE and not shared.Settings.SIDE_MODULE and options.debug_level < 4))
-      if embed_memfile:
+      if embed_memfile(options):
         shared.Settings.SUPPORT_BASE64_EMBEDDING = 1
 
       final = shared.Building.emscripten(final, append_ext=False, extra_args=extra_args)
@@ -1613,7 +1615,7 @@ def get_final():
     with ToolchainProfiler.profile_block('memory initializer'):
       memfile = None
 
-      if shared.Settings.MEM_INIT_METHOD > 0 or embed_memfile:
+      if shared.Settings.MEM_INIT_METHOD > 0 or embed_memfile(options):
         memfile = target + '.mem'
         shared.try_delete(memfile)
         def repl(m):
@@ -1632,7 +1634,7 @@ def repl(m):
             # Copy into temp dir as well, so can be run there too
             shared.safe_copy(memfile, os.path.join(shared.get_emscripten_temp_dir(), os.path.basename(memfile)))
           if not shared.Settings.BINARYEN or 'asmjs' in shared.Settings.BINARYEN_METHOD or 'interpret-asm2wasm' in shared.Settings.BINARYEN_METHOD:
-            return 'memoryInitializer = "%s";' % shared.JS.get_subresource_location(memfile, embed_memfile)
+            return 'memoryInitializer = "%s";' % shared.JS.get_subresource_location(memfile, embed_memfile(options))
           else:
             return 'memoryInitializer = null;'
         src = re.sub(shared.JS.memory_initializer_pattern, repl, open(final).read(), count=1)
@@ -1804,7 +1806,7 @@ def get_eliminate():
         if options.proxy_to_worker:
           generate_worker_js(target, js_target, target_basename)
 
-      if embed_memfile:
+      if embed_memfile(options):
         shared.try_delete(memfile)
 
       for f in generated_text_files_with_native_eols:

From 8814a6945ce323a74a981c8fc60108f7fc3298fc Mon Sep 17 00:00:00 2001
From: Alon Zakai <alonzakai@gmail.com>
Date: Mon, 21 Aug 2017 13:50:34 -0700
Subject: [PATCH 60/78] clean up preprocessing

---
 src/postamble.js | 12 ++++++------
 src/settings.js  |  1 +
 src/shell.js     | 28 ++++++++++++++--------------
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/postamble.js b/src/postamble.js
index c8747011b9fc..b995a3b89a59 100644
--- a/src/postamble.js
+++ b/src/postamble.js
@@ -68,11 +68,10 @@ if (memoryInitializer) {
         var memoryInitializerBytes = tryParseAsDataURI(memoryInitializer);
         if (memoryInitializerBytes) {
           applyMemoryInitializer(memoryInitializerBytes.buffer);
-        } else
-#endif
-        {
-          throw 'could not load memory initializer ' + memoryInitializer;
+          return;
         }
+#endif
+        throw 'could not load memory initializer ' + memoryInitializer;
       });
     }
     if (Module['memoryInitializerRequest']) {
@@ -85,16 +84,17 @@ if (memoryInitializer) {
           var data = tryParseAsDataURI(Module['memoryInitializerRequestURL']);
           if (data) {
             response = data.buffer;
-          } else
+          } else {
 #endif
-          {
             // If you see this warning, the issue may be that you are using locateFile or memoryInitializerPrefixURL, and defining them in JS. That
             // means that the HTML file doesn't know about them, and when it tries to create the mem init request early, does it to the wrong place.
             // Look in your browser's devtools network console to see what's going on.
             console.warn('a problem seems to have happened with Module.memoryInitializerRequest, status: ' + request.status + ', retrying ' + memoryInitializer);
             doBrowserLoad();
             return;
+#if SUPPORT_BASE64_EMBEDDING
           }
+#endif
         }
         applyMemoryInitializer(request.response);
       }
diff --git a/src/settings.js b/src/settings.js
index ec0e65e6eb48..adfdbed9df13 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -873,3 +873,4 @@ var WASM_BINARY_FILE = ''; // name of the file containing wasm binary, if releva
 var ASMJS_CODE_FILE = ''; // name of the file containing asm.js, if relevant
 
 var SUPPORT_BASE64_EMBEDDING = 0; // If set to 1, src/base64Utils.js will be included in the bundle.
+                                  // This is set internally when needed (SINGLE_FILE)
diff --git a/src/shell.js b/src/shell.js
index 7062f962053a..d786e14694d6 100644
--- a/src/shell.js
+++ b/src/shell.js
@@ -81,18 +81,18 @@ if (ENVIRONMENT_IS_NODE) {
   var nodePath;
 
   Module['read'] = function shell_read(filename, binary) {
-#if !SUPPORT_BASE64_EMBEDDING
     var ret;
-#else
-    var ret = tryParseAsDataURI(filename);
-    if (!ret)
+#if SUPPORT_BASE64_EMBEDDING
+    ret = tryParseAsDataURI(filename);
+    if (!ret) {
 #endif
-    {
       if (!nodeFS) nodeFS = require('fs');
       if (!nodePath) nodePath = require('path');
       filename = nodePath['normalize'](filename);
       ret = nodeFS['readFileSync'](filename);
+#if SUPPORT_BASE64_EMBEDDING
     }
+#endif
     return binary ? ret : ret.toString();
   };
 
@@ -153,13 +153,12 @@ else if (ENVIRONMENT_IS_SHELL) {
   }
 
   Module['readBinary'] = function readBinary(f) {
+    var data;
 #if SUPPORT_BASE64_EMBEDDING
-    var data = tryParseAsDataURI(f);
+    data = tryParseAsDataURI(f);
     if (data) {
       return data;
     }
-#else
-    var data;
 #endif
     if (typeof readbuffer === 'function') {
       return new Uint8Array(readbuffer(f));
@@ -207,21 +206,23 @@ else if (ENVIRONMENT_IS_WEB || ENVIRONMENT_IS_WORKER) {
 
   if (ENVIRONMENT_IS_WORKER) {
     Module['readBinary'] = function readBinary(url) {
+#if SUPPORT_BASE64_EMBEDDING
       try {
+#endif
         var xhr = new XMLHttpRequest();
         xhr.open('GET', url, false);
         xhr.responseType = 'arraybuffer';
         xhr.send(null);
         return new Uint8Array(xhr.response);
-      } catch (err) {
 #if SUPPORT_BASE64_EMBEDDING
+      } catch (err) {
         var data = tryParseAsDataURI(f);
         if (data) {
           return data;
         }
-#endif
         throw err;
       }
+#endif
     };
   }
 
@@ -238,11 +239,10 @@ else if (ENVIRONMENT_IS_WEB || ENVIRONMENT_IS_WORKER) {
       var data = tryParseAsDataURI(url);
       if (data) {
         onload(data.buffer);
-      } else
-#endif
-      {
-        onerror();
+        return;
       }
+#endif
+      onerror();
     };
     xhr.onerror = onerror;
     xhr.send(null);

From bc33edd37729891e78e334341d54f19a102a4c9a Mon Sep 17 00:00:00 2001
From: Alon Zakai <alonzakai@gmail.com>
Date: Mon, 21 Aug 2017 13:50:56 -0700
Subject: [PATCH 61/78] use interpret-binary in other.test_single_file, so we
 don't depend on native wasm support in the js engine

---
 tests/test_other.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/test_other.py b/tests/test_other.py
index 62a4f0615a19..b2b2abf5566d 100644
--- a/tests/test_other.py
+++ b/tests/test_other.py
@@ -7746,9 +7746,10 @@ def test_single_file(self):
                   if emterpreter_file_enabled:
                     cmd += ['-s', "EMTERPRETIFY_FILE='a.out.dat'"]
                   if wasm_enabled:
-                    cmd += ['-s', 'WASM=1']
-                  if asmjs_fallback_enabled:
-                    cmd += ['-s', "BINARYEN_METHOD='native-wasm,asmjs'"]
+                    method = 'interpret-binary'
+                    if asmjs_fallback_enabled:
+                      method += ',asmjs'
+                    cmd += ['-s', 'WASM=1', '-s', "BINARYEN_METHOD='" + method + "'"]
 
                   print ' '.join(cmd)
                   self.clear()

From d1903929d0ffc75e453c84253ca0c94ccfc91409 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Mon, 21 Aug 2017 15:45:14 -0700
Subject: [PATCH 62/78] minor cleanup (#5296)

---
 tools/shared.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/shared.py b/tools/shared.py
index 1599a5fe1eae..e819c0099b38 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -2366,9 +2366,8 @@ def get_subresource_location(path, data_uri=None):
   # TODO: Replace this with a hook into the real preprocessor.
   @staticmethod
   def preprocessor(s):
-    settings = settings or Settings
     def repl(matchobj):
-      if settings.get(matchobj.group(1)):
+      if Settings.get(matchobj.group(1)):
         return matchobj.group(2)
       else:
         return ''

From 86c319bf0c85267a28cb5209d9b92d488d2f445d Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Tue, 22 Aug 2017 16:59:48 -0700
Subject: [PATCH 63/78] minor fixes (#5296)

---
 emcc.py         |  2 +-
 tools/shared.py | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/emcc.py b/emcc.py
index 0a34ae2465da..82c4a6bb632f 100755
--- a/emcc.py
+++ b/emcc.py
@@ -2517,7 +2517,7 @@ def generate_html(target, options, js_target, target_basename,
     script.inline = '''
           var wasmURL = '%s';
           var wasmXHR = new XMLHttpRequest();
-          wasmXHR.open('GET', '%s', true);
+          wasmXHR.open('GET', wasmURL, true);
           wasmXHR.responseType = 'arraybuffer';
           wasmXHR.onload = function() {
             if (wasmXHR.status === 200 || wasmXHR.status === 0) {
diff --git a/tools/shared.py b/tools/shared.py
index e819c0099b38..d6f1388e0acf 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -2367,10 +2367,12 @@ def get_subresource_location(path, data_uri=None):
   @staticmethod
   def preprocessor(s):
     def repl(matchobj):
-      if Settings.get(matchobj.group(1)):
-        return matchobj.group(2)
-      else:
-        return ''
+      try:
+        if Settings.get(matchobj.group(1)):
+          return matchobj.group(2)
+      except:
+        pass
+      return ''
     return re.sub(r'#if (.*?)\n(.*?)\n#endif', repl, s, flags=re.DOTALL)
 
   @staticmethod

From d55bc456c42f2fd0cb145400f0c628e389aeece0 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Mon, 25 Sep 2017 17:21:47 -0700
Subject: [PATCH 64/78] remove SINGLE_FILE dependency on Python preprocessor
 method (#5296)

---
 emcc.py           |  2 +-
 src/arrayUtils.js |  8 +++++---
 src/preamble.js   |  7 +++++++
 tools/shared.py   | 19 -------------------
 4 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/emcc.py b/emcc.py
index acbd7d64842f..2c720dd51769 100755
--- a/emcc.py
+++ b/emcc.py
@@ -2570,7 +2570,7 @@ def generate_html(target, options, js_target, target_basename,
   if script.inline:
     for file in ['src/arrayUtils.js', 'src/base64Utils.js']:
       f = open(shared.path_from_root(file), 'r')
-      script.inline = '(function () {' + script.inline + shared.JS.preprocessor(f.read()) + '})();'
+      script.inline = '(function () {' + script.inline + f.read() + '})();'
       f.close()
 
   html = open(target, 'wb')
diff --git a/src/arrayUtils.js b/src/arrayUtils.js
index d313b7222dfc..f9851f276bbb 100644
--- a/src/arrayUtils.js
+++ b/src/arrayUtils.js
@@ -1,5 +1,9 @@
 // All functions here should be maybeExported from jsifier.js
 
+if (typeof maybeAssert !== 'function') {
+  function maybeAssert() {}
+}
+
 /** @type {function(string, boolean=, number=)} */
 function intArrayFromString(stringy, dontAddNull, length) {
   var len = length > 0 ? length : lengthBytesUTF8(stringy)+1;
@@ -14,9 +18,7 @@ function intArrayToString(array) {
   for (var i = 0; i < array.length; i++) {
     var chr = array[i];
     if (chr > 0xFF) {
-#if ASSERTIONS
-      assert(false, 'Character code ' + chr + ' (' + String.fromCharCode(chr) + ')  at offset ' + i + ' not in 0x00-0xFF.');
-#endif
+      maybeAssert(false, 'Character code ' + chr + ' (' + String.fromCharCode(chr) + ')  at offset ' + i + ' not in 0x00-0xFF.');
       chr &= 0xFF;
     }
     ret.push(String.fromCharCode(chr));
diff --git a/src/preamble.js b/src/preamble.js
index 14b7fce70109..eb264a80735b 100644
--- a/src/preamble.js
+++ b/src/preamble.js
@@ -120,6 +120,13 @@ function assert(condition, text) {
   }
 }
 
+// Runs assert if ASSERTIONS is true
+function maybeAssert(condition, text) {
+#if ASSERTIONS
+  assert(condition, text);
+#endif
+}
+
 var globalScope = this;
 
 // Returns the C function with a specified identifier (for C++, you need to do manual name mangling)
diff --git a/tools/shared.py b/tools/shared.py
index 85d467d2db65..249d2e6513d9 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -2356,25 +2356,6 @@ def get_subresource_location(path, data_uri=None):
     else:
       return os.path.basename(path)
 
-  # Runs the preprocessor on a string of JavaScript
-  #
-  # WARNING: Currently using a very simplified version that supports only a
-  # small subset of preprocessor directives. Specifically, it will work with
-  # "#if NAME_OF_SETTING ... #endif". Anything other than that, including
-  # "#if !NAME_OF_SETTING ... #endif", is unsupported.
-  #
-  # TODO: Replace this with a hook into the real preprocessor.
-  @staticmethod
-  def preprocessor(s):
-    def repl(matchobj):
-      try:
-        if Settings.get(matchobj.group(1)):
-          return matchobj.group(2)
-      except:
-        pass
-      return ''
-    return re.sub(r'#if (.*?)\n(.*?)\n#endif', repl, s, flags=re.DOTALL)
-
   @staticmethod
   def make_initializer(sig, settings=None):
     settings = settings or Settings

From a4a864d63ffb7c3182b5d8ed4ca71fa15037bab6 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Fri, 29 Sep 2017 10:13:00 -0700
Subject: [PATCH 65/78] minor fixes (#5296)

---
 src/base64Utils.js | 126 ++++++++++++++++++++++-----------------------
 src/preamble.js    |   2 +
 2 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/src/base64Utils.js b/src/base64Utils.js
index 362c6414f6ff..a6b92c42dd2c 100644
--- a/src/base64Utils.js
+++ b/src/base64Utils.js
@@ -1,77 +1,75 @@
 // All functions here should be maybeExported from jsifier.js
 
-if (typeof ENVIRONMENT_IS_SHELL === 'boolean' && ENVIRONMENT_IS_SHELL) {
-  // Copied from https://github.com/strophe/strophejs/blob/e06d027/src/polyfills.js#L149
+// Copied from https://github.com/strophe/strophejs/blob/e06d027/src/polyfills.js#L149
 
-  // This code was written by Tyler Akins and has been placed in the
-  // public domain.  It would be nice if you left this header intact.
-  // Base64 code from Tyler Akins -- http://rumkin.com
+// This code was written by Tyler Akins and has been placed in the
+// public domain.  It would be nice if you left this header intact.
+// Base64 code from Tyler Akins -- http://rumkin.com
 
-  var keyStr = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
+var keyStr = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
 
-  var btoa = function (input) {
-    /**
-     * Encodes a string in base64
-     * @param {String} input The string to encode in base64.
-     */
-    var output = '';
-    var chr1, chr2, chr3;
-    var enc1, enc2, enc3, enc4;
-    var i = 0;
-    do {
-      chr1 = input.charCodeAt(i++);
-      chr2 = input.charCodeAt(i++);
-      chr3 = input.charCodeAt(i++);
+var btoa = btoa || function (input) {
+  /**
+   * Encodes a string in base64
+   * @param {String} input The string to encode in base64.
+   */
+  var output = '';
+  var chr1, chr2, chr3;
+  var enc1, enc2, enc3, enc4;
+  var i = 0;
+  do {
+    chr1 = input.charCodeAt(i++);
+    chr2 = input.charCodeAt(i++);
+    chr3 = input.charCodeAt(i++);
 
-      enc1 = chr1 >> 2;
-      enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
-      enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
-      enc4 = chr3 & 63;
+    enc1 = chr1 >> 2;
+    enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
+    enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
+    enc4 = chr3 & 63;
 
-      if (isNaN(chr2)) {
-        enc2 = ((chr1 & 3) << 4);
-        enc3 = enc4 = 64;
-      } else if (isNaN(chr3)) {
-        enc4 = 64;
-      }
-      output = output + keyStr.charAt(enc1) + keyStr.charAt(enc2) + keyStr.charAt(enc3) + keyStr.charAt(enc4);
-    } while (i < input.length);
-    return output;
-  };
+    if (isNaN(chr2)) {
+      enc2 = ((chr1 & 3) << 4);
+      enc3 = enc4 = 64;
+    } else if (isNaN(chr3)) {
+      enc4 = 64;
+    }
+    output = output + keyStr.charAt(enc1) + keyStr.charAt(enc2) + keyStr.charAt(enc3) + keyStr.charAt(enc4);
+  } while (i < input.length);
+  return output;
+};
 
-  var atob = function (input) {
-    /**
-     * Decodes a base64 string.
-     * @param {String} input The string to decode.
-     */
-    var output = '';
-    var chr1, chr2, chr3;
-    var enc1, enc2, enc3, enc4;
-    var i = 0;
-    // remove all characters that are not A-Z, a-z, 0-9, +, /, or =
-    input = input.replace(/[^A-Za-z0-9\+\/\=]/g, '');
-    do {
-      enc1 = keyStr.indexOf(input.charAt(i++));
-      enc2 = keyStr.indexOf(input.charAt(i++));
-      enc3 = keyStr.indexOf(input.charAt(i++));
-      enc4 = keyStr.indexOf(input.charAt(i++));
+var atob = atob || function (input) {
+  /**
+   * Decodes a base64 string.
+   * @param {String} input The string to decode.
+   */
+  var output = '';
+  var chr1, chr2, chr3;
+  var enc1, enc2, enc3, enc4;
+  var i = 0;
+  // remove all characters that are not A-Z, a-z, 0-9, +, /, or =
+  input = input.replace(/[^A-Za-z0-9\+\/\=]/g, '');
+  do {
+    enc1 = keyStr.indexOf(input.charAt(i++));
+    enc2 = keyStr.indexOf(input.charAt(i++));
+    enc3 = keyStr.indexOf(input.charAt(i++));
+    enc4 = keyStr.indexOf(input.charAt(i++));
 
-      chr1 = (enc1 << 2) | (enc2 >> 4);
-      chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
-      chr3 = ((enc3 & 3) << 6) | enc4;
+    chr1 = (enc1 << 2) | (enc2 >> 4);
+    chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
+    chr3 = ((enc3 & 3) << 6) | enc4;
 
-      output = output + String.fromCharCode(chr1);
+    output = output + String.fromCharCode(chr1);
 
-      if (enc3 !== 64) {
-        output = output + String.fromCharCode(chr2);
-      }
-      if (enc4 !== 64) {
-        output = output + String.fromCharCode(chr3);
-      }
-    } while (i < input.length);
-    return output;
-  };
-}
+    if (enc3 !== 64) {
+      output = output + String.fromCharCode(chr2);
+    }
+    if (enc4 !== 64) {
+      output = output + String.fromCharCode(chr3);
+    }
+  } while (i < input.length);
+  return output;
+};
 
 // Converts a string of base64 into a byte array.
 // Throws error on invalid input.
@@ -89,7 +87,7 @@ function intArrayFromBase64(s) {
   try {
     var decoded = atob(s);
     var bytes = new Uint8Array(decoded.length);
-    for (i = 0 ; i < decoded.length ; ++i) {
+    for (var i = 0 ; i < decoded.length ; ++i) {
       bytes[i] = decoded.charCodeAt(i);
     }
     return bytes;
diff --git a/src/preamble.js b/src/preamble.js
index eb264a80735b..e6a6d7bbaefb 100644
--- a/src/preamble.js
+++ b/src/preamble.js
@@ -2221,6 +2221,8 @@ function integrateWasmJS() {
           throw "failed to load wasm binary file at '" + wasmBinaryFile + "'";
         }
         return response['arrayBuffer']();
+      }).catch(function () {
+        return getBinary();
       });
     }
     // Otherwise, getBinary should be able to get it synchronously

From adbb60dc94b60098355164c5a39526f22114d452 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Fri, 29 Sep 2017 16:43:30 -0700
Subject: [PATCH 66/78] for better run-time efficiency, temporarily duplicate
 function pending Python preprocessor support (#5296)

---
 src/arrayUtils.js | 38 +++++++++++++++++++++++++-------------
 src/preamble.js   |  7 -------
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/src/arrayUtils.js b/src/arrayUtils.js
index f9851f276bbb..1035f714a9db 100644
--- a/src/arrayUtils.js
+++ b/src/arrayUtils.js
@@ -1,9 +1,5 @@
 // All functions here should be maybeExported from jsifier.js
 
-if (typeof maybeAssert !== 'function') {
-  function maybeAssert() {}
-}
-
 /** @type {function(string, boolean=, number=)} */
 function intArrayFromString(stringy, dontAddNull, length) {
   var len = length > 0 ? length : lengthBytesUTF8(stringy)+1;
@@ -13,15 +9,31 @@ function intArrayFromString(stringy, dontAddNull, length) {
   return u8array;
 }
 
-function intArrayToString(array) {
-  var ret = [];
-  for (var i = 0; i < array.length; i++) {
-    var chr = array[i];
-    if (chr > 0xFF) {
-      maybeAssert(false, 'Character code ' + chr + ' (' + String.fromCharCode(chr) + ')  at offset ' + i + ' not in 0x00-0xFF.');
-      chr &= 0xFF;
+// Temporarily duplicating function pending Python preprocessor support
+var ASSERTIONS;
+if (ASSERTIONS) {
+  function intArrayToString(array) {
+    var ret = [];
+    for (var i = 0; i < array.length; i++) {
+      var chr = array[i];
+      if (chr > 0xFF) {
+        assert(false, 'Character code ' + chr + ' (' + String.fromCharCode(chr) + ')  at offset ' + i + ' not in 0x00-0xFF.');
+        chr &= 0xFF;
+      }
+      ret.push(String.fromCharCode(chr));
+    }
+    return ret.join('');
+  }
+} else {
+  function intArrayToString(array) {
+    var ret = [];
+    for (var i = 0; i < array.length; i++) {
+      var chr = array[i];
+      if (chr > 0xFF) {
+        chr &= 0xFF;
+      }
+      ret.push(String.fromCharCode(chr));
     }
-    ret.push(String.fromCharCode(chr));
+    return ret.join('');
   }
-  return ret.join('');
 }
diff --git a/src/preamble.js b/src/preamble.js
index e6a6d7bbaefb..3507331b68f1 100644
--- a/src/preamble.js
+++ b/src/preamble.js
@@ -120,13 +120,6 @@ function assert(condition, text) {
   }
 }
 
-// Runs assert if ASSERTIONS is true
-function maybeAssert(condition, text) {
-#if ASSERTIONS
-  assert(condition, text);
-#endif
-}
-
 var globalScope = this;
 
 // Returns the C function with a specified identifier (for C++, you need to do manual name mangling)

From 2bce73fe6d7002f5e2cdcfa39489c69c10b5a56a Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Sat, 30 Sep 2017 11:25:33 -0700
Subject: [PATCH 67/78] minor fix (#5296)

---
 src/arrayUtils.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/arrayUtils.js b/src/arrayUtils.js
index 1035f714a9db..3720fbb5b499 100644
--- a/src/arrayUtils.js
+++ b/src/arrayUtils.js
@@ -11,8 +11,8 @@ function intArrayFromString(stringy, dontAddNull, length) {
 
 // Temporarily duplicating function pending Python preprocessor support
 var ASSERTIONS;
-if (ASSERTIONS) {
-  function intArrayToString(array) {
+var intArrayToString = ASSERTIONS ?
+  function (array) {
     var ret = [];
     for (var i = 0; i < array.length; i++) {
       var chr = array[i];
@@ -23,9 +23,8 @@ if (ASSERTIONS) {
       ret.push(String.fromCharCode(chr));
     }
     return ret.join('');
-  }
-} else {
-  function intArrayToString(array) {
+  } :
+  function (array) {
     var ret = [];
     for (var i = 0; i < array.length; i++) {
       var chr = array[i];
@@ -36,4 +35,4 @@ if (ASSERTIONS) {
     }
     return ret.join('');
   }
-}
+;

From 7e168bb85b2c3b7ac770c1ff01edcb8a1a727c1a Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Sat, 30 Sep 2017 11:37:11 -0700
Subject: [PATCH 68/78] skip wasm streaming for SINGLE_FILE (#5296)

---
 src/preamble.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/preamble.js b/src/preamble.js
index 4f924b403405..3314c12bf473 100644
--- a/src/preamble.js
+++ b/src/preamble.js
@@ -2314,7 +2314,7 @@ function integrateWasmJS() {
       });
     }
     // Prefer streaming instantiation if available.
-    if (!Module['wasmBinary'] && typeof WebAssembly.instantiateStreaming === 'function') {
+    if (!Module['wasmBinary'] && typeof WebAssembly.instantiateStreaming === 'function' && wasmBinaryFile.indexOf('data:') !== 0) {
       WebAssembly.instantiateStreaming(fetch(wasmBinaryFile, { credentials: 'same-origin' }), info)
         .then(receiveInstantiatedSource)
         .catch(function(reason) {

From 6fae984e37177789a62e32878df645ce585120b0 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Mon, 2 Oct 2017 16:30:13 -0700
Subject: [PATCH 69/78] s/request.response/response/ (#5296)

---
 src/postamble.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/postamble.js b/src/postamble.js
index 04a103109f3b..48e0b607611c 100644
--- a/src/postamble.js
+++ b/src/postamble.js
@@ -97,7 +97,7 @@ if (memoryInitializer) {
           }
 #endif
         }
-        applyMemoryInitializer(request.response);
+        applyMemoryInitializer(response);
       }
       if (Module['memoryInitializerRequest'].response) {
         setTimeout(useRequest, 0); // it's already here; but, apply it asynchronously

From 8e4be3eadac232b36a2199fcb2d2c4390dbe6b68 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Wed, 4 Oct 2017 17:28:45 -0700
Subject: [PATCH 70/78] test update (#5296)

---
 tests/test_other.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/test_other.py b/tests/test_other.py
index 884c34b5fcc0..6c95e6d03fd2 100644
--- a/tests/test_other.py
+++ b/tests/test_other.py
@@ -222,9 +222,9 @@ def test_emcc(self):
 
       # emcc -s INLINING_LIMIT=0 src.cpp ==> should pass -s to emscripten.py.
       for params, test, text in [
-        (['-O2'], lambda generated: 'function intArrayToString' in generated, 'shell has unminified utilities'),
-        (['-O2', '--closure', '1'], lambda generated: 'function intArrayToString' not in generated and ';function' in generated, 'closure minifies the shell, removes whitespace'),
-        (['-O2', '--closure', '1', '-g1'], lambda generated: 'function intArrayToString' not in generated and ';function' not in generated, 'closure minifies the shell, -g1 makes it keep whitespace'),
+        (['-O2'], lambda generated: 'function addRunDependency' in generated, 'shell has unminified utilities'),
+        (['-O2', '--closure', '1'], lambda generated: 'function addRunDependency' not in generated and ';function' in generated, 'closure minifies the shell, removes whitespace'),
+        (['-O2', '--closure', '1', '-g1'], lambda generated: 'function addRunDependency' not in generated and ';function' not in generated, 'closure minifies the shell, -g1 makes it keep whitespace'),
         (['-O2'], lambda generated: 'var b=0' in generated and not 'function _main' in generated, 'registerize/minify is run by default in -O2'),
         (['-O2', '--minify', '0'], lambda generated: 'var b = 0' in generated and not 'function _main' in generated, 'minify is cancelled, but not registerize'),
         (['-O2', '--js-opts', '0'], lambda generated: 'var b=0' not in generated and 'var b = 0' not in generated and 'function _main' in generated, 'js opts are cancelled'),

From f33363be1217a1fa60ddfbb51c7660e11b162128 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Sun, 8 Oct 2017 02:53:19 -0400
Subject: [PATCH 71/78] proxyClient temporary fix pending Python preprocessor
 support (#5296)

---
 src/proxyClient.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/proxyClient.js b/src/proxyClient.js
index 09865063ad85..93ae743e1253 100644
--- a/src/proxyClient.js
+++ b/src/proxyClient.js
@@ -95,20 +95,22 @@ var IDBStore = {{{ IDBStore.js }}};
 
 var frameId = 0;
 
+// Temporarily handling this at run-time pending Python preprocessor support
+
+var SUPPORT_BASE64_EMBEDDING;
+
 // Worker
 
 var filename = '{{{ filename }}}.js';
 
-#if SUPPORT_BASE64_EMBEDDING
 var workerURL = filename;
-var fileBytes = tryParseAsDataURI(filename);
-if (fileBytes) {
-  workerURL = URL.createObjectURL(new Blob([fileBytes], {type: 'application/javascript'}));
+if (SUPPORT_BASE64_EMBEDDING) {
+  var fileBytes = tryParseAsDataURI(filename);
+  if (fileBytes) {
+    workerURL = URL.createObjectURL(new Blob([fileBytes], {type: 'application/javascript'}));
+  }
 }
-var worker = new Worker(workerURL);
-#else
 var worker = new Worker(filename);
-#endif
 
 WebGLClient.prefetch();
 
@@ -130,9 +132,7 @@ worker.onmessage = function worker_onmessage(event) {
   if (!workerResponded) {
     workerResponded = true;
     if (Module.setStatus) Module.setStatus('');
-#if SUPPORT_BASE64_EMBEDDING
-    if (workerURL !== filename) URL.revokeObjectURL(workerURL);
-#endif
+    if (SUPPORT_BASE64_EMBEDDING && workerURL !== filename) URL.revokeObjectURL(workerURL);
   }
 
   var data = event.data;

From 50e58bdc400cfd4d83c82d16b05849e1d88bd4dc Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Tue, 10 Oct 2017 12:15:13 -0400
Subject: [PATCH 72/78] SINGLE_FILE + Closure test case (#5296)

---
 tests/test_other.py | 113 +++++++++++++++++++++++---------------------
 1 file changed, 58 insertions(+), 55 deletions(-)

diff --git a/tests/test_other.py b/tests/test_other.py
index 6c95e6d03fd2..c440540a6b23 100644
--- a/tests/test_other.py
+++ b/tests/test_other.py
@@ -7928,58 +7928,61 @@ def test_single_file(self):
         for debug_enabled in [True, False]:
           for emterpreter_enabled in [True, False]:
             for emterpreter_file_enabled in [True, False]:
-              for wasm_enabled in [True, False]:
-                for asmjs_fallback_enabled in [True, False]:
-                  # skip unhelpful option combinations
-                  if (
-                    (asmjs_fallback_enabled and not wasm_enabled) or
-                    (emterpreter_file_enabled and not emterpreter_enabled)
-                  ):
-                    continue
-
-                  expect_asmjs_code = asmjs_fallback_enabled and wasm_enabled
-                  expect_emterpretify_file = emterpreter_file_enabled
-                  expect_meminit = (meminit1_enabled and not wasm_enabled) or (wasm_enabled and asmjs_fallback_enabled)
-                  expect_success = not (emterpreter_file_enabled and single_file_enabled)
-                  expect_wasm = wasm_enabled
-                  expect_wast = debug_enabled and wasm_enabled
-
-                  # currently, the emterpreter always fails with JS output since we do not preload the emterpreter file, which in non-HTML we would need to do manually
-                  should_run_js = expect_success and not emterpreter_enabled
-
-                  cmd = [PYTHON, EMCC, path_from_root('tests', 'hello_world.c')]
-
-                  if single_file_enabled:
-                    expect_asmjs_code = False
-                    expect_emterpretify_file = False
-                    expect_meminit = False
-                    expect_wasm = False
-                    expect_wast = False
-                    cmd += ['-s', 'SINGLE_FILE=1']
-                  if meminit1_enabled:
-                    cmd += ['--memory-init-file', '1']
-                  if debug_enabled:
-                    cmd += ['-g']
-                  if emterpreter_enabled:
-                    cmd += ['-s', 'EMTERPRETIFY=1']
-                  if emterpreter_file_enabled:
-                    cmd += ['-s', "EMTERPRETIFY_FILE='a.out.dat'"]
-                  if wasm_enabled:
-                    method = 'interpret-binary'
-                    if asmjs_fallback_enabled:
-                      method += ',asmjs'
-                    cmd += ['-s', 'WASM=1', '-s', "BINARYEN_METHOD='" + method + "'"]
-
-                  print ' '.join(cmd)
-                  self.clear()
-                  proc = Popen(cmd, stdout=PIPE, stderr=PIPE)
-                  output, err = proc.communicate()
-                  print(os.listdir('.'))
-                  assert expect_success == (proc.returncode == 0)
-                  assert expect_asmjs_code == os.path.exists('a.out.asm.js')
-                  assert expect_emterpretify_file == os.path.exists('a.out.dat')
-                  assert expect_meminit == (os.path.exists('a.out.mem') or os.path.exists('a.out.js.mem'))
-                  assert expect_wasm == os.path.exists('a.out.wasm')
-                  assert expect_wast == os.path.exists('a.out.wast')
-                  if should_run_js:
-                    self.assertContained('hello, world!', run_js('a.out.js'))
+              for closure_enabled in [True, False]:
+                for wasm_enabled in [True, False]:
+                  for asmjs_fallback_enabled in [True, False]:
+                    # skip unhelpful option combinations
+                    if (
+                      (asmjs_fallback_enabled and not wasm_enabled) or
+                      (emterpreter_file_enabled and not emterpreter_enabled)
+                    ):
+                      continue
+
+                    expect_asmjs_code = asmjs_fallback_enabled and wasm_enabled
+                    expect_emterpretify_file = emterpreter_file_enabled
+                    expect_meminit = (meminit1_enabled and not wasm_enabled) or (wasm_enabled and asmjs_fallback_enabled)
+                    expect_success = not (emterpreter_file_enabled and single_file_enabled)
+                    expect_wasm = wasm_enabled
+                    expect_wast = debug_enabled and wasm_enabled
+
+                    # currently, the emterpreter always fails with JS output since we do not preload the emterpreter file, which in non-HTML we would need to do manually
+                    should_run_js = expect_success and not emterpreter_enabled
+
+                    cmd = [PYTHON, EMCC, path_from_root('tests', 'hello_world.c')]
+
+                    if single_file_enabled:
+                      expect_asmjs_code = False
+                      expect_emterpretify_file = False
+                      expect_meminit = False
+                      expect_wasm = False
+                      expect_wast = False
+                      cmd += ['-s', 'SINGLE_FILE=1']
+                    if meminit1_enabled:
+                      cmd += ['--memory-init-file', '1']
+                    if debug_enabled:
+                      cmd += ['-g']
+                    if emterpreter_enabled:
+                      cmd += ['-s', 'EMTERPRETIFY=1']
+                    if emterpreter_file_enabled:
+                      cmd += ['-s', "EMTERPRETIFY_FILE='a.out.dat'"]
+                    if closure_enabled:
+                      cmd += ['--closure', '1']
+                    if wasm_enabled:
+                      method = 'interpret-binary'
+                      if asmjs_fallback_enabled:
+                        method += ',asmjs'
+                      cmd += ['-s', 'WASM=1', '-s', "BINARYEN_METHOD='" + method + "'"]
+
+                    print ' '.join(cmd)
+                    self.clear()
+                    proc = Popen(cmd, stdout=PIPE, stderr=PIPE)
+                    output, err = proc.communicate()
+                    print(os.listdir('.'))
+                    assert expect_success == (proc.returncode == 0)
+                    assert expect_asmjs_code == os.path.exists('a.out.asm.js')
+                    assert expect_emterpretify_file == os.path.exists('a.out.dat')
+                    assert expect_meminit == (os.path.exists('a.out.mem') or os.path.exists('a.out.js.mem'))
+                    assert expect_wasm == os.path.exists('a.out.wasm')
+                    assert expect_wast == os.path.exists('a.out.wast')
+                    if should_run_js:
+                      self.assertContained('hello, world!', run_js('a.out.js'))

From 60fc52b015f002cb703722fe305a9f0d74cc3252 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Tue, 10 Oct 2017 12:15:24 -0400
Subject: [PATCH 73/78] remove unneeded function (#5296)

---
 src/base64Utils.js | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/src/base64Utils.js b/src/base64Utils.js
index a6b92c42dd2c..480c91b74624 100644
--- a/src/base64Utils.js
+++ b/src/base64Utils.js
@@ -8,36 +8,6 @@
 
 var keyStr = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
 
-var btoa = btoa || function (input) {
-  /**
-   * Encodes a string in base64
-   * @param {String} input The string to encode in base64.
-   */
-  var output = '';
-  var chr1, chr2, chr3;
-  var enc1, enc2, enc3, enc4;
-  var i = 0;
-  do {
-    chr1 = input.charCodeAt(i++);
-    chr2 = input.charCodeAt(i++);
-    chr3 = input.charCodeAt(i++);
-
-    enc1 = chr1 >> 2;
-    enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
-    enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
-    enc4 = chr3 & 63;
-
-    if (isNaN(chr2)) {
-      enc2 = ((chr1 & 3) << 4);
-      enc3 = enc4 = 64;
-    } else if (isNaN(chr3)) {
-      enc4 = 64;
-    }
-    output = output + keyStr.charAt(enc1) + keyStr.charAt(enc2) + keyStr.charAt(enc3) + keyStr.charAt(enc4);
-  } while (i < input.length);
-  return output;
-};
-
 var atob = atob || function (input) {
   /**
    * Decodes a base64 string.

From eae3ed5eec97ec86fa6181419e32d94780d921b2 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Tue, 10 Oct 2017 12:15:43 -0400
Subject: [PATCH 74/78] print arrayUtils/base64Utils earlier (via
 @erikdubbelboer) (#5296)

---
 src/jsifier.js | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/jsifier.js b/src/jsifier.js
index ccefcc1cfec5..4166791b7d34 100644
--- a/src/jsifier.js
+++ b/src/jsifier.js
@@ -522,6 +522,18 @@ function JSify(data, functionsOnly) {
       print('assert(STACK_MAX < SPLIT_MEMORY, "SPLIT_MEMORY size must be big enough so the entire static memory + stack can fit in one chunk, need " + STACK_MAX);\n');
     }
 
+    print(preprocess(read('arrayUtils.js')));
+    // Export all arrayUtils.js functions
+    print(maybeExport('intArrayFromString'));
+    print(maybeExport('intArrayToString'));
+
+    if (SUPPORT_BASE64_EMBEDDING) {
+      print(preprocess(read('base64Utils.js')));
+      // Export all base64Utils.js functions
+      print(maybeExport('intArrayFromBase64'));
+      print(maybeExport('tryParseAsDataURI'));
+    }
+
     if (asmLibraryFunctions.length > 0) {
       print('// ASM_LIBRARY FUNCTIONS');
       function fix(f) { // fix indenting to not confuse js optimizer
@@ -541,17 +553,6 @@ function JSify(data, functionsOnly) {
 
     if (ASSERTIONS) print('var ASSERTIONS = true;\n');
 
-    print(preprocess(read('arrayUtils.js')));
-    // Export all arrayUtils.js functions
-    print(maybeExport('intArrayFromString'));
-    print(maybeExport('intArrayToString'));
-
-    if (SUPPORT_BASE64_EMBEDDING) {
-      print(preprocess(read('base64Utils.js')));
-      // Export all base64Utils.js functions
-      print(maybeExport('intArrayFromBase64'));
-      print(maybeExport('tryParseAsDataURI'));
-    }
     if (HEADLESS) {
       print('if (!ENVIRONMENT_IS_WEB) {');
       print(read('headlessCanvas.js'));

From e8fd9e99c83450a97e49fe87f33cbcbf556d9248 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Tue, 10 Oct 2017 12:50:19 -0400
Subject: [PATCH 75/78] regression test for atob fallback issue (#5296)

---
 tests/test_browser.py | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/tests/test_browser.py b/tests/test_browser.py
index 46909d6302e3..387c3493d35c 100644
--- a/tests/test_browser.py
+++ b/tests/test_browser.py
@@ -3655,3 +3655,31 @@ def test_load_js_from_blob_with_pthreads(self):
     Popen([PYTHON, EMCC, 'src.c', '-s', 'USE_PTHREADS=1', '-o', 'hello_thread_with_blob_url.js']).communicate()
     shutil.copyfile(path_from_root('tests', 'pthread', 'main_js_as_blob_loader.html'), os.path.join(self.get_dir(), 'hello_thread_with_blob_url.html'))
     self.run_browser('hello_thread_with_blob_url.html', 'hello from thread!', '/report_result?1')
+
+  # Tests that base64 utils work in browser with no native atob function
+  def test_base64_atob_fallback(self):
+    opts = ['-s', 'SINGLE_FILE=1', '-s', 'WASM=1', '-s', "BINARYEN_METHOD='interpret-binary'"]
+    src = r'''
+      #include <stdio.h>
+      #include <emscripten.h>
+      int main() {
+        REPORT_RESULT(0);
+        return 0;
+      }
+    '''
+    open('test.c', 'w').write(self.with_report_result(src))
+    # generate a dummy file
+    open('dummy_file', 'w').write('dummy')
+    # compile the code with the modularize feature and the preload-file option enabled
+    Popen([PYTHON, EMCC, 'test.c', '-s', 'MODULARIZE=1', '-s', 'EXPORT_NAME="Foo"', '--preload-file', 'dummy_file'] + opts).communicate()
+    open('a.html', 'w').write('''
+      <script>
+        atob = undefined;
+        fetch = undefined;
+      </script>
+      <script src="a.out.js"></script>
+      <script>
+        var foo = Foo();
+      </script>
+    ''')
+    self.run_browser('a.html', '...', '/report_result?0')

From f98d511a96f533d4414d5bafa6028a3eb7046e75 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Wed, 11 Oct 2017 20:54:01 -0400
Subject: [PATCH 76/78] HTML generation fix (#5296)

---
 emcc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emcc.py b/emcc.py
index cfa104a85140..bac9e4a66fcb 100755
--- a/emcc.py
+++ b/emcc.py
@@ -2566,7 +2566,7 @@ def generate_html(target, options, js_target, target_basename,
   if script.inline:
     for file in ['src/arrayUtils.js', 'src/base64Utils.js']:
       f = open(shared.path_from_root(file), 'r')
-      script.inline = '(function () {' + script.inline + f.read() + '})();'
+      script.inline = f.read() + script.inline
       f.close()
 
   html = open(target, 'wb')

From 42992efa8832b5e475b78f319bf250ea79371319 Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Thu, 12 Oct 2017 19:00:57 -0400
Subject: [PATCH 77/78] atob function scope fix (#5296)

---
 src/base64Utils.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/base64Utils.js b/src/base64Utils.js
index 480c91b74624..8d8b04e7b701 100644
--- a/src/base64Utils.js
+++ b/src/base64Utils.js
@@ -8,7 +8,7 @@
 
 var keyStr = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
 
-var atob = atob || function (input) {
+var decodeBase64 = typeof atob === 'function' ? atob : function (input) {
   /**
    * Decodes a base64 string.
    * @param {String} input The string to decode.
@@ -55,7 +55,7 @@ function intArrayFromBase64(s) {
   }
 
   try {
-    var decoded = atob(s);
+    var decoded = decodeBase64(s);
     var bytes = new Uint8Array(decoded.length);
     for (var i = 0 ; i < decoded.length ; ++i) {
       bytes[i] = decoded.charCodeAt(i);

From 8e45599a58598cb9e3038e19185431a5a4dfb81f Mon Sep 17 00:00:00 2001
From: Ryan Lester <hacker@linux.com>
Date: Fri, 13 Oct 2017 15:12:55 -0400
Subject: [PATCH 78/78] asm.js synchronous init fix (#5296)

---
 src/postamble.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/postamble.js b/src/postamble.js
index 48e0b607611c..ce813ed5b9de 100644
--- a/src/postamble.js
+++ b/src/postamble.js
@@ -65,16 +65,15 @@ if (memoryInitializer) {
     }
     function doBrowserLoad() {
       Module['readAsync'](memoryInitializer, applyMemoryInitializer, function() {
-#if SUPPORT_BASE64_EMBEDDING
-        var memoryInitializerBytes = tryParseAsDataURI(memoryInitializer);
-        if (memoryInitializerBytes) {
-          applyMemoryInitializer(memoryInitializerBytes.buffer);
-          return;
-        }
-#endif
         throw 'could not load memory initializer ' + memoryInitializer;
       });
     }
+#if SUPPORT_BASE64_EMBEDDING
+    var memoryInitializerBytes = tryParseAsDataURI(memoryInitializer);
+    if (memoryInitializerBytes) {
+      applyMemoryInitializer(memoryInitializerBytes.buffer);
+    } else
+#endif
     if (Module['memoryInitializerRequest']) {
       // a network request has already been created, just use that
       function useRequest() {