Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Branch: 13-x-y
Branches Tags
electron
/
patches
/
v8
/
cherry-pick-1234770.patch

cherry-pick-1234770.patch 3.0 KB
Permalink History Raw

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

  2. From: Georg Neis <[email protected]>
    3. 

  3. Date: Mon, 9 Aug 2021 09:57:12 +0200
    4. 

  4. Subject: Merged: [compiler] Fix a bug in MachineOperatorReducer's
    5. 

  5.  BitfieldCheck
    6. 

  6. 

  7. Revision: 574ca6b71c6160d38b5fcf4b8e133bc7f6ba2387
    8. 

  8. 

  9. BUG=chromium:1234770
    10. 

  10. NOTRY=true
    11. 

  11. NOPRESUBMIT=true
    12. 

  12. NOTREECHECKS=true
    13. 

  13. [email protected]
    14. 

  14. 

  15. Change-Id: I15af5a94e89b54c2a540442c3544ed459b832e0a
    16. 

  16. Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3080564
    17. 

  17. Reviewed-by: Lutz Vahl <[email protected]>
    18. 

  18. Commit-Queue: Georg Neis <[email protected]>
    19. 

  19. Cr-Commit-Position: refs/branch-heads/9.3@{#21}
    20. 

  20. Cr-Branched-From: 7744dce208a555494e4a33e24fadc71ea20b3895-refs/heads/9.3.345@{#1}
    21. 

  21. Cr-Branched-From: 4b6b4cabf3b6a20cdfda72b369df49f3311c4344-refs/heads/master@{#75728}
    22. 

  22. 

  23. diff --git a/src/compiler/machine-operator-reducer.cc b/src/compiler/machine-operator-reducer.cc
    24. 

  24. index 5d61dfac6ab46687b0adde2ff9777a0252e16494..b4b16f931f0927e9b683f38b393b0d275727f25e 100644
    25. 

  25. --- a/src/compiler/machine-operator-reducer.cc
    26. 

  26. +++ b/src/compiler/machine-operator-reducer.cc
    27. 

  27. @@ -1718,11 +1718,21 @@ Reduction MachineOperatorReducer::ReduceWordNAnd(Node* node) {
    28. 

  28.  namespace {
    29. 

  29.  
    30. 

  30.  // Represents an operation of the form `(source & mask) == masked_value`.
    31. 

  31. +// where each bit set in masked_value also has to be set in mask.
    32. 

  32.  struct BitfieldCheck {
    33. 

  33. -  Node* source;
    34. 

  34. -  uint32_t mask;
    35. 

  35. -  uint32_t masked_value;
    36. 

  36. -  bool truncate_from_64_bit;
    37. 

  37. +  Node* const source;
    38. 

  38. +  uint32_t const mask;
    39. 

  39. +  uint32_t const masked_value;
    40. 

  40. +  bool const truncate_from_64_bit;
    41. 

  41. +
    42. 

  42. +  BitfieldCheck(Node* source, uint32_t mask, uint32_t masked_value,
    43. 

  43. +                bool truncate_from_64_bit)
    44. 

  44. +      : source(source),
    45. 

  45. +        mask(mask),
    46. 

  46. +        masked_value(masked_value),
    47. 

  47. +        truncate_from_64_bit(truncate_from_64_bit) {
    48. 

  48. +    CHECK_EQ(masked_value & ~mask, 0);
    49. 

  49. +  }
    50. 

  50.  
    51. 

  51.    static base::Optional<BitfieldCheck> Detect(Node* node) {
    52. 

  52.      // There are two patterns to check for here:
    53. 

  53. @@ -1737,14 +1747,16 @@ struct BitfieldCheck {
    54. 

  54.        if (eq.left().IsWord32And()) {
    55. 

  55.          Uint32BinopMatcher mand(eq.left().node());
    56. 

  56.          if (mand.right().HasResolvedValue() && eq.right().HasResolvedValue()) {
    57. 

  57. -          BitfieldCheck result{mand.left().node(), mand.right().ResolvedValue(),
    58. 

  58. -                               eq.right().ResolvedValue(), false};
    59. 

  59. +          uint32_t mask = mand.right().ResolvedValue();
    60. 

  60. +          uint32_t masked_value = eq.right().ResolvedValue();
    61. 

  61. +          if ((masked_value & ~mask) != 0) return {};
    62. 

  62.            if (mand.left().IsTruncateInt64ToInt32()) {
    63. 

  63. -            result.truncate_from_64_bit = true;
    64. 

  64. -            result.source =
    65. 

  65. -                NodeProperties::GetValueInput(mand.left().node(), 0);
    66. 

  66. +            return BitfieldCheck(
    67. 

  67. +                NodeProperties::GetValueInput(mand.left().node(), 0), mask,
    68. 

  68. +                masked_value, true);
    69. 

  69. +          } else {
    70. 

  70. +            return BitfieldCheck(mand.left().node(), mask, masked_value, false);
    71. 

  71.            }
    72. 

  72. -          return result;
    73. 

  73.          }
    74. 

  74.        }
    75. 

  75.      } else {
    76.