Turn on wasm flags all the time, add a reference from wasm functions to the module.

src/compiler/wasm-compiler.cc

Index: src/compiler/wasm-compiler.cc
diff --git a/src/compiler/wasm-compiler.cc b/src/compiler/wasm-compiler.cc
index 41e524dda6b77f8725917833897022f4fcf2f7e5..36984289473929b6b5861bb19fb3d685f347ef09 100644
--- a/src/compiler/wasm-compiler.cc
+++ b/src/compiler/wasm-compiler.cc
@@ -2,6 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "src/compiler/wasm-compiler.h"
+
+#include "src/isolate-inl.h"
+
+#include "src/base/platform/platform.h"
 
 #include "src/compiler/access-builder.h"
 #include "src/compiler/change-lowering.h"
@@ -21,7 +26,6 @@
 #include "src/compiler/simplified-operator.h"
 #include "src/compiler/source-position.h"
 #include "src/compiler/typer.h"
-#include "src/compiler/wasm-compiler.h"
 
 #include "src/code-factory.h"
 #include "src/code-stubs.h"
@@ -340,7 +344,8 @@ Node* WasmGraphBuilder::Merge(unsigned count, Node** controls) {
 Node* WasmGraphBuilder::Phi(wasm::LocalType type, unsigned count, Node** vals,
                             Node* control) {
   DCHECK(IrOpcode::IsMergeOpcode(control->opcode()));
-  Node** buf = Realloc(vals, count + 1);
+  Node** buf = Realloc(vals, count);
+  buf = Realloc(buf, count + 1);
   buf[count] = control;
   return graph()->NewNode(jsgraph()->common()->Phi(type, count), count + 1,
                           buf);
@@ -350,7 +355,8 @@ Node* WasmGraphBuilder::Phi(wasm::LocalType type, unsigned count, Node** vals,
 Node* WasmGraphBuilder::EffectPhi(unsigned count, Node** effects,
                                   Node* control) {
   DCHECK(IrOpcode::IsMergeOpcode(control->opcode()));
-  Node** buf = Realloc(effects, count + 1);
+  Node** buf = Realloc(effects, count);
+  buf = Realloc(buf, count + 1);
   buf[count] = control;
   return graph()->NewNode(jsgraph()->common()->EffectPhi(count), count + 1,
                           buf);
@@ -959,7 +965,8 @@ Node* WasmGraphBuilder::Return(unsigned count, Node** vals) {
     count = 1;
   }
 
-  Node** buf = Realloc(vals, count + 2);
+  Node** buf = Realloc(vals, count);
+  buf = Realloc(buf, count + 2);
   buf[count] = *effect_;
   buf[count + 1] = *control_;
   Node* ret = graph()->NewNode(jsgraph()->common()->Return(), count + 2, vals);
@@ -1624,7 +1631,8 @@ void WasmGraphBuilder::BoundsCheckMem(MachineType memtype, Node* index,
   ptrdiff_t size = module_->mem_end - module_->mem_start;
   byte memsize = wasm::WasmOpcodes::MemSize(memtype);
   Node* cond;
-  if (offset >= size || (offset + memsize) > size) {
+  if (static_cast<ptrdiff_t>(offset) >= size ||
+      static_cast<ptrdiff_t>(offset + memsize) > size) {
     // The access will always throw.
     cond = jsgraph()->Int32Constant(0);
   } else {
@@ -1713,11 +1721,9 @@ Node* WasmGraphBuilder::String(const char* string) {
 Graph* WasmGraphBuilder::graph() { return jsgraph()->graph(); }
 
 
-Handle<JSFunction> CompileJSToWasmWrapper(Isolate* isolate,
-                                          wasm::ModuleEnv* module,
-                                          Handle<String> name,
-                                          Handle<Code> wasm_code,
-                                          uint32_t index) {
+Handle<JSFunction> CompileJSToWasmWrapper(
+    Isolate* isolate, wasm::ModuleEnv* module, Handle<String> name,
+    Handle<Code> wasm_code, Handle<JSObject> module_object, uint32_t index) {
   wasm::WasmFunction* func = &module->module->functions->at(index);
 
   //----------------------------------------------------------------------------
@@ -1728,7 +1734,9 @@ Handle<JSFunction> CompileJSToWasmWrapper(Isolate* isolate,
   int params = static_cast<int>(func->sig->parameter_count());
   shared->set_length(params);
   shared->set_internal_formal_parameter_count(1 + params);
-  Handle<JSFunction> function = isolate->factory()->NewFunction(name);
+  Handle<JSFunction> function = isolate->factory()->NewFunction(
+      isolate->wasm_function_map(), name, MaybeHandle<Code>());
+  function->SetInternalField(0, *module_object);
   function->set_shared(*shared);
 
   //----------------------------------------------------------------------------
@@ -1788,17 +1796,15 @@ Handle<JSFunction> CompileJSToWasmWrapper(Isolate* isolate,
 #ifdef ENABLE_DISASSEMBLER
     // Disassemble the wrapper code for debugging.
     if (!code.is_null() && FLAG_print_opt_code) {
-      static const int kBufferSize = 128;
-      char buffer[kBufferSize];
+      Vector<char> buffer;
       const char* name = "";
       if (func->name_offset > 0) {
         const byte* ptr = module->module->module_start + func->name_offset;
         name = reinterpret_cast<const char*>(ptr);
       }
-      snprintf(buffer, kBufferSize, "JS->WASM function wrapper #%d:%s", index,
-               name);
+      SNPrintF(buffer, "JS->WASM function wrapper #%d:%s", index, name);
       OFStream os(stdout);
-      code->Disassemble(buffer, os);
+      code->Disassemble(buffer.start(), os);
     }
 #endif
     // Set the JSFunction's machine code.
@@ -1864,17 +1870,15 @@ Handle<Code> CompileWasmToJSWrapper(Isolate* isolate, wasm::ModuleEnv* module,
 #ifdef ENABLE_DISASSEMBLER
     // Disassemble the wrapper code for debugging.
     if (!code.is_null() && FLAG_print_opt_code) {
-      static const int kBufferSize = 128;
-      char buffer[kBufferSize];
+      Vector<char> buffer;
       const char* name = "";
       if (func->name_offset > 0) {
         const byte* ptr = module->module->module_start + func->name_offset;
         name = reinterpret_cast<const char*>(ptr);
       }
-      snprintf(buffer, kBufferSize, "WASM->JS function wrapper #%d:%s", index,
-               name);
+      SNPrintF(buffer, "WASM->JS function wrapper #%d:%s", index, name);
       OFStream os(stdout);
-      code->Disassemble(buffer, os);
+      code->Disassemble(buffer.start(), os);
     }
 #endif
   }
@@ -1927,11 +1931,10 @@ Handle<Code> CompileWasmFunction(wasm::ErrorThrower& thrower, Isolate* isolate,
       os << "Compilation failed: " << result << std::endl;
     }
     // Add the function as another context for the exception
-    const int kBufSize = 256;
-    char buffer[kBufSize];
-    snprintf(buffer, kBufSize, "Compiling WASM function #%d:%s failed:", index,
+    Vector<char> buffer;
+    SNPrintF(buffer, "Compiling WASM function #%d:%s failed:", index,
              module_env->module->GetName(function.name_offset));
-    thrower.Failed(buffer, result);
+    thrower.Failed(buffer.start(), result);
     return Handle<Code>::null();
   }
 
@@ -1946,16 +1949,15 @@ Handle<Code> CompileWasmFunction(wasm::ErrorThrower& thrower, Isolate* isolate,
 #ifdef ENABLE_DISASSEMBLER
   // Disassemble the code for debugging.
   if (!code.is_null() && FLAG_print_opt_code) {
-    static const int kBufferSize = 128;
-    char buffer[kBufferSize];
+    Vector<char> buffer;
     const char* name = "";
     if (function.name_offset > 0) {
       const byte* ptr = module_env->module->module_start + function.name_offset;
       name = reinterpret_cast<const char*>(ptr);
     }
-    snprintf(buffer, kBufferSize, "WASM function #%d:%s", index, name);
+    SNPrintF(buffer, "WASM function #%d:%s", index, name);
     OFStream os(stdout);
-    code->Disassemble(buffer, os);
+    code->Disassemble(buffer.start(), os);
   }
 #endif
   return code;