From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Richard Townsend Date: Wed, 24 Apr 2019 13:57:36 +0100 Subject: Workaround an undefined symbol error Previously, builds configured with dcheck_always_on=true would error with messages like this in the log: lld-link: error: undefined symbol: public: bool __cdecl v8::internal::CPURegister::IsZero(void) const By moving some functions out of the the arm64-assembler header file, this error no longer seems to happen. diff --git a/src/codegen/arm64/assembler-arm64.cc b/src/codegen/arm64/assembler-arm64.cc index 335419ebf5c810d990e072176d07bbe3e9934a7f..df2cd1c0a3c29d5fcd1398ead8903daf9208fb5e 100644 --- a/src/codegen/arm64/assembler-arm64.cc +++ b/src/codegen/arm64/assembler-arm64.cc @@ -3644,6 +3644,22 @@ void Assembler::MoveWide(const Register& rd, uint64_t imm, int shift, ImmMoveWide(static_cast(imm)) | ShiftMoveWide(shift)); } +Instr Assembler::RmNot31(CPURegister rm) { + DCHECK_NE(rm.code(), kSPRegInternalCode); + DCHECK(!rm.IsZero()); + return Rm(rm); +} + +Instr Assembler::RdSP(Register rd) { + DCHECK(!rd.IsZero()); + return (rd.code() & kRegCodeMask) << Rd_offset; +} + +Instr Assembler::RnSP(Register rn) { + DCHECK(!rn.IsZero()); + return (rn.code() & kRegCodeMask) << Rn_offset; +} + void Assembler::AddSub(const Register& rd, const Register& rn, const Operand& operand, FlagsUpdate S, AddSubOp op) { DCHECK_EQ(rd.SizeInBits(), rn.SizeInBits()); diff --git a/src/codegen/arm64/assembler-arm64.h b/src/codegen/arm64/assembler-arm64.h index 41bdb03b4f5a574eb86e69ba8e3edfe9ceea4ed8..84e9b2771decba32e86e90625e4f1b7551fc9f12 100644 --- a/src/codegen/arm64/assembler-arm64.h +++ b/src/codegen/arm64/assembler-arm64.h @@ -2120,11 +2120,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase { return rm.code() << Rm_offset; } - static Instr RmNot31(CPURegister rm) { - DCHECK_NE(rm.code(), kSPRegInternalCode); - DCHECK(!rm.IsZero()); - return Rm(rm); - } + static Instr RmNot31(CPURegister rm); static Instr Ra(CPURegister ra) { DCHECK_NE(ra.code(), kSPRegInternalCode); @@ -2148,15 +2144,8 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase { // These encoding functions allow the stack pointer to be encoded, and // disallow the zero register. - static Instr RdSP(Register rd) { - DCHECK(!rd.IsZero()); - return (rd.code() & kRegCodeMask) << Rd_offset; - } - - static Instr RnSP(Register rn) { - DCHECK(!rn.IsZero()); - return (rn.code() & kRegCodeMask) << Rn_offset; - } + static Instr RdSP(Register rd); + static Instr RnSP(Register rn); // Flags encoding. inline static Instr Flags(FlagsUpdate S);