diff options
Diffstat (limited to 'deps/v8/src/s390/assembler-s390-inl.h')
| -rw-r--r-- | deps/v8/src/s390/assembler-s390-inl.h | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/deps/v8/src/s390/assembler-s390-inl.h b/deps/v8/src/s390/assembler-s390-inl.h index 6024232f9b..1475254921 100644 --- a/deps/v8/src/s390/assembler-s390-inl.h +++ b/deps/v8/src/s390/assembler-s390-inl.h @@ -114,7 +114,6 @@ Address RelocInfo::target_address_address() { Address RelocInfo::constant_pool_entry_address() { UNREACHABLE(); - return NULL; } int RelocInfo::target_address_size() { return Assembler::kSpecialTargetSize; } @@ -345,19 +344,19 @@ void RelocInfo::Visit(Heap* heap) { // Operand constructors Operand::Operand(intptr_t immediate, RelocInfo::Mode rmode) { rm_ = no_reg; - imm_ = immediate; + value_.immediate = immediate; rmode_ = rmode; } Operand::Operand(const ExternalReference& f) { rm_ = no_reg; - imm_ = reinterpret_cast<intptr_t>(f.address()); + value_.immediate = reinterpret_cast<intptr_t>(f.address()); rmode_ = RelocInfo::EXTERNAL_REFERENCE; } Operand::Operand(Smi* value) { rm_ = no_reg; - imm_ = reinterpret_cast<intptr_t>(value); + value_.immediate = reinterpret_cast<intptr_t>(value); rmode_ = kRelocInfo_NONEPTR; } @@ -372,18 +371,14 @@ void Assembler::CheckBuffer() { } } -int32_t Assembler::emit_code_target(Handle<Code> target, RelocInfo::Mode rmode, - TypeFeedbackId ast_id) { +int32_t Assembler::emit_code_target(Handle<Code> target, + RelocInfo::Mode rmode) { DCHECK(RelocInfo::IsCodeTarget(rmode)); - if (rmode == RelocInfo::CODE_TARGET && !ast_id.IsNone()) { - SetRecordedAstId(ast_id); - RecordRelocInfo(RelocInfo::CODE_TARGET_WITH_ID); - } else { - RecordRelocInfo(rmode); - } + RecordRelocInfo(rmode); int current = code_targets_.length(); - if (current > 0 && code_targets_.last().is_identical_to(target)) { + if (current > 0 && !target.is_null() && + code_targets_.last().is_identical_to(target)) { // Optimization if we keep jumping to the same code target. current--; } else { |