Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1706)

Unified Diff: runtime/vm/instructions_mips.cc

Issue 1301963003: VM: Clean up and fix bugs in instructions patterns (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: s/Pattern::InstructionLength/Pattern::pattern_length_in_bytes/g Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: runtime/vm/instructions_mips.cc
diff --git a/runtime/vm/instructions_mips.cc b/runtime/vm/instructions_mips.cc
index 34a5c3a460970d7bb805e91314a6d6fd98c195cb..0d11873052775ad7d602a2e24b61fcb93d36ff79 100644
--- a/runtime/vm/instructions_mips.cc
+++ b/runtime/vm/instructions_mips.cc
@@ -118,9 +118,7 @@ uword InstructionPattern::DecodeLoadWordFromPool(uword end,
// Offset is signed, so add the upper 16 bits.
offset += (instr->UImmField() << 16);
}
- offset += kHeapObjectTag;
- ASSERT(Utils::IsAligned(offset, 4));
- *index = (offset - Array::data_offset()) / 4;
+ *index = ObjectPool::IndexFromOffset(offset);
return start;
}

Powered by Google App Engine
This is Rietveld 408576698