From 78e17cd6a29558e2a6ee646e46b35c9e5d085232 Mon Sep 17 00:00:00 2001 From: "bmeurer@chromium.org" Date: Tue, 30 Sep 2014 12:33:36 +0000 Subject: [PATCH] Some follow-up fixes to r24322. TBR=svenpanne@chromium.org Review URL: https://codereview.chromium.org/616843002 git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@24328 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/assembler.cc | 6 +++--- src/objects.cc | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/assembler.cc b/src/assembler.cc index c01f63f..3fa90ba 100644 --- a/src/assembler.cc +++ b/src/assembler.cc @@ -803,11 +803,11 @@ void RelocInfo::Print(Isolate* isolate, std::ostream& os) { // NOLINT } else if (rmode_ == EXTERNAL_REFERENCE) { ExternalReferenceEncoder ref_encoder(isolate); os << " (" << ref_encoder.NameOfAddress(target_reference()) << ") (" - << target_reference() << ")"; + << static_cast(target_reference()) << ")"; } else if (IsCodeTarget(rmode_)) { Code* code = Code::GetCodeFromTargetAddress(target_address()); - os << " (" << Code::Kind2String(code->kind()) << ") (" << target_address() - << ")"; + os << " (" << Code::Kind2String(code->kind()) << ") (" + << static_cast(target_address()) << ")"; if (rmode_ == CODE_TARGET_WITH_ID) { os << " (id=" << static_cast(data_) << ")"; } diff --git a/src/objects.cc b/src/objects.cc index 875c20e..12a54b2 100644 --- a/src/objects.cc +++ b/src/objects.cc @@ -10913,7 +10913,7 @@ void Code::Disassemble(const char* name, std::ostream& os) { // NOLINT os << "Safepoints (size = " << table.size() << ")\n"; for (unsigned i = 0; i < table.length(); i++) { unsigned pc_offset = table.GetPcOffset(i); - os << (instruction_start() + pc_offset) << " "; + os << static_cast(instruction_start() + pc_offset) << " "; // TODO(svenpanne) Add some basic formatting to our streams. Vector buf1 = Vector::New(30); SNPrintF(buf1, "%4d", pc_offset); -- 2.7.4