Stop emitting "almost asm" in wasm2js output

src/asmjs/shared-constants.cpp

@@ -63,8 +63,6 @@ cashew::IString SQRT("sqrt");
 cashew::IString POW("pow");
 cashew::IString I32_TEMP("asm2wasm_i32_temp");
 cashew::IString DEBUGGER("debugger");
-cashew::IString USE_ASM("use asm");
-cashew::IString ALMOST_ASM("almost asm");
 cashew::IString BUFFER("buffer");
 cashew::IString ENV("env");
 cashew::IString STACKTOP("STACKTOP");

src/asmjs/shared-constants.h

@@ -66,8 +66,6 @@ extern cashew::IString SQRT;
 extern cashew::IString POW;
 extern cashew::IString I32_TEMP;
 extern cashew::IString DEBUGGER;
-extern cashew::IString USE_ASM;
-extern cashew::IString ALMOST_ASM;
 extern cashew::IString BUFFER;
 extern cashew::IString ENV;
 extern cashew::IString STACKTOP;

src/wasm2js.h

@@ -343,8 +343,6 @@ Ref Wasm2JSBuilder::processWasm(Module* wasm, Name funcName) {
   ValueBuilder::appendArgumentToFunction(asmFunc, GLOBAL);
   ValueBuilder::appendArgumentToFunction(asmFunc, ENV);
   ValueBuilder::appendArgumentToFunction(asmFunc, BUFFER);
-  asmFunc[3]->push_back(
-    ValueBuilder::makeStatement(ValueBuilder::makeString(ALMOST_ASM)));
   // add memory import
   if (wasm->memory.exists && wasm->memory.imported()) {
     Ref theVar = ValueBuilder::makeVar();

test/binaryen.js/emit_asmjs.js.txt

@@ -1,6 +1,5 @@
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);

test/wasm2js.asserts.js

@@ -31,7 +31,6 @@
     }
 
 function asmFunc0(global, env, buffer) {
- "almost asm";
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);

test/wasm2js.traps.js

@@ -31,7 +31,6 @@
     }
 
 function asmFunc0(global, env, buffer) {
- "almost asm";
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);

test/wasm2js/address.2asm.js

@@ -1,7 +1,6 @@
 import { print } from 'spectest';
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);

test/wasm2js/base64.2asm.js

@@ -1,6 +1,5 @@
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);

test/wasm2js/base64.2asm.js.opt

@@ -1,6 +1,5 @@
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);

test/wasm2js/block.2asm.js

@@ -1,6 +1,5 @@
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);

test/wasm2js/br.2asm.js

@@ -1,7 +1,6 @@
 import { setTempRet0 } from 'env';
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);
@@ -766,7 +765,6 @@ export var nested_br_table_value = retasmFunc.nested_br_table_value;
 export var nested_br_table_value_index = retasmFunc.nested_br_table_value_index;
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);

test/wasm2js/br_if.2asm.js

@@ -1,6 +1,5 @@
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);

test/wasm2js/br_table.2asm.js

@@ -1,7 +1,6 @@
 import { setTempRet0 } from 'env';
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);

test/wasm2js/br_table_hoisting.2asm.js

@@ -1,6 +1,5 @@
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);

test/wasm2js/br_table_hoisting.2asm.js.opt

@@ -1,6 +1,5 @@
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);

test/wasm2js/br_table_temp.2asm.js

@@ -1,6 +1,5 @@
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);

test/wasm2js/br_table_temp.2asm.js.opt

@@ -1,6 +1,5 @@
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);

test/wasm2js/br_table_to_loop.2asm.js

@@ -1,6 +1,5 @@
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);

test/wasm2js/br_table_to_loop.2asm.js.opt

@@ -1,6 +1,5 @@
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);

test/wasm2js/break-drop.2asm.js

@@ -1,6 +1,5 @@
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);

test/wasm2js/call.2asm.js

@@ -1,7 +1,6 @@
 import { setTempRet0 } from 'env';
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);

test/wasm2js/call_indirect.2asm.js

@@ -1,7 +1,6 @@
 import { setTempRet0 } from 'env';
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);

test/wasm2js/comments.2asm.js

