| Index: src/asmjs/asm-js.cc
|
| diff --git a/src/asmjs/asm-js.cc b/src/asmjs/asm-js.cc
|
| index 9508b489545a408c2c2ae1738f6ba99b56248e2c..496b1bc806a33d2c1f0d223bb594c400b0cd1121 100644
|
| --- a/src/asmjs/asm-js.cc
|
| +++ b/src/asmjs/asm-js.cc
|
| @@ -212,15 +212,9 @@ MaybeHandle<FixedArray> AsmJs::CompileAsmViaWasm(CompilationInfo* info) {
|
| MessageLocation location(info->script(), info->literal()->position(),
|
| info->literal()->position());
|
| char text[100];
|
| - int length;
|
| - if (FLAG_trace_asm_time) {
|
| - length =
|
| - base::OS::SNPrintF(text, arraysize(text),
|
| - "success, asm->wasm: %0.3f ms, compile: %0.3f ms",
|
| - asm_wasm_time, compile_time);
|
| - } else {
|
| - length = base::OS::SNPrintF(text, arraysize(text), "success");
|
| - }
|
| + int length = base::OS::SNPrintF(
|
| + text, arraysize(text), "success, asm->wasm: %0.3f ms, compile: %0.3f ms",
|
| + asm_wasm_time, compile_time);
|
| DCHECK_NE(-1, length);
|
| USE(length);
|
| Handle<String> stext(info->isolate()->factory()->InternalizeUtf8String(text));
|
| @@ -228,7 +222,7 @@ MaybeHandle<FixedArray> AsmJs::CompileAsmViaWasm(CompilationInfo* info) {
|
| info->isolate(), MessageTemplate::kAsmJsCompiled, &location, stext,
|
| Handle<JSArray>::null());
|
| message->set_error_level(v8::Isolate::kMessageInfo);
|
| - if (!FLAG_suppress_asm_messages) {
|
| + if (!FLAG_suppress_asm_messages && FLAG_trace_asm_time) {
|
| MessageHandler::ReportMessage(info->isolate(), &location, message);
|
| }
|
|
|
| @@ -327,13 +321,9 @@ MaybeHandle<Object> AsmJs::InstantiateAsmWasm(i::Isolate* isolate,
|
| }
|
| MessageLocation location(script, position, position);
|
| char text[50];
|
| - int length;
|
| - if (FLAG_trace_asm_time) {
|
| - length = base::OS::SNPrintF(text, arraysize(text), "success, %0.3f ms",
|
| - instantiate_timer.Elapsed().InMillisecondsF());
|
| - } else {
|
| - length = base::OS::SNPrintF(text, arraysize(text), "success");
|
| - }
|
| + int length =
|
| + base::OS::SNPrintF(text, arraysize(text), "success, %0.3f ms",
|
| + instantiate_timer.Elapsed().InMillisecondsF());
|
| DCHECK_NE(-1, length);
|
| USE(length);
|
| Handle<String> stext(isolate->factory()->InternalizeUtf8String(text));
|
| @@ -341,7 +331,9 @@ MaybeHandle<Object> AsmJs::InstantiateAsmWasm(i::Isolate* isolate,
|
| isolate, MessageTemplate::kAsmJsInstantiated, &location, stext,
|
| Handle<JSArray>::null());
|
| message->set_error_level(v8::Isolate::kMessageInfo);
|
| - MessageHandler::ReportMessage(isolate, &location, message);
|
| + if (!FLAG_suppress_asm_messages && FLAG_trace_asm_time) {
|
| + MessageHandler::ReportMessage(isolate, &location, message);
|
| + }
|
|
|
| return module_object;
|
| }
|
|
|