diff --git a/src/assembler.cc b/src/assembler.cc index a323ecaa44..030d15c514 100644 --- a/src/assembler.cc +++ b/src/assembler.cc @@ -252,7 +252,7 @@ void RelocInfoWriter::Write(const RelocInfo* rinfo) { 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. diff --git a/src/assembler.h b/src/assembler.h index 095859840e..abf34f2512 100644 --- a/src/assembler.h +++ b/src/assembler.h @@ -184,10 +184,10 @@ class RelocInfo BASE_EMBEDDED { // 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; diff --git a/src/ia32/lithium-codegen-ia32.cc b/src/ia32/lithium-codegen-ia32.cc index d61ebdc0f6..c7424a586b 100644 --- a/src/ia32/lithium-codegen-ia32.cc +++ b/src/ia32/lithium-codegen-ia32.cc @@ -127,7 +127,7 @@ bool LCodeGen::GenerateRelocPadding() { 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(); }