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

src/compiler/wasm-compiler.cc

 // Copyright 2015 the V8 project authors. All rights reserved.
 // 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"
 #include "src/compiler/common-operator.h"
 #include "src/compiler/diamond.h"
 #include "src/compiler/graph.h"
 #include "src/compiler/graph-visualizer.h"
 #include "src/compiler/instruction-selector.h"
 #include "src/compiler/js-generic-lowering.h"
 #include "src/compiler/js-graph.h"
 #include "src/compiler/js-operator.h"
 #include "src/compiler/linkage.h"
 #include "src/compiler/machine-operator.h"
 #include "src/compiler/node-matchers.h"
 #include "src/compiler/pipeline.h"
 #include "src/compiler/simplified-lowering.h"
 #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"
 
 #include "src/wasm/ast-decoder.h"
 #include "src/wasm/wasm-module.h"
 #include "src/wasm/wasm-opcodes.h"
 
 // TODO(titzer): pull WASM_64 up to a common header.
 #if !V8_TARGET_ARCH_32_BIT || V8_TARGET_ARCH_X64
@@ skipping 298 matching lines @@
 
 
 Node* WasmGraphBuilder::Merge(unsigned count, Node** controls) {
   return graph()->NewNode(jsgraph()->common()->Merge(count), count, 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);
 }
 
 
 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);
 }
 
 
 Node* WasmGraphBuilder::Int32Constant(int32_t value) {
   return jsgraph()->Int32Constant(value);
 }
 
@@ skipping 588 matching lines @@
 Node* WasmGraphBuilder::Return(unsigned count, Node** vals) {
   DCHECK_NOT_NULL(*control_);
   DCHECK_NOT_NULL(*effect_);
 
   if (count == 0) {
     // Handle a return of void.
     vals[0] = jsgraph()->Int32Constant(0);
     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);
 
   MergeControlToEnd(jsgraph(), ret);
   return ret;
 }
 
 
 Node* WasmGraphBuilder::ReturnVoid() { return Return(0, Buffer(0)); }
@@ skipping 644 matching lines @@
 }
 
 
 void WasmGraphBuilder::BoundsCheckMem(MachineType memtype, Node* index,
                                       uint32_t offset) {
   // TODO(turbofan): fold bounds checks for constant indexes.
   CHECK_GE(module_->mem_end, module_->mem_start);
   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 {
     // Check against the limit.
     size_t limit = size - offset - memsize;
     CHECK(limit <= kMaxUInt32);
     cond = graph()->NewNode(
         jsgraph()->machine()->Uint32LessThanOrEqual(), index,
         jsgraph()->Int32Constant(static_cast<uint32_t>(limit)));
   }
@@ skipping 68 matching lines @@
 
 Node* WasmGraphBuilder::String(const char* string) {
   return jsgraph()->Constant(
       jsgraph()->isolate()->factory()->NewStringFromAsciiChecked(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);
 
   //----------------------------------------------------------------------------
   // Create the JSFunction object.
   //----------------------------------------------------------------------------
   Handle<SharedFunctionInfo> shared =
       isolate->factory()->NewSharedFunctionInfo(name, wasm_code, false);
   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);
 
   //----------------------------------------------------------------------------
   // Create the Graph
   //----------------------------------------------------------------------------
   Zone zone;
   Graph graph(&zone);
   CommonOperatorBuilder common(&zone);
   JSOperatorBuilder javascript(&zone);
   MachineOperatorBuilder machine(&zone);
@@ skipping 39 matching lines @@
         &zone, false, params + 1, CallDescriptor::kNoFlags);
     CompilationInfo info("js-to-wasm", isolate, &zone);
     // TODO(titzer): this is technically a WASM wrapper, not a wasm function.
     info.set_output_code_kind(Code::WASM_FUNCTION);
     Handle<Code> code =
         Pipeline::GenerateCodeForTesting(&info, incoming, &graph, nullptr);
 
 #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.
     function->set_code(*code);
   }
   return function;
 }
 
 
 Handle<Code> CompileWasmToJSWrapper(Isolate* isolate, wasm::ModuleEnv* module,
@@ skipping 45 matching lines @@
     // Schedule and compile to machine code.
     CallDescriptor* incoming = module->GetWasmCallDescriptor(&zone, func->sig);
     CompilationInfo info("wasm-to-js", isolate, &zone);
     // TODO(titzer): this is technically a WASM wrapper, not a wasm function.
     info.set_output_code_kind(Code::WASM_FUNCTION);
     code = Pipeline::GenerateCodeForTesting(&info, incoming, &graph, nullptr);
 
 #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
   }
   return code;
 }
 
 
 // Helper function to compile a single function.
 Handle<Code> CompileWasmFunction(wasm::ErrorThrower& thrower, Isolate* isolate,
                                  wasm::ModuleEnv* module_env,
@@ skipping 32 matching lines @@
       module_env->module->module_start,                               // --
       module_env->module->module_start + function.code_start_offset,  // --
       module_env->module->module_start + function.code_end_offset);   // --
 
   if (result.failed()) {
     if (FLAG_trace_wasm_compiler) {
       OFStream os(stdout);
       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();
   }
 
   // Run the compiler pipeline to generate machine code.
   CallDescriptor* descriptor = const_cast<CallDescriptor*>(
       module_env->GetWasmCallDescriptor(&zone, function.sig));
   CompilationInfo info("wasm", isolate, &zone);
   info.set_output_code_kind(Code::WASM_FUNCTION);
   Handle<Code> code =
       Pipeline::GenerateCodeForTesting(&info, descriptor, &graph);
 
 #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;
 }
 
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8