commit ed31badc6de501320f49bec679dcdf9214ac07cc
author Mathieu Chartier <mathieuc@google.com> Fri Jan 17 21:11:41 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 17 21:11:41 2014 +0000
tree 5ec0107863e34bec167451a03f0be6ee8e3fc694
parent 1776f50b5b99782278d7f3d354fa956d9066c903
parent 2ef33c3dce17dabd9342ccf15cca5700487f2045

Merge "Fix bug in CardTable::ModifyCardsAtomic."

runtime/gc/accounting/card_table-inl.h

diff --git a/runtime/gc/accounting/card_table-inl.h b/runtime/gc/accounting/card_table-inl.h
index 7bd53df..f0c4d0d 100644
--- a/runtime/gc/accounting/card_table-inl.h
+++ b/runtime/gc/accounting/card_table-inl.h
@@ -121,7 +121,7 @@
 inline void CardTable::ModifyCardsAtomic(byte* scan_begin, byte* scan_end, const Visitor& visitor,
                                          const ModifiedVisitor& modified) {
   byte* card_cur = CardFromAddr(scan_begin);
-  byte* card_end = CardFromAddr(scan_end);
+  byte* card_end = CardFromAddr(AlignUp(scan_end, kCardSize));
   CheckCardValid(card_cur);
   CheckCardValid(card_end);
 
@@ -147,7 +147,7 @@
       new_value = visitor(expected);
     } while (expected != new_value && UNLIKELY(!byte_cas(expected, new_value, card_end)));
     if (expected != new_value) {
-      modified(card_cur, expected, new_value);
+      modified(card_end, expected, new_value);
     }
   }