From 291e8d80cb05fd072e60f7928d2862c6f612e56a Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@signal.org>
Date: Wed, 13 Feb 2019 11:56:08 -0800
Subject: [PATCH] Fix asm.js errors in emscripten-generated functions

---
 js/libsignal-protocol-worker.js     | 14 +++++++-------
 libtextsecure/libsignal-protocol.js | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/js/libsignal-protocol-worker.js b/js/libsignal-protocol-worker.js
index 20679574cb..07023b6143 100644
--- a/js/libsignal-protocol-worker.js
+++ b/js/libsignal-protocol-worker.js
@@ -646,11 +646,11 @@ function allocate(slab, types, allocator, ptr) {
     assert((ret & 3) == 0);
     stop = ret + (size & ~3);
     for (; ptr < stop; ptr += 4) {
-      HEAP32[((ptr)>>2)]=0;
+      HEAP32[ptr>>2]=0;
     }
     stop = ret + size;
     while (ptr < stop) {
-      HEAP8[((ptr++)>>0)]=0;
+      HEAP8[ptr++>>0]=0;
     }
     return ret;
   }
@@ -22848,12 +22848,12 @@ function _memset(ptr, value, num) {
         }
       }
       while ((ptr|0) < (stop4|0)) {
-        HEAP32[((ptr)>>2)]=value4;
+        HEAP32[ptr>>2]=value4;
         ptr = (ptr+4)|0;
       }
     }
     while ((ptr|0) < (stop|0)) {
-      HEAP8[((ptr)>>0)]=value;
+      HEAP8[ptr>>0]=value;
       ptr = (ptr+1)|0;
     }
     return (ptr-num)|0;
@@ -22898,20 +22898,20 @@ function _memcpy(dest, src, num) {
     if ((dest&3) == (src&3)) {
       while (dest & 3) {
         if ((num|0) == 0) return ret|0;
-        HEAP8[((dest)>>0)]=((HEAP8[((src)>>0)])|0);
+        HEAP8[dest>>0]=((HEAP8[src>>0])|0);
         dest = (dest+1)|0;
         src = (src+1)|0;
         num = (num-1)|0;
       }
       while ((num|0) >= 4) {
-        HEAP32[((dest)>>2)]=((HEAP32[((src)>>2)])|0);
+        HEAP32[dest>>2]=((HEAP32[src>>2])|0);
         dest = (dest+4)|0;
         src = (src+4)|0;
         num = (num-4)|0;
       }
     }
     while ((num|0) > 0) {
-      HEAP8[((dest)>>0)]=((HEAP8[((src)>>0)])|0);
+      HEAP8[dest>>0]=((HEAP8[src>>0])|0);
       dest = (dest+1)|0;
       src = (src+1)|0;
       num = (num-1)|0;
diff --git a/libtextsecure/libsignal-protocol.js b/libtextsecure/libsignal-protocol.js
index b5eb93b3e3..ac4c28b5a0 100644
--- a/libtextsecure/libsignal-protocol.js
+++ b/libtextsecure/libsignal-protocol.js
@@ -646,11 +646,11 @@ function allocate(slab, types, allocator, ptr) {
     assert((ret & 3) == 0);
     stop = ret + (size & ~3);
     for (; ptr < stop; ptr += 4) {
-      HEAP32[((ptr)>>2)]=0;
+      HEAP32[ptr>>2]=0;
     }
     stop = ret + size;
     while (ptr < stop) {
-      HEAP8[((ptr++)>>0)]=0;
+      HEAP8[ptr++>>0]=0;
     }
     return ret;
   }
@@ -22848,12 +22848,12 @@ function _memset(ptr, value, num) {
         }
       }
       while ((ptr|0) < (stop4|0)) {
-        HEAP32[((ptr)>>2)]=value4;
+        HEAP32[ptr>>2]=value4;
         ptr = (ptr+4)|0;
       }
     }
     while ((ptr|0) < (stop|0)) {
-      HEAP8[((ptr)>>0)]=value;
+      HEAP8[ptr>>0]=value;
       ptr = (ptr+1)|0;
     }
     return (ptr-num)|0;
@@ -22898,20 +22898,20 @@ function _memcpy(dest, src, num) {
     if ((dest&3) == (src&3)) {
       while (dest & 3) {
         if ((num|0) == 0) return ret|0;
-        HEAP8[((dest)>>0)]=((HEAP8[((src)>>0)])|0);
+        HEAP8[dest>>0]=((HEAP8[src>>0])|0);
         dest = (dest+1)|0;
         src = (src+1)|0;
         num = (num-1)|0;
       }
       while ((num|0) >= 4) {
-        HEAP32[((dest)>>2)]=((HEAP32[((src)>>2)])|0);
+        HEAP32[dest>>2]=((HEAP32[src>>2])|0);
         dest = (dest+4)|0;
         src = (src+4)|0;
         num = (num-4)|0;
       }
     }
     while ((num|0) > 0) {
-      HEAP8[((dest)>>0)]=((HEAP8[((src)>>0)])|0);
+      HEAP8[dest>>0]=((HEAP8[src>>0])|0);
       dest = (dest+1)|0;
       src = (src+1)|0;
       num = (num-1)|0;