| Index: src/assembler.cc.rej
|
| ===================================================================
|
| --- src/assembler.cc.rej (revision 5920)
|
| +++ src/assembler.cc.rej (working copy)
|
| @@ -1,30 +0,0 @@
|
| ---- src/assembler.cc (revision 757)
|
| -+++ src/assembler.cc (working copy)
|
| -@@ -392,12 +392,16 @@
|
| - RelocIterator::RelocIterator(Code* code, int mode_mask) {
|
| - rinfo_.pc_ = code->instruction_start();
|
| - rinfo_.data_ = 0;
|
| -- // relocation info is read backwards
|
| -+ // Relocation info is read backwards.
|
| - pos_ = code->relocation_start() + code->relocation_size();
|
| - end_ = code->relocation_start();
|
| - done_ = false;
|
| - mode_mask_ = mode_mask;
|
| -- if (mode_mask_ == 0) pos_ = end_;
|
| -+ // Skip all relocation information if the mask is zero or if the
|
| -+ // code has been deoptimized and thereby destructively patched.
|
| -+ if (mode_mask_ == 0 || code->kind() == Code::DEOPTIMIZED_FUNCTION) {
|
| -+ pos_ = end_;
|
| -+ }
|
| - next();
|
| - }
|
| -
|
| -@@ -405,7 +409,7 @@
|
| - RelocIterator::RelocIterator(const CodeDesc& desc, int mode_mask) {
|
| - rinfo_.pc_ = desc.buffer;
|
| - rinfo_.data_ = 0;
|
| -- // relocation info is read backwards
|
| -+ // Relocation info is read backwards.
|
| - pos_ = desc.buffer + desc.buffer_size;
|
| - end_ = pos_ - desc.reloc_size;
|
| - done_ = false;
|
|
|