Fix use of history timers in background threads.

src/compiler/wasm-compiler.cc

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/compiler/wasm-compiler.h"
 
 #include <memory>
 
 #include "src/assembler-inl.h"
 #include "src/base/optional.h"
@@ skipping 3926 matching lines @@
   DCHECK(name_len > 0 && name_len < name_vector.length());
 
   char* index_name = zone->NewArray<char>(name_len);
   memcpy(index_name, name_vector.start(), name_len);
   return Vector<const char>(index_name, name_len);
 }
 }  // namespace
 
 WasmCompilationUnit::WasmCompilationUnit(Isolate* isolate,
                                          wasm::ModuleBytesEnv* module_env,
-                                         const wasm::WasmFunction* function,
-                                         bool is_sync)
+                                         const wasm::WasmFunction* function)
     : WasmCompilationUnit(
           isolate, &module_env->module_env,
           wasm::FunctionBody{
               function->sig, module_env->wire_bytes.start(),
               module_env->wire_bytes.start() + function->code.offset(),
               module_env->wire_bytes.start() + function->code.end_offset()},
-          module_env->wire_bytes.GetNameOrNull(function), function->func_index,
-          is_sync) {}
+          module_env->wire_bytes.GetNameOrNull(function),
+          function->func_index) {}
 
 WasmCompilationUnit::WasmCompilationUnit(Isolate* isolate,
                                          wasm::ModuleEnv* module_env,
                                          wasm::FunctionBody body,
-                                         wasm::WasmName name, int index,
-                                         bool is_sync)
+                                         wasm::WasmName name, int index)
     : isolate_(isolate),
       module_env_(module_env),
       func_body_(body),
       func_name_(name),
-      is_sync_(is_sync),
       centry_stub_(CEntryStub(isolate, 1).GetCode()),
       func_index_(index) {}
 
 void WasmCompilationUnit::ExecuteCompilation() {
-  // TODO(karlschimpf): Make this work when asynchronous.
-  // https://bugs.chromium.org/p/v8/issues/detail?id=6361
-  base::Optional<HistogramTimerScope> wasm_compile_function_time_scope;
-  if (is_sync_) {
-    wasm_compile_function_time_scope.emplace(
-        isolate_->counters()->wasm_compile_function_time());
-  }
+  HistogramTimerScope wasm_compile_function_time_scope(
+      isolate_->counters()->wasm_compile_function_time());
 
   if (FLAG_trace_wasm_compiler) {
     if (func_name_.start() != nullptr) {
       PrintF("Compiling wasm function %d:'%.*s'\n\n", func_index(),
              func_name_.length(), func_name_.start());
     } else {
       PrintF("Compiling wasm function %d:<unnamed>\n\n", func_index());
     }
   }
 
@@ skipping 38 matching lines @@
         isolate_, compilation_zone_.get(),
         Code::ComputeFlags(Code::WASM_FUNCTION)));
     ZoneVector<trap_handler::ProtectedInstructionData> protected_instructions(
         compilation_zone_.get());
 
     job_.reset(Pipeline::NewWasmCompilationJob(
         info_.get(), jsgraph_, descriptor, source_positions,
         &protected_instructions, !module_env_->module->is_wasm()));
     ok_ = job_->ExecuteJob() == CompilationJob::SUCCEEDED;
     // TODO(bradnelson): Improve histogram handling of size_t.
-    if (is_sync_)
-      // TODO(karlschimpf): Make this work when asynchronous.
-      // https://bugs.chromium.org/p/v8/issues/detail?id=6361
-      isolate_->counters()
-          ->wasm_compile_function_peak_memory_bytes()
-          ->AddSample(
-              static_cast<int>(jsgraph_->graph()->zone()->allocation_size()));
+    isolate_->counters()->wasm_compile_function_peak_memory_bytes()->AddSample(
+        static_cast<int>(jsgraph_->graph()->zone()->allocation_size()));
 
     if (FLAG_trace_wasm_decode_time) {
       double pipeline_ms = pipeline_timer.Elapsed().InMillisecondsF();
       PrintF(
           "wasm-compilation phase 1 ok: %u bytes, %0.3f ms decode, %zu nodes, "
           "%0.3f ms pipeline\n",
           static_cast<unsigned>(func_body_.end - func_body_.start), decode_ms,
           node_count, pipeline_ms);
     }
     // The graph zone is about to get out of scope. Avoid invalid references.
@@ skipping 56 matching lines @@
     wasm::ErrorThrower* thrower, Isolate* isolate,
     wasm::ModuleBytesEnv* module_env, const wasm::WasmFunction* function) {
   WasmCompilationUnit unit(isolate, module_env, function);
   unit.ExecuteCompilation();
   return unit.FinishCompilation(thrower);
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8