Skip to content

Commit

Permalink
Revert "[wasm] Remove redundant call to {AbortCompilation}"
Browse files Browse the repository at this point in the history
This reverts commit 97a8845.

Reason for revert: https://crbug.com/1455264

Original change's description:
> [wasm] Remove redundant call to {AbortCompilation}
>
> Cancelling the `BytesConsumer` will trigger a state change, which will
> call `AbortCompilation`. Hence the second (explicit) `AbortCompilation`
> call can be skipped. It would return immediately anyway, because the
> `streaming_` field is reset at this point.
>
> R=ahaas@chromium.org
>
> Bug: chromium:1448858, chromium:1449546
> Change-Id: I969b380615551017614110c81cb815e6793dfe68
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4608054
> Reviewed-by: Andreas Haas <ahaas@chromium.org>
> Commit-Queue: Clemens Backes <clemensb@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1158038}

Bug: chromium:1448858, chromium:1449546, chromium:1455264
Change-Id: I46a46b09337568474893cb28e8dbfec7e1282bb5
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4614552
Commit-Queue: Clemens Backes <clemensb@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: Andreas Haas <ahaas@chromium.org>
Auto-Submit: Clemens Backes <clemensb@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1158710}
  • Loading branch information
backes authored and Chromium LUCI CQ committed Jun 16, 2023
1 parent f91c2a5 commit 8675f84
Showing 1 changed file with 1 addition and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -271,9 +271,7 @@ class FetchDataLoaderForWasmStreaming final : public FetchDataLoader,

void Cancel() override {
consumer_->Cancel();
// Cancelling triggers a state change. This resets the {streaming_} member
// via {AbortCompilation}. Check that this happened.
CHECK_EQ(nullptr, streaming_);
return AbortCompilation("Cancellation requested");
}

void Trace(Visitor* visitor) const override {
Expand Down

0 comments on commit 8675f84

Please sign in to comment.