Index: test/cctest/asmjs/test-asm-typer.cc |
diff --git a/test/cctest/asmjs/test-asm-typer.cc b/test/cctest/asmjs/test-asm-typer.cc |
index 3f6eeafa5ad615c4e03ae6783467c547a2838a2f..873e937420c08c56dfe5f37e9fdb8e7385760564 100644 |
--- a/test/cctest/asmjs/test-asm-typer.cc |
+++ b/test/cctest/asmjs/test-asm-typer.cc |
@@ -126,7 +126,8 @@ class AsmTyperHarnessBuilder { |
WithGlobal(var_name, type); |
auto* var_info = typer_->Lookup(DeclareVariable(var_name)); |
CHECK(var_info); |
- var_info->SetFirstForwardUse(-1); |
+ MessageLocation location; |
+ var_info->SetFirstForwardUse(location); |
return this; |
} |
@@ -260,12 +261,14 @@ class AsmTyperHarnessBuilder { |
return false; |
} |
- if (std::strstr(typer_->error_message(), error_message) == nullptr) { |
+ std::unique_ptr<char[]> msg = i::MessageHandler::GetLocalizedMessage( |
+ isolate_, typer_->error_message()); |
+ if (std::strstr(msg.get(), error_message) == nullptr) { |
std::cerr << "Asm validation failed with the wrong error message:\n" |
"Expected to contain '" |
<< error_message << "'\n" |
" Actually is '" |
- << typer_->error_message() << "'\n"; |
+ << msg.get() << "'\n"; |
return false; |
} |