Merge V8 5.3.332.45. DO NOT MERGE
Test: Manual
FPIIM-449
Change-Id: Id3254828b068abdea3cb10442e0172a8c9a98e03
(cherry picked from commit 13e2dadd00298019ed862f2b2fc5068bba730bcf)
diff --git a/src/log-utils.cc b/src/log-utils.cc
index a83a0ae..22972ec 100644
--- a/src/log-utils.cc
+++ b/src/log-utils.cc
@@ -164,12 +164,14 @@
}
}
-void Log::MessageBuilder::AppendAddress(Address addr) { Append("%p", addr); }
+void Log::MessageBuilder::AppendAddress(Address addr) {
+ Append("%p", static_cast<void*>(addr));
+}
void Log::MessageBuilder::AppendSymbolName(Symbol* symbol) {
DCHECK(symbol);
Append("symbol(");
- if (!symbol->name()->IsUndefined()) {
+ if (!symbol->name()->IsUndefined(symbol->GetIsolate())) {
Append("\"");
AppendDetailed(String::cast(symbol->name()), false);
Append("\" ");