Revision: 8710
Author: [email protected]
Date: Thu Jul 21 05:28:10 2011
Log: Merge fix for incorrect overlap check in mark compact collector
to 3.2
branch.
Bleeding edge revision 8704.
Review URL: http://codereview.chromium.org/7464023
http://code.google.com/p/v8/source/detail?r=8710
Modified:
/branches/3.2/src/heap-inl.h
/branches/3.2/src/version.cc
=======================================
--- /branches/3.2/src/heap-inl.h Wed Mar 23 04:19:56 2011
+++ /branches/3.2/src/heap-inl.h Thu Jul 21 05:28:10 2011
@@ -367,11 +367,7 @@
int size_in_words = byte_size / kPointerSize;
- if ((dst < src) || (dst >= (src + size_in_words))) {
- ASSERT((dst >= (src + size_in_words)) ||
- ((OffsetFrom(reinterpret_cast<Address>(src)) -
- OffsetFrom(reinterpret_cast<Address>(dst))) >= kPointerSize));
-
+ if ((dst < src) || (dst >= (src + byte_size))) {
Object** src_slot = reinterpret_cast<Object**>(src);
Object** dst_slot = reinterpret_cast<Object**>(dst);
Object** end_slot = src_slot + size_in_words;
@@ -389,8 +385,7 @@
Address src,
int byte_size) {
ASSERT(IsAligned(byte_size, kPointerSize));
- ASSERT((dst >= (src + byte_size)) ||
- ((OffsetFrom(src) - OffsetFrom(dst)) >= kPointerSize));
+ ASSERT((dst < src) || (dst >= (src + byte_size)));
CopyBlockToOldSpaceAndUpdateRegionMarks(dst, src, byte_size);
}
=======================================
--- /branches/3.2/src/version.cc Thu Jul 14 03:40:50 2011
+++ /branches/3.2/src/version.cc Thu Jul 21 05:28:10 2011
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 2
#define BUILD_NUMBER 10
-#define PATCH_LEVEL 30
+#define PATCH_LEVEL 31
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
