Chromium Code Reviews| Index: src/compiler/wasm-compiler.cc |
| diff --git a/src/compiler/wasm-compiler.cc b/src/compiler/wasm-compiler.cc |
| index 17065d61b4aac0b34adefab2a945af092250b159..c369f16622835e9e9ccafd803c87d651236a6f6e 100644 |
| --- a/src/compiler/wasm-compiler.cc |
| +++ b/src/compiler/wasm-compiler.cc |
| @@ -1849,9 +1849,9 @@ Handle<JSFunction> CompileJSToWasmWrapper( |
| module->GetFunctionSignature(index)->parameter_count()); |
| CallDescriptor* incoming = Linkage::GetJSCallDescriptor( |
| &zone, false, params + 1, CallDescriptor::kNoFlags); |
| - CompilationInfo info("js-to-wasm", isolate, &zone); |
| + Code::Flags flags = Code::ComputeFlags(Code::WASM_FUNCTION); |
| + CompilationInfo info("js-to-wasm", isolate, &zone, flags); |
| // TODO(titzer): this is technically a WASM wrapper, not a wasm function. |
|
Michael Starzinger
2016/01/19 09:37:03
nit: The TODO probably belongs to the flags comput
danno
2016/01/20 14:56:13
Done.
|
| - info.set_output_code_kind(Code::WASM_FUNCTION); |
| Handle<Code> code = |
| Pipeline::GenerateCodeForTesting(&info, incoming, &graph, nullptr); |
| @@ -1924,9 +1924,9 @@ Handle<Code> CompileWasmToJSWrapper(Isolate* isolate, wasm::ModuleEnv* module, |
| // Schedule and compile to machine code. |
| CallDescriptor* incoming = module->GetWasmCallDescriptor(&zone, func->sig); |
| - CompilationInfo info("wasm-to-js", isolate, &zone); |
| + Code::Flags flags = Code::ComputeFlags(Code::WASM_FUNCTION); |
| + CompilationInfo info("wasm-to-js", isolate, &zone, flags); |
| // TODO(titzer): this is technically a WASM wrapper, not a wasm function. |
|
Michael Starzinger
2016/01/19 09:37:03
nit: Likewise.
danno
2016/01/20 14:56:13
Done.
|
| - info.set_output_code_kind(Code::WASM_FUNCTION); |
| code = Pipeline::GenerateCodeForTesting(&info, incoming, &graph, nullptr); |
| #ifdef ENABLE_DISASSEMBLER |
| @@ -2003,8 +2003,8 @@ Handle<Code> CompileWasmFunction(wasm::ErrorThrower& thrower, Isolate* isolate, |
| // 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); |
| + Code::Flags flags = Code::ComputeFlags(Code::WASM_FUNCTION); |
| + CompilationInfo info("wasm", isolate, &zone, flags); |
| Handle<Code> code = |
| Pipeline::GenerateCodeForTesting(&info, descriptor, &graph); |