| Index: src/arm/assembler-arm.cc
|
| diff --git a/src/arm/assembler-arm.cc b/src/arm/assembler-arm.cc
|
| index 1207f5404073d288c3da3a87d8a88d32cee1c1ac..0c9165a303b8ffb7290831a7f4375b6fac0a265c 100644
|
| --- a/src/arm/assembler-arm.cc
|
| +++ b/src/arm/assembler-arm.cc
|
| @@ -476,8 +476,7 @@ Assembler::Assembler(Isolate* isolate, void* buffer, int buffer_size)
|
| recorded_ast_id_(TypeFeedbackId::None()),
|
| pending_32_bit_constants_(),
|
| pending_64_bit_constants_(),
|
| - constant_pool_builder_(kLdrMaxReachBits, kVldrMaxReachBits),
|
| - positions_recorder_(this) {
|
| + constant_pool_builder_(kLdrMaxReachBits, kVldrMaxReachBits) {
|
| pending_32_bit_constants_.reserve(kMinNumPendingConstants);
|
| pending_64_bit_constants_.reserve(kMinNumPendingConstants);
|
| reloc_info_writer.Reposition(buffer_ + buffer_size_, pc_);
|
| @@ -497,8 +496,6 @@ Assembler::~Assembler() {
|
|
|
|
|
| void Assembler::GetCode(CodeDesc* desc) {
|
| - reloc_info_writer.Finish();
|
| -
|
| // Emit constant pool if necessary.
|
| int constant_pool_offset = 0;
|
| if (FLAG_enable_embedded_constant_pool) {
|
| @@ -3911,9 +3908,8 @@ void Assembler::RecordRelocInfo(RelocInfo::Mode rmode, intptr_t data) {
|
| ConstantPoolEntry::Access Assembler::ConstantPoolAddEntry(int position,
|
| RelocInfo::Mode rmode,
|
| intptr_t value) {
|
| - DCHECK(rmode != RelocInfo::COMMENT && rmode != RelocInfo::POSITION &&
|
| - rmode != RelocInfo::STATEMENT_POSITION &&
|
| - rmode != RelocInfo::CONST_POOL && rmode != RelocInfo::NONE64);
|
| + DCHECK(rmode != RelocInfo::COMMENT && rmode != RelocInfo::CONST_POOL &&
|
| + rmode != RelocInfo::NONE64);
|
| bool sharing_ok = RelocInfo::IsNone(rmode) ||
|
| !(serializer_enabled() || rmode < RelocInfo::CELL);
|
| if (FLAG_enable_embedded_constant_pool) {
|
|
|