@@ -1,6 +1,5 @@
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);
@@ -31,7 +30,6 @@ var memasmFunc = new ArrayBuffer(65536);
 var retasmFunc = asmFunc({Math,Int8Array,Uint8Array,Int16Array,Uint16Array,Int32Array,Uint32Array,Float32Array,Float64Array,NaN,Infinity}, {abort:function() { throw new Error('abort'); }},memasmFunc);
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);

test/wasm2js/conversions-modified.2asm.js

@@ -31,7 +31,6 @@ import { setTempRet0 } from 'env';
   }
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);

test/wasm2js/conversions-modified.2asm.js.opt

@@ -31,7 +31,6 @@ import { setTempRet0 } from 'env';
   }
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);

test/wasm2js/dynamicLibrary.2asm.js

@@ -2,7 +2,6 @@ import { memoryBase } from 'env';
 import { tableBase } from 'env';
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var memory = env.memory;
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);

test/wasm2js/dynamicLibrary.2asm.js.opt

@@ -2,7 +2,6 @@ import { memoryBase } from 'env';
 import { tableBase } from 'env';
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var memory = env.memory;
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);

test/wasm2js/empty_table.2asm.js

@@ -1,6 +1,5 @@
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);

test/wasm2js/emscripten-grow-no.2asm.js

@@ -1,7 +1,6 @@
 function instantiate(asmLibraryArg, wasmMemory, wasmTable) {
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var memory = env.memory;
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);

test/wasm2js/emscripten-grow-no.2asm.js.opt

@@ -1,7 +1,6 @@
 function instantiate(asmLibraryArg, wasmMemory, wasmTable) {
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var memory = env.memory;
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);

test/wasm2js/emscripten-grow-yes.2asm.js

@@ -1,7 +1,6 @@
 function instantiate(asmLibraryArg, wasmMemory, wasmTable) {
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var memory = env.memory;
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);

test/wasm2js/emscripten-grow-yes.2asm.js.opt

@@ -1,7 +1,6 @@
 function instantiate(asmLibraryArg, wasmMemory, wasmTable) {
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var memory = env.memory;
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);

test/wasm2js/emscripten.2asm.js

@@ -1,7 +1,6 @@
 function instantiate(asmLibraryArg, wasmMemory, wasmTable) {
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var memory = env.memory;
  var FUNCTION_TABLE = wasmTable;
  var HEAP8 = new global.Int8Array(buffer);

test/wasm2js/emscripten.2asm.js.opt

@@ -1,7 +1,6 @@
 function instantiate(asmLibraryArg, wasmMemory, wasmTable) {
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var memory = env.memory;
  var FUNCTION_TABLE = wasmTable;
  var HEAP8 = new global.Int8Array(buffer);

test/wasm2js/endianness.2asm.js

@@ -31,7 +31,6 @@ import { setTempRet0 } from 'env';
   }
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);

test/wasm2js/f32.2asm.js

@@ -22,7 +22,6 @@
   }
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);

test/wasm2js/f32_cmp.2asm.js

@@ -1,6 +1,5 @@
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);

test/wasm2js/f64.2asm.js

@@ -22,7 +22,6 @@
   }
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);

test/wasm2js/f64_cmp.2asm.js

@@ -1,6 +1,5 @@
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);

test/wasm2js/fac.2asm.js

@@ -1,7 +1,6 @@
 import { setTempRet0 } from 'env';
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);

test/wasm2js/float-ops.2asm.js

@@ -1,6 +1,5 @@
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);

test/wasm2js/float-ops.2asm.js.opt

@@ -1,6 +1,5 @@
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);

test/wasm2js/float_literals-modified.2asm.js

@@ -19,7 +19,6 @@ import { setTempRet0 } from 'env';
   }
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);

test/wasm2js/float_literals-modified.2asm.js.opt

@@ -15,7 +15,6 @@ import { setTempRet0 } from 'env';
   }
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);

test/wasm2js/float_misc.2asm.js

@@ -30,7 +30,6 @@
   }
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);

test/wasm2js/forward.2asm.js

@@ -1,6 +1,5 @@
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);

test/wasm2js/func-ptr-offset.2asm.js

@@ -1,6 +1,5 @@
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);

test/wasm2js/func-ptr-offset.2asm.js.opt

@@ -1,6 +1,5 @@
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);

test/wasm2js/func.2asm.js

@@ -1,7 +1,6 @@
 import { setTempRet0 } from 'env';
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);