From 6508d1a0c76d11fbab4cac3259701a4b3dcf3c96 Mon Sep 17 00:00:00 2001
From: Jake B <doogie1012@gmail.com>
Date: Sun, 2 Sep 2018 14:17:29 +1000
Subject: [PATCH] misc/wasm: change "var" to "let", "const", add missing
 semicolons, place polyfill before wasm_exec.js to fix crashing in Edge

Fixes #27295
---
 misc/wasm/wasm_exec.html | 47 ++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 23 deletions(-)
diff --git a/misc/wasm/wasm_exec.html b/misc/wasm/wasm_exec.html
index 0129aa4ddd509e..84b02fd80a085f 100644
--- a/misc/wasm/wasm_exec.html
+++ b/misc/wasm/wasm_exec.html
@@ -12,27 +12,19 @@
 </head>
 
 <body>
-	<script src="wasm_exec.js"></script>
 	<script>
-		if (!WebAssembly.instantiateStreaming) { // polyfill
-			WebAssembly.instantiateStreaming = async (resp, importObject) => {
-				const source = await (await resp).arrayBuffer();
-				return await WebAssembly.instantiate(source, importObject);
-			};
-		}
-
 		// Add polyfill for TextEncoder and TextDecoder for Microsoft Edge 17/18 support
 		// https://caniuse.com/#feat=textencoder
 		if (!window.TextEncoder) {
-			TextEncoder = function(){}
+			window.TextEncoder = function(){}
 			TextEncoder.prototype.encode = function (string) {
-				var octets = [];
-				var length = string.length;
-				var i = 0;
+				const octets = [];
+				const length = string.length;
+				let i = 0;
 				while (i < length) {
-					var codePoint = string.codePointAt(i);
-					var c = 0;
-					var bits = 0;
+					let codePoint = string.codePointAt(i);
+					let c = 0;
+					let bits = 0;
 					if (codePoint <= 0x0000007F) {
 						c = 0;
 						bits = 0x00;
@@ -58,14 +50,14 @@
 			};
 		}
 		if (!window.TextDecoder) {
-			TextDecoder = function(){}
+			window.TextDecoder = function(){}
 			TextDecoder.prototype.decode = function (octets) {
-				var string = "";
-				var i = 0;
+				let string = "";
+				let i = 0;
 				while (i < octets.length) {
-					var octet = octets[i];
-					var bytesNeeded = 0;
-					var codePoint = 0;
+					const octet = octets[i];
+					let bytesNeeded = 0;
+					let codePoint = 0;
 					if (octet <= 0x7F) {
 						bytesNeeded = 0;
 						codePoint = octet & 0xFF;
@@ -80,7 +72,7 @@
 						codePoint = octet & 0x07;
 					}
 					if (octets.length - i - bytesNeeded > 0) {
-						var k = 0;
+						let k = 0;
 						while (k < bytesNeeded) {
 							octet = octets[i + k + 1];
 							codePoint = (codePoint << 6) | (octet & 0x3F);
@@ -93,7 +85,16 @@
 					string += String.fromCodePoint(codePoint);
 					i += bytesNeeded + 1;
 				}
-				return string
+				return string;
+			};
+		}
+	</script>
+	<script src="wasm_exec.js"></script>
+	<script>
+		if (!WebAssembly.instantiateStreaming) { // polyfill
+			WebAssembly.instantiateStreaming = async (resp, importObject) => {
+				const source = await (await resp).arrayBuffer();
+				return await WebAssembly.instantiate(source, importObject);
 			};
 		}
 
