[wasm] Fix tracing info for lazy compilation on native heap

Added counter to correctly reflect the number of non-compiled functions.
Added usages of variables used only for tracing or debug to avoid compiler
warnings.

R=clemensh@chromium.org

Change-Id: I4c8d9c0f43bf23250b4702e43592cd64046d28c7
Reviewed-on: https://chromium-review.googlesource.com/907890
Commit-Queue: Kim-Anh Tran <kimanh@google.com>
Reviewed-by: Clemens Hammacher <clemensh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#51201}
This commit is contained in:
Kim-Anh Tran 2018-02-08 11:50:54 +01:00 committed by Commit Bot
parent a2afcc1c09
commit c18df50014

View File

@ -660,6 +660,7 @@ Address CompileLazy(Isolate* isolate) {
func_index, isolate->heap()->undefined_value()); func_index, isolate->heap()->undefined_value());
DCHECK_LT(0, patched); DCHECK_LT(0, patched);
USE(patched);
} }
return result->instructions().start(); return result->instructions().start();
@ -1075,6 +1076,7 @@ const wasm::WasmCode* LazyCompilationOrchestrator::CompileFromJsToWasm(
} }
DCHECK_LT(0, patched); DCHECK_LT(0, patched);
TRACE_LAZY("Patched %d location(s) in the caller.\n", patched); TRACE_LAZY("Patched %d location(s) in the caller.\n", patched);
USE(patched);
#ifdef DEBUG #ifdef DEBUG
it.next(); it.next();
@ -1122,6 +1124,7 @@ const wasm::WasmCode* LazyCompilationOrchestrator::CompileDirectCall(
->module() ->module()
->functions[caller_func_index] ->functions[caller_func_index]
.code.offset(); .code.offset();
int num_non_compiled_functions = 0;
for (RelocIterator it(wasm_caller->instructions(), for (RelocIterator it(wasm_caller->instructions(),
wasm_caller->reloc_info(), wasm_caller->reloc_info(),
wasm_caller->constant_pool(), wasm_caller->constant_pool(),
@ -1142,6 +1145,8 @@ const wasm::WasmCode* LazyCompilationOrchestrator::CompileDirectCall(
non_compiled_functions.push_back(Nothing<uint32_t>()); non_compiled_functions.push_back(Nothing<uint32_t>());
continue; continue;
} }
++num_non_compiled_functions;
uint32_t called_func_index = uint32_t called_func_index =
ExtractDirectCallIndex(decoder, func_bytes + byte_pos); ExtractDirectCallIndex(decoder, func_bytes + byte_pos);
DCHECK_LT(called_func_index, DCHECK_LT(called_func_index,
@ -1154,8 +1159,9 @@ const wasm::WasmCode* LazyCompilationOrchestrator::CompileDirectCall(
} }
} }
TRACE_LAZY("Found %zu non-compiled functions in caller.\n", TRACE_LAZY("Found %d non-compiled functions in caller.\n",
non_compiled_functions.size()); num_non_compiled_functions);
USE(num_non_compiled_functions);
} }
uint32_t func_to_return_idx = 0; uint32_t func_to_return_idx = 0;
@ -1215,6 +1221,7 @@ const wasm::WasmCode* LazyCompilationOrchestrator::CompileDirectCall(
DCHECK_LT(0, patched); DCHECK_LT(0, patched);
TRACE_LAZY("Patched %d location(s) in the caller.\n", patched); TRACE_LAZY("Patched %d location(s) in the caller.\n", patched);
USE(patched);
return ret; return ret;
} }