commit f5f22cfc581a6bc52275053c0ce4d5e7cc2ad9f1
author bradnelson <bradnelson@chromium.org> Thu Jan 12 01:59:06 2017
committer Commit bot <commit-bot@chromium.org> Thu Jan 12 01:59:06 2017
tree 9cc9f4bb1dfe9d36ef46cd2f0a0309a808506d15
parent bd7fed19713f020e908a5e273e324439fed485fe

Revert of [wasm][asm.js] Do same work even when not printing asm info. (patchset #1 id:1 of https://codereview.chromium.org/2629043002/ )

Reason for revert:
Triggers flaky tests.

Original issue's description:
> [wasm][asm.js] Do same work even when not printing asm info.
>
> Skipping this work seems to perturb a gc-stress issue.
> More investigation is likely needed.
>
> BUG=v8:4203
> R=danno@chromium.org
>
> Review-Url: https://codereview.chromium.org/2629043002
> Cr-Commit-Position: refs/heads/master@{#42248}
> Committed: https://chromium.googlesource.com/v8/v8/+/785cedf1ee6671399c2b2b7f6c6a8119f55195b4

TBR=danno@chromium.org,bradnelson@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=v8:4203

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

src/asmjs/asm-js.cc

diff --git a/src/asmjs/asm-js.cc b/src/asmjs/asm-js.cc
index 593498e..5b8220e 100644
--- a/src/asmjs/asm-js.cc
+++ b/src/asmjs/asm-js.cc
@@ -209,21 +209,25 @@
   result->set(kWasmDataScriptPosition,
               Smi::FromInt(info->literal()->position()));
 
-  MessageLocation location(info->script(), info->literal()->position(),
-                           info->literal()->position());
-  char text[100];
-  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));
-  Handle<JSMessageObject> message = MessageHandler::MakeMessageObject(
-      info->isolate(), MessageTemplate::kAsmJsCompiled, &location, stext,
-      Handle<JSArray>::null());
-  message->set_error_level(v8::Isolate::kMessageInfo);
-  if (FLAG_trace_asm_time && !FLAG_suppress_asm_messages) {
-    MessageHandler::ReportMessage(info->isolate(), &location, message);
+  if (FLAG_trace_asm_time) {
+    MessageLocation location(info->script(), info->literal()->position(),
+                             info->literal()->position());
+    char text[100];
+    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));
+    Handle<JSMessageObject> message = MessageHandler::MakeMessageObject(
+        info->isolate(), MessageTemplate::kAsmJsCompiled, &location, stext,
+        Handle<JSArray>::null());
+    message->set_error_level(v8::Isolate::kMessageInfo);
+    if (!FLAG_suppress_asm_messages) {
+      MessageHandler::ReportMessage(info->isolate(), &location, message);
+    }
   }
 
   return result;
@@ -314,25 +318,28 @@
     return single_function;
   }
 
-  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 =
-      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));
-  Handle<JSMessageObject> message = MessageHandler::MakeMessageObject(
-      isolate, MessageTemplate::kAsmJsInstantiated, &location, stext,
-      Handle<JSArray>::null());
-  message->set_error_level(v8::Isolate::kMessageInfo);
-  if (FLAG_trace_asm_time && !FLAG_suppress_asm_messages) {
-    MessageHandler::ReportMessage(isolate, &location, message);
+  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 =
+        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));
+    Handle<JSMessageObject> message = MessageHandler::MakeMessageObject(
+        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;