From a08248092e3b23dde2c83cda70e22fe7e9c90f02 Mon Sep 17 00:00:00 2001
From: Nazar Mokrynskyi <nazar@mokrynskyi.com>
Date: Wed, 8 Nov 2017 23:33:47 +0200
Subject: [PATCH 1/2] Fix for undefined `ASSERTIONS` variable in html output of
 emcc

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

diff --git a/emcc.py b/emcc.py
index 1386d857a3cad..be33657e9ddeb 100755
--- a/emcc.py
+++ b/emcc.py
@@ -2574,6 +2574,8 @@ def generate_html(target, options, js_target, target_basename,
       script.inline = f.read() + script.inline
       f.close()
 
+    script.inline = 'var ASSERTIONS = %s;\n%s' % (shared.Settings.ASSERTIONS, script.inline)
+
   # inline script for SINGLE_FILE output
   if shared.Settings.SINGLE_FILE:
     js_contents = script.inline or ''
diff --git a/src/arrayUtils.js b/src/arrayUtils.js
index b4c1d02518e2b..24a857251d16f 100644
--- a/src/arrayUtils.js
+++ b/src/arrayUtils.js
@@ -9,7 +9,6 @@ function intArrayFromString(stringy, dontAddNull, length) {
   return u8array;
 }
 
-// Temporarily duplicating function pending Python preprocessor support
 var intArrayToString = ASSERTIONS ?
   function (array) {
     var ret = [];

From 1f862d30787ca13302fde88b6e300c781584721d Mon Sep 17 00:00:00 2001
From: Nazar Mokrynskyi <nazar@mokrynskyi.com>
Date: Thu, 9 Nov 2017 00:51:49 +0200
Subject: [PATCH 2/2] Simplify `intArrayToString` even further

---
 src/arrayUtils.js | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/src/arrayUtils.js b/src/arrayUtils.js
index 24a857251d16f..4568c4228b34d 100644
--- a/src/arrayUtils.js
+++ b/src/arrayUtils.js
@@ -9,28 +9,17 @@ function intArrayFromString(stringy, dontAddNull, length) {
   return u8array;
 }
 
-var intArrayToString = ASSERTIONS ?
-  function (array) {
-    var ret = [];
-    for (var i = 0; i < array.length; i++) {
-      var chr = array[i];
-      if (chr > 0xFF) {
+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.');
-        chr &= 0xFF;
       }
-      ret.push(String.fromCharCode(chr));
+      chr &= 0xFF;
     }
-    return ret.join('');
-  } :
-  function (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('');
+    ret.push(String.fromCharCode(chr));
   }
-;
+  return ret.join('');
+}