[wasm] Clean up handling of function names.

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 "src/isolate-inl.h"
 
 #include "src/base/platform/platform.h"
 
@@ skipping 2054 matching lines @@
     RecordFunctionCompilation(Logger::FUNCTION_TAG, &info, "wasm-to-js", index,
                               module->module->GetName(func->name_offset));
   }
   return code;
 }
 
 
 // Helper function to compile a single function.
 Handle<Code> CompileWasmFunction(wasm::ErrorThrower& thrower, Isolate* isolate,
                                  wasm::ModuleEnv* module_env,
-                                 const wasm::WasmFunction& function,
-                                 int index) {
+                                 const wasm::WasmFunction& function) {
   if (FLAG_trace_wasm_compiler || FLAG_trace_wasm_decode_time) {
-    // TODO(titzer): clean me up a bit.
     OFStream os(stdout);
-    os << "Compiling WASM function #" << index << ":";
-    if (function.name_offset > 0) {
-      os << module_env->module->GetName(function.name_offset);
-    }
+    os << "Compiling WASM function "
+       << wasm::WasmFunctionName(&function, module_env) << std::endl;
     os << std::endl;
   }
   // Initialize the function environment for decoding.
   wasm::FunctionEnv env;
   env.module = module_env;
   env.sig = function.sig;
   env.local_i32_count = function.local_i32_count;
   env.local_i64_count = function.local_i64_count;
   env.local_f32_count = function.local_f32_count;
   env.local_f64_count = function.local_f64_count;
@@ skipping 14 matching lines @@
       module_env->module->module_start + function.code_start_offset,  // --
       module_env->module->module_start + function.code_end_offset);   // --
 
   if (result.failed()) {
     if (FLAG_trace_wasm_compiler) {
       OFStream os(stdout);
       os << "Compilation failed: " << result << std::endl;
     }
     // Add the function as another context for the exception
     ScopedVector<char> buffer(128);
-    SNPrintF(buffer, "Compiling WASM function #%d:%s failed:", index,
+    SNPrintF(buffer, "Compiling WASM function #%d:%s failed:",
+             function.func_index,
              module_env->module->GetName(function.name_offset));
     thrower.Failed(buffer.start(), result);
     return Handle<Code>::null();
   }
 
   // Run the compiler pipeline to generate machine code.
   CallDescriptor* descriptor = const_cast<CallDescriptor*>(
       module_env->GetWasmCallDescriptor(&zone, function.sig));
   Code::Flags flags = Code::ComputeFlags(Code::WASM_FUNCTION);
   // add flags here if a meaningful name is helpful for debugging.
   bool debugging =
       FLAG_print_opt_code || FLAG_trace_turbo || FLAG_trace_turbo_graph;
   const char* func_name = "wasm";
   Vector<char> buffer;
   if (debugging) {
     buffer = Vector<char>::New(128);
-    SNPrintF(buffer, "WASM_function_#%d:%s", index,
+    SNPrintF(buffer, "WASM_function_#%d:%s", function.func_index,
              module_env->module->GetName(function.name_offset));
     func_name = buffer.start();
   }
   CompilationInfo info(func_name, isolate, &zone, flags);
 
   Handle<Code> code =
       Pipeline::GenerateCodeForTesting(&info, descriptor, &graph);
   if (debugging) {
     buffer.Dispose();
   }
   if (!code.is_null()) {
     RecordFunctionCompilation(
-        Logger::FUNCTION_TAG, &info, "WASM_function", index,
+        Logger::FUNCTION_TAG, &info, "WASM_function", function.func_index,
         module_env->module->GetName(function.name_offset));
   }
 
   return code;
 }
 
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8