[wasm][asm.js] Disable success messages for asm.js

These interfere with layout tests.

BUG=v8:4203
R=titzer@chromium.org,jochen@chromium.org

Review-Url: https://codereview.chromium.org/2628703003
Cr-Commit-Position: refs/heads/master@{#42241}

src/asmjs/asm-js.cc

@@ -209,21 +209,18 @@ MaybeHandle<FixedArray> AsmJs::CompileAsmViaWasm(CompilationInfo* info) {
   result->set(kWasmDataScriptPosition,
               Smi::FromInt(info->literal()->position()));
 
+  if (FLAG_trace_asm_time) {
     MessageLocation location(info->script(), info->literal()->position(),
                              info->literal()->position());
     char text[100];
-  int length;
-  if (FLAG_trace_asm_time) {
-    length =
+    int 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");
-  }
     DCHECK_NE(-1, length);
     USE(length);
-  Handle<String> stext(info->isolate()->factory()->InternalizeUtf8String(text));
+    Handle<String> stext(
+        info->isolate()->factory()->InternalizeUtf8String(text));
     Handle<JSMessageObject> message = MessageHandler::MakeMessageObject(
         info->isolate(), MessageTemplate::kAsmJsCompiled, &location, stext,
         Handle<JSArray>::null());
@@ -231,6 +228,7 @@ MaybeHandle<FixedArray> AsmJs::CompileAsmViaWasm(CompilationInfo* info) {
     if (!FLAG_suppress_asm_messages) {
       MessageHandler::ReportMessage(info->isolate(), &location, message);
     }
+  }
 
   return result;
 }
@@ -320,20 +318,18 @@ MaybeHandle<Object> AsmJs::InstantiateAsmWasm(i::Isolate* isolate,
     return single_function;
   }
 
-  i::Handle<i::Script> script(i::Script::cast(wasm_data->get(kWasmDataScript)));
+  if (FLAG_trace_asm_time) {
+    i::Handle<i::Script> script(
+        i::Script::cast(wasm_data->get(kWasmDataScript)));
     int32_t position = 0;
     if (!wasm_data->get(kWasmDataScriptPosition)->ToInt32(&position)) {
       UNREACHABLE();
     }
     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",
+    int length =
+        base::OS::SNPrintF(text, arraysize(text), "success, %0.3f ms",
                            instantiate_timer.Elapsed().InMillisecondsF());
-  } else {
-    length = base::OS::SNPrintF(text, arraysize(text), "success");
-  }
     DCHECK_NE(-1, length);
     USE(length);
     Handle<String> stext(isolate->factory()->InternalizeUtf8String(text));
@@ -341,7 +337,10 @@ MaybeHandle<Object> AsmJs::InstantiateAsmWasm(i::Isolate* isolate,
         isolate, MessageTemplate::kAsmJsInstantiated, &location, stext,
         Handle<JSArray>::null());
     message->set_error_level(v8::Isolate::kMessageInfo);
+    if (!FLAG_suppress_asm_messages) {
       MessageHandler::ReportMessage(isolate, &location, message);
+    }
+  }
 
   return module_object;
 }