Encode RelocInfo extra tag to fit changed RelocInfo kind enum.

hashseed · Commit bot · commit cc2c902fa5d0 · 2015-03-13T13:39:26.000Z
This fixes some failures on MIPS. Though not all of them, since MIPS does not correctly implement set_target_internal_reference. R=svenpanne@chromium.org Review URL: https://codereview.chromium.org/1008823002 Cr-Commit-Position: refs/heads/master@{#27183}
diff --git a/src/assembler.cc b/src/assembler.cc
@@ -511,7 +511,7 @@ void RelocInfoWriter::Write(const RelocInfo* rinfo) {
                                                              : kVeneerPoolTag);
   } else {
     DCHECK(rmode > RelocInfo::LAST_COMPACT_ENUM);
-    int saved_mode = rmode - RelocInfo::LAST_COMPACT_ENUM;
+    int saved_mode = rmode - RelocInfo::LAST_COMPACT_ENUM - 1;
     // For all other modes we simply use the mode as the extra tag.
     // None of these modes need a data component.
     DCHECK(saved_mode < kPoolExtraTag);
@@ -721,7 +721,7 @@ void RelocIterator::next() {
         Advance(kIntSize);
       } else {
         AdvanceReadPC();
-        int rmode = extra_tag + RelocInfo::LAST_COMPACT_ENUM;
+        int rmode = extra_tag + RelocInfo::LAST_COMPACT_ENUM + 1;
         if (SetMode(static_cast<RelocInfo::Mode>(rmode))) return;
       }
     }
