Chromium Code Reviews| Index: src/disassembler.cc |
| diff --git a/src/disassembler.cc b/src/disassembler.cc |
| index 9f8b9a820bc7fb65dd169aae2f6f1a24f30fc172..fd2c889616896abfacce5f67c7aba829ce0d47f7 100644 |
| --- a/src/disassembler.cc |
| +++ b/src/disassembler.cc |
| @@ -1,4 +1,4 @@ |
| -// Copyright 2011 the V8 project authors. All rights reserved. |
| +// Copyright 2012 the V8 project authors. All rights reserved. |
|
Jakob Kummerow
2012/11/19 12:36:00
we don't do this kind of change any more.
danno
2012/11/26 17:16:18
Done.
|
| // Redistribution and use in source and binary forms, with or without |
| // modification, are permitted provided that the following conditions are |
| // met: |
| @@ -287,7 +287,12 @@ static int DecodeIt(FILE* f, |
| Address addr = relocinfo.target_address(); |
| int id = Deoptimizer::GetDeoptimizationId(addr, Deoptimizer::EAGER); |
| if (id == Deoptimizer::kNotDeoptimizationEntry) { |
| - out.AddFormatted(" ;; %s", RelocInfo::RelocModeName(rmode)); |
| + id = Deoptimizer::GetDeoptimizationId(addr, Deoptimizer::LAZY); |
| + if (id == Deoptimizer::kNotDeoptimizationEntry) { |
| + out.AddFormatted(" ;; %s", RelocInfo::RelocModeName(rmode)); |
| + } else { |
| + out.AddFormatted(" ;; lazy deoptimization bailout %d", id); |
| + } |
| } else { |
| out.AddFormatted(" ;; deoptimization bailout %d", id); |
| } |
| @@ -322,7 +327,8 @@ int Disassembler::Decode(FILE* f, byte* begin, byte* end) { |
| // Called by Code::CodePrint. |
| void Disassembler::Decode(FILE* f, Code* code) { |
| - int decode_size = (code->kind() == Code::OPTIMIZED_FUNCTION) |
| + int decode_size = (code->kind() == Code::OPTIMIZED_FUNCTION || |
| + code->kind() == Code::COMPILED_STUB) |
| ? static_cast<int>(code->safepoint_table_offset()) |
| : code->instruction_size(); |
| // If there might be a stack check table, stop before reaching it. |