Index: src/arm64/assembler-arm64.cc |
diff --git a/src/arm64/assembler-arm64.cc b/src/arm64/assembler-arm64.cc |
index 9cf6be9918c3cdce0a0e856de3ea113bf09f78c8..55256401a54615851d07fb6411241c855e0672d1 100644 |
--- a/src/arm64/assembler-arm64.cc |
+++ b/src/arm64/assembler-arm64.cc |
@@ -329,13 +329,11 @@ bool Operand::NeedsRelocation(const Assembler* assembler) const { |
// Constant Pool. |
void ConstPool::RecordEntry(intptr_t data, |
RelocInfo::Mode mode) { |
- DCHECK(mode != RelocInfo::COMMENT && |
- mode != RelocInfo::POSITION && |
+ DCHECK(mode != RelocInfo::COMMENT && mode != RelocInfo::POSITION && |
mode != RelocInfo::STATEMENT_POSITION && |
- mode != RelocInfo::CONST_POOL && |
- mode != RelocInfo::VENEER_POOL && |
+ mode != RelocInfo::CONST_POOL && mode != RelocInfo::VENEER_POOL && |
mode != RelocInfo::CODE_AGE_SEQUENCE && |
- mode != RelocInfo::DEOPT_REASON); |
+ mode != RelocInfo::DEOPT_REASON && mode != RelocInfo::DEOPT_ID); |
uint64_t raw_data = static_cast<uint64_t>(data); |
int offset = assm_->pc_offset(); |
if (IsEmpty()) { |
@@ -2913,11 +2911,12 @@ void Assembler::RecordRelocInfo(RelocInfo::Mode rmode, intptr_t data) { |
(rmode <= RelocInfo::DEBUG_BREAK_SLOT_AT_TAIL_CALL)) || |
(rmode == RelocInfo::INTERNAL_REFERENCE) || |
(rmode == RelocInfo::CONST_POOL) || (rmode == RelocInfo::VENEER_POOL) || |
- (rmode == RelocInfo::DEOPT_REASON) || |
+ (rmode == RelocInfo::DEOPT_REASON) || (rmode == RelocInfo::DEOPT_ID) || |
(rmode == RelocInfo::GENERATOR_CONTINUATION)) { |
// Adjust code for new modes. |
DCHECK(RelocInfo::IsDebugBreakSlot(rmode) || RelocInfo::IsComment(rmode) || |
- RelocInfo::IsDeoptReason(rmode) || RelocInfo::IsPosition(rmode) || |
+ RelocInfo::IsDeoptReason(rmode) || RelocInfo::IsDeoptId(rmode) || |
+ RelocInfo::IsPosition(rmode) || |
RelocInfo::IsInternalReference(rmode) || |
RelocInfo::IsConstPool(rmode) || RelocInfo::IsVeneerPool(rmode) || |
RelocInfo::IsGeneratorContinuation(rmode)); |