[wasm] Change the return type of traps for tests, and added ftoi64 instructions.

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 d2f2eda136a7b72daae0df5ac18625df26a65bec..9052fa52f63b099278e099e2061024744816fe8a 100644
--- a/src/compiler/wasm-compiler.cc
+++ b/src/compiler/wasm-compiler.cc
@@ -223,9 +223,43 @@ class WasmTrapHelper : public ZoneObject {
       end = thrw;
     } else {
       // End the control flow with returning 0xdeadbeef
-      Node* ret_dead = graph()->NewNode(common()->Return(),
+
+      Node* ret_dead;
+      if (builder_->GetFunctionSignature()->return_count() > 0) {
+        switch (builder_->GetFunctionSignature()->GetReturn()) {
+          case wasm::kAstI32:
+            ret_dead = graph()->NewNode(jsgraph()->common()->Return(),

[titzer, 2015/12/11 13:49:26]

You can just make the return value node in these cases, the rest is the same.

                                         jsgraph()->Int32Constant(0xdeadbeef),
                                         *effect_ptr, *control_ptr);
+            break;
+          case wasm::kAstI64:
+            ret_dead =
+                graph()->NewNode(jsgraph()->common()->Return(),
+                                 jsgraph()->Int64Constant(0xdeadbeefdeadbeef),
+                                 *effect_ptr, *control_ptr);
+            break;
+          case wasm::kAstF32:
+            ret_dead = graph()->NewNode(
+                jsgraph()->common()->Return(),
+                jsgraph()->Float32Constant(bit_cast<float>(0xdeadbeef)),
+                *effect_ptr, *control_ptr);
+            break;
+          case wasm::kAstF64:
+            ret_dead =
+                graph()->NewNode(jsgraph()->common()->Return(),
+                                 jsgraph()->Float64Constant(
+                                     bit_cast<double>(0xdeadbeefdeadbeef)),
+                                 *effect_ptr, *control_ptr);
+            break;
+          default:
+            UNREACHABLE();
+            ret_dead = nullptr;
+        }
+      } else {
+        ret_dead = graph()->NewNode(common()->Return(),
+                                    jsgraph()->Int32Constant(0xdeadbeef),
+                                    *effect_ptr, *control_ptr);
+      }
       end = ret_dead;
     }
 
@@ -234,7 +268,8 @@ class WasmTrapHelper : public ZoneObject {
 };
 
 
-WasmGraphBuilder::WasmGraphBuilder(Zone* zone, JSGraph* jsgraph)
+WasmGraphBuilder::WasmGraphBuilder(Zone* zone, JSGraph* jsgraph,
+                                   wasm::FunctionSig* function_signature)
     : zone_(zone),
       jsgraph_(jsgraph),
       module_(nullptr),
@@ -245,7 +280,8 @@ WasmGraphBuilder::WasmGraphBuilder(Zone* zone, JSGraph* jsgraph)
       effect_(nullptr),
       cur_buffer_(def_buffer_),
       cur_bufsize_(kDefaultBufferSize),
-      trap_(new (zone) WasmTrapHelper(this)) {
+      trap_(new (zone) WasmTrapHelper(this)),
+      function_signature_(function_signature) {
   DCHECK_NOT_NULL(jsgraph_);
 }
 
@@ -843,6 +879,42 @@ Node* WasmGraphBuilder::Unop(wasm::WasmOpcode opcode, Node* input) {
     case wasm::kExprF64UConvertI64:
       op = m->RoundUint64ToFloat64();
       break;
+    case wasm::kExprI64SConvertF32: {
+      Node* trunc = graph()->NewNode(m->TryTruncateFloat32ToInt64(), input);
+      Node* result =
+          graph()->NewNode(jsgraph()->common()->Projection(0), trunc);
+      Node* overflow =
+          graph()->NewNode(jsgraph()->common()->Projection(1), trunc);
+      trap_->ZeroCheck64(kTrapFloatUnrepresentable, overflow);
+      return result;
+    }
+    case wasm::kExprI64SConvertF64: {
+      Node* trunc = graph()->NewNode(m->TryTruncateFloat64ToInt64(), input);
+      Node* result =
+          graph()->NewNode(jsgraph()->common()->Projection(0), trunc);
+      Node* overflow =
+          graph()->NewNode(jsgraph()->common()->Projection(1), trunc);
+      trap_->ZeroCheck64(kTrapFloatUnrepresentable, overflow);
+      return result;
+    }
+    case wasm::kExprI64UConvertF32: {
+      Node* trunc = graph()->NewNode(m->TryTruncateFloat32ToUint64(), input);
+      Node* result =
+          graph()->NewNode(jsgraph()->common()->Projection(0), trunc);
+      Node* overflow =
+          graph()->NewNode(jsgraph()->common()->Projection(1), trunc);
+      trap_->ZeroCheck64(kTrapFloatUnrepresentable, overflow);
+      return result;
+    }
+    case wasm::kExprI64UConvertF64: {
+      Node* trunc = graph()->NewNode(m->TryTruncateFloat64ToUint64(), input);
+      Node* result =
+          graph()->NewNode(jsgraph()->common()->Projection(0), trunc);
+      Node* overflow =
+          graph()->NewNode(jsgraph()->common()->Projection(1), trunc);
+      trap_->ZeroCheck64(kTrapFloatUnrepresentable, overflow);
+      return result;
+    }
     case wasm::kExprF64ReinterpretI64:
       op = m->BitcastInt64ToFloat64();
       break;
@@ -1616,7 +1688,7 @@ Handle<JSFunction> CompileJSToWasmWrapper(Isolate* isolate,
   Node* control = nullptr;
   Node* effect = nullptr;
 
-  WasmGraphBuilder builder(&zone, &jsgraph);
+  WasmGraphBuilder builder(&zone, &jsgraph, func->sig);
   builder.set_control_ptr(&control);
   builder.set_effect_ptr(&effect);
   builder.set_module(module);
@@ -1698,7 +1770,7 @@ Handle<Code> CompileWasmToJSWrapper(Isolate* isolate, wasm::ModuleEnv* module,
   Node* control = nullptr;
   Node* effect = nullptr;
 
-  WasmGraphBuilder builder(&zone, &jsgraph);
+  WasmGraphBuilder builder(&zone, &jsgraph, func->sig);
   builder.set_control_ptr(&control);
   builder.set_effect_ptr(&effect);
   builder.set_module(module);
@@ -1786,7 +1858,7 @@ Handle<Code> CompileWasmFunction(wasm::ErrorThrower& thrower, Isolate* isolate,
       &zone, MachineType::PointerRepresentation(),
       InstructionSelector::SupportedMachineOperatorFlags());
   JSGraph jsgraph(isolate, &graph, &common, nullptr, nullptr, &machine);
-  WasmGraphBuilder builder(&zone, &jsgraph);
+  WasmGraphBuilder builder(&zone, &jsgraph, function.sig);
   wasm::TreeResult result = wasm::BuildTFGraph(
       &builder, &env,                                                 // --
       module_env->module->module_start,                               // --