Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: 19e7af9841
Branches Tags
electron
/
patches
/
v8
/
workaround_an_undefined_symbol_error.patch

workaround_an_undefined_symbol_error.patch 2.7 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475 
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Richard Townsend <[email protected]>
    3. 

  3. Date: Wed, 24 Apr 2019 13:57:36 +0100
    4. 

  4. Subject: Workaround an undefined symbol error
    5. 

  5. 

  6. Previously, builds configured with dcheck_always_on=true would error
    7. 

  7. with messages like this in the log:
    8. 

  8.  lld-link: error: undefined symbol: public: bool __cdecl
    9. 

  9.   v8::internal::CPURegister::IsZero(void) const
    10. 

  10. 

  11. By moving some functions out of the the arm64-assembler header file,
    12. 

  12. this error no longer seems to happen.
    13. 

  13. 

  14. diff --git a/src/codegen/arm64/assembler-arm64.cc b/src/codegen/arm64/assembler-arm64.cc
    15. 

  15. index 2e21ab913d7b5ebc62857883ce3907c451b56399..e6a6b39086b2d5a6bf39b5a88df970cec662edf5 100644
    16. 

  16. --- a/src/codegen/arm64/assembler-arm64.cc
    17. 

  17. +++ b/src/codegen/arm64/assembler-arm64.cc
    18. 

  18. @@ -3600,6 +3600,22 @@ void Assembler::MoveWide(const Register& rd, uint64_t imm, int shift,
    19. 

  19.         ImmMoveWide(static_cast<int>(imm)) | ShiftMoveWide(shift));
    20. 

  20.  }
    21. 

  21.  
    22. 

  22. +Instr Assembler::RmNot31(CPURegister rm) {
    23. 

  23. +  DCHECK_NE(rm.code(), kSPRegInternalCode);
    24. 

  24. +  DCHECK(!rm.IsZero());
    25. 

  25. +  return Rm(rm);
    26. 

  26. +}
    27. 

  27. +
    28. 

  28. +Instr Assembler::RdSP(Register rd) {
    29. 

  29. +  DCHECK(!rd.IsZero());
    30. 

  30. +  return (rd.code() & kRegCodeMask) << Rd_offset;
    31. 

  31. +}
    32. 

  32. +
    33. 

  33. +Instr Assembler::RnSP(Register rn) {
    34. 

  34. +  DCHECK(!rn.IsZero());
    35. 

  35. +  return (rn.code() & kRegCodeMask) << Rn_offset;
    36. 

  36. +}
    37. 

  37. +
    38. 

  38.  void Assembler::AddSub(const Register& rd, const Register& rn,
    39. 

  39.                         const Operand& operand, FlagsUpdate S, AddSubOp op) {
    40. 

  40.    DCHECK_EQ(rd.SizeInBits(), rn.SizeInBits());
    41. 

  41. diff --git a/src/codegen/arm64/assembler-arm64.h b/src/codegen/arm64/assembler-arm64.h
    42. 

  42. index f787bad464f82db2d138507832be7beafad658b5..bbbe52001634550052eac8b5b2712ae656575923 100644
    43. 

  43. --- a/src/codegen/arm64/assembler-arm64.h
    44. 

  44. +++ b/src/codegen/arm64/assembler-arm64.h
    45. 

  45. @@ -2095,11 +2095,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
    46. 

  46.      return rm.code() << Rm_offset;
    47. 

  47.    }
    48. 

  48.  
    49. 

  49. -  static Instr RmNot31(CPURegister rm) {
    50. 

  50. -    DCHECK_NE(rm.code(), kSPRegInternalCode);
    51. 

  51. -    DCHECK(!rm.IsZero());
    52. 

  52. -    return Rm(rm);
    53. 

  53. -  }
    54. 

  54. +  static Instr RmNot31(CPURegister rm);
    55. 

  55.  
    56. 

  56.    static Instr Ra(CPURegister ra) {
    57. 

  57.      DCHECK_NE(ra.code(), kSPRegInternalCode);
    58. 

  58. @@ -2123,15 +2119,8 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
    59. 

  59.  
    60. 

  60.    // These encoding functions allow the stack pointer to be encoded, and
    61. 

  61.    // disallow the zero register.
    62. 

  62. -  static Instr RdSP(Register rd) {
    63. 

  63. -    DCHECK(!rd.IsZero());
    64. 

  64. -    return (rd.code() & kRegCodeMask) << Rd_offset;
    65. 

  65. -  }
    66. 

  66. -
    67. 

  67. -  static Instr RnSP(Register rn) {
    68. 

  68. -    DCHECK(!rn.IsZero());
    69. 

  69. -    return (rn.code() & kRegCodeMask) << Rn_offset;
    70. 

  70. -  }
    71. 

  71. +  static Instr RdSP(Register rd);
    72. 

  72. +  static Instr RnSP(Register rn);
    73. 

  73.  
    74. 

  74.    // Flags encoding.
    75. 

  75.    inline static Instr Flags(FlagsUpdate S);
    76.