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

revert_runtime_dhceck_terminating_exception_in_microtasks.patch 2.4 KB
History Raw

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

  2. From: Jeremy Rose <[email protected]>
    3. 

  3. Date: Mon, 9 May 2022 17:09:21 -0700
    4. 

  4. Subject: Revert "[runtime] DHCECK terminating exception in Microtasks"
    5. 

  5. 

  6. This reverts commit bccb536c98181e8a6e9cf0b6342311adbbf61aca.
    7. 

  7. 

  8. diff --git a/src/builtins/builtins-microtask-queue-gen.cc b/src/builtins/builtins-microtask-queue-gen.cc
    9. 

  9. index f58636fee555d782e18b7521c0c4f28ed60b3a52..6b0c63b34ff09f70cb9a4fe419f3b9bb0adf6790 100644
    10. 

  10. --- a/src/builtins/builtins-microtask-queue-gen.cc
    11. 

  11. +++ b/src/builtins/builtins-microtask-queue-gen.cc
    12. 

  12. @@ -118,7 +118,6 @@ void MicrotaskQueueBuiltinsAssembler::PrepareForContext(
    13. 

  13.  void MicrotaskQueueBuiltinsAssembler::RunSingleMicrotask(
    14. 

  14.      TNode<Context> current_context, TNode<Microtask> microtask) {
    15. 

  15.    CSA_DCHECK(this, TaggedIsNotSmi(microtask));
    16. 

  16. -  CSA_DCHECK(this, Word32BinaryNot(IsExecutionTerminating()));
    17. 

  17.  
    18. 

  18.    StoreRoot(RootIndex::kCurrentMicrotask, microtask);
    19. 

  19.    TNode<IntPtrT> saved_entered_context_count = GetEnteredContextCount();
    20. 

  20. diff --git a/src/codegen/code-stub-assembler.cc b/src/codegen/code-stub-assembler.cc
    21. 

  21. index 550025ec72cb3ef580035845d1f43063ef347b6d..1f6d0cdd835cb4f46f3985788f41e0b594441b89 100644
    22. 

  22. --- a/src/codegen/code-stub-assembler.cc
    23. 

  23. +++ b/src/codegen/code-stub-assembler.cc
    24. 

  24. @@ -6151,12 +6151,6 @@ void CodeStubAssembler::SetPendingMessage(TNode<HeapObject> message) {
    25. 

  25.    StoreFullTaggedNoWriteBarrier(pending_message, message);
    26. 

  26.  }
    27. 

  27.  
    28. 

  28. -TNode<BoolT> CodeStubAssembler::IsExecutionTerminating() {
    29. 

  29. -  TNode<HeapObject> pending_message = GetPendingMessage();
    30. 

  30. -  return TaggedEqual(pending_message,
    31. 

  31. -                     LoadRoot(RootIndex::kTerminationException));
    32. 

  32. -}
    33. 

  33. -
    34. 

  34.  TNode<BoolT> CodeStubAssembler::InstanceTypeEqual(TNode<Int32T> instance_type,
    35. 

  35.                                                    int type) {
    36. 

  36.    return Word32Equal(instance_type, Int32Constant(type));
    37. 

  37. diff --git a/src/codegen/code-stub-assembler.h b/src/codegen/code-stub-assembler.h
    38. 

  38. index 324e6a43a773515fe23add5e30a90fc1175f220a..fd92af8cf594108911533e6babcf76f40def15a2 100644
    39. 

  39. --- a/src/codegen/code-stub-assembler.h
    40. 

  40. +++ b/src/codegen/code-stub-assembler.h
    41. 

  41. @@ -2542,7 +2542,6 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
    42. 

  42.  
    43. 

  43.    TNode<HeapObject> GetPendingMessage();
    44. 

  44.    void SetPendingMessage(TNode<HeapObject> message);
    45. 

  45. -  TNode<BoolT> IsExecutionTerminating();
    46. 

  46.  
    47. 

  47.    // Type checks.
    48. 

  48.    // Check whether the map is for an object with special properties, such as a
    49.