Index: src/objects.cc |
diff --git a/src/objects.cc b/src/objects.cc |
index 1eaea79c56358befd28d73956ff954ed232935ab..867f8f7ae819df3bab20cd0643862d0a6fce4482 100644 |
--- a/src/objects.cc |
+++ b/src/objects.cc |
@@ -11007,14 +11007,18 @@ Code* Code::GetCodeAgeStub(Isolate* isolate, Age age, MarkingParity parity) { |
void Code::PrintDeoptLocation(FILE* out, int bailout_id) { |
- const char* last_comment = NULL; |
- int mask = RelocInfo::ModeMask(RelocInfo::COMMENT) |
- | RelocInfo::ModeMask(RelocInfo::RUNTIME_ENTRY); |
+ int last_position = 0; |
+ Deoptimizer::DeoptReason last_reason = Deoptimizer::kNoReason; |
+ int mask = RelocInfo::ModeMask(RelocInfo::DEOPT_REASON) | |
+ RelocInfo::ModeMask(RelocInfo::POSITION) | |
+ RelocInfo::ModeMask(RelocInfo::RUNTIME_ENTRY); |
for (RelocIterator it(this, mask); !it.done(); it.next()) { |
RelocInfo* info = it.rinfo(); |
- if (info->rmode() == RelocInfo::COMMENT) { |
- last_comment = reinterpret_cast<const char*>(info->data()); |
- } else if (last_comment != NULL) { |
+ if (info->rmode() == RelocInfo::POSITION) { |
+ last_position = static_cast<int>(info->data()); |
+ } else if (info->rmode() == RelocInfo::DEOPT_REASON) { |
+ last_reason = static_cast<Deoptimizer::DeoptReason>(info->data()); |
+ } else if (last_reason != Deoptimizer::kNoReason) { |
if ((bailout_id == Deoptimizer::GetDeoptimizationId( |
GetIsolate(), info->target_address(), Deoptimizer::EAGER)) || |
(bailout_id == Deoptimizer::GetDeoptimizationId( |
@@ -11022,7 +11026,8 @@ void Code::PrintDeoptLocation(FILE* out, int bailout_id) { |
(bailout_id == Deoptimizer::GetDeoptimizationId( |
GetIsolate(), info->target_address(), Deoptimizer::LAZY))) { |
CHECK(RelocInfo::IsRuntimeEntry(info->rmode())); |
- PrintF(out, " %s\n", last_comment); |
+ PrintF(out, " ;;; deoptimize at %d: %s\n", last_position, |
+ Deoptimizer::GetDeoptReason(last_reason)); |
return; |
} |
} |