Reviewers: Søren Gjesse,
Description:
Merge revision 6928 to trunk, fixes assertion bug hit by webkit tests in
debug
mode.
Please review this at http://codereview.chromium.org/6591004/
SVN Base: http://v8.googlecode.com/svn/trunk/
Affected files:
M src/assembler.h
M src/assembler.cc
M src/ia32/lithium-codegen-ia32.cc
M src/version.cc
Index: src/assembler.cc
===================================================================
--- src/assembler.cc (revision 6942)
+++ src/assembler.cc (working copy)
@@ -252,7 +252,7 @@
WriteExtraTaggedPC(pc_delta, kPCJumpTag);
WriteExtraTaggedData(rinfo->data() - last_data_, kCommentTag);
last_data_ = rinfo->data();
- ASSERT(begin_pos - pos_ == RelocInfo::kRelocCommentSize);
+ ASSERT(begin_pos - pos_ >= RelocInfo::kMinRelocCommentSize);
} else {
// For all other modes we simply use the mode as the extra tag.
// None of these modes need a data component.
Index: src/assembler.h
===================================================================
--- src/assembler.h (revision 6942)
+++ src/assembler.h (working copy)
@@ -184,10 +184,10 @@
// we do not normally record relocation info.
static const char* kFillerCommentString;
- // The size of a comment is equal to tree bytes for the extra tagged pc +
- // the tag for the data, and kPointerSize for the actual pointer to the
+ // The minimum size of a comment is equal to three bytes for the extra
tagged
+ // pc + the tag for the data, and kPointerSize for the actual pointer to
the
// comment.
- static const int kRelocCommentSize = 3 + kPointerSize;
+ static const int kMinRelocCommentSize = 3 + kPointerSize;
// The maximum size for a call instruction including pc-jump.
static const int kMaxCallSize = 6;
Index: src/ia32/lithium-codegen-ia32.cc
===================================================================
--- src/ia32/lithium-codegen-ia32.cc (revision 6942)
+++ src/ia32/lithium-codegen-ia32.cc (working copy)
@@ -127,7 +127,7 @@
int reloc_size = masm()->relocation_writer_size();
while (reloc_size < deoptimization_reloc_size.min_size) {
__ RecordComment(RelocInfo::kFillerCommentString, true);
- reloc_size += RelocInfo::kRelocCommentSize;
+ reloc_size += RelocInfo::kMinRelocCommentSize;
}
return !is_aborted();
}
Index: src/version.cc
===================================================================
--- src/version.cc (revision 6942)
+++ src/version.cc (working copy)
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 1
#define BUILD_NUMBER 6
-#define PATCH_LEVEL 0
+#define PATCH_LEVEL 1
#define CANDIDATE_VERSION false
// Define SONAME to have the SCons build the put a specific SONAME into the
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
