[Oilpan] EagerSweep shouldn't have early return [chromium/src : master]

Yutaka Hirano (Gerrit)

unread,

Aug 18, 2017, 1:46:23 AM8/18/17

to Yutaka Hirano, blink-...@chromium.org, kinuko...@chromium.org, kouhe...@chromium.org, oilpan-...@chromium.org, Kentaro Hara, Commit Bot, Mads Ager, chromium...@chromium.org

This change is ready for review.

View Change

To view, visit change 620508. To unsubscribe, or for help writing mail filters, visit settings.

Kentaro Hara (Gerrit)

unread,

Aug 18, 2017, 2:05:24 AM8/18/17

to Yutaka Hirano, blink-...@chromium.org, kinuko...@chromium.org, kouhe...@chromium.org, oilpan-...@chromium.org, Commit Bot, Mads Ager, chromium...@chromium.org

LGTM

Patch set 1:Code-Review +1

View Change

To view, visit change 620508. To unsubscribe, or for help writing mail filters, visit settings.

Yutaka Hirano (Gerrit)

unread,

Aug 18, 2017, 2:07:00 AM8/18/17

to Yutaka Hirano, blink-...@chromium.org, kinuko...@chromium.org, kouhe...@chromium.org, oilpan-...@chromium.org, Kentaro Hara, Commit Bot, Mads Ager, chromium...@chromium.org

Patch set 1:Commit-Queue +2

View Change

To view, visit change 620508. To unsubscribe, or for help writing mail filters, visit settings.

Commit Bot (Gerrit)

unread,

Aug 18, 2017, 3:12:35 AM8/18/17

to Yutaka Hirano, blink-...@chromium.org, kinuko...@chromium.org, kouhe...@chromium.org, oilpan-...@chromium.org, Kentaro Hara, Mads Ager, chromium...@chromium.org

Commit Bot merged this change.

View Change

Approvals:
  Kentaro Hara: Looks good to me
  Yutaka Hirano: Commit

[Oilpan] EagerSweep shouldn't have early return

This CL removes an eary return statement for nested sweeping in
ThreadState::EagerSweep. As nested CollectGarbage is not allowed we
shouldn't have a nested call here.

Bug: 756496
Change-Id: I5da557f8efbfc7a41eb62af4fae0b938c700549e
Reviewed-on: https://chromium-review.googlesource.com/620508
Reviewed-by: Kentaro Hara <har...@chromium.org>
Commit-Queue: Yutaka Hirano <yhi...@chromium.org>
Cr-Commit-Position: refs/heads/master@{#495494}
---
M third_party/WebKit/Source/platform/heap/ThreadState.cpp
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/third_party/WebKit/Source/platform/heap/ThreadState.cpp b/third_party/WebKit/Source/platform/heap/ThreadState.cpp
index f8aff47..3b65030 100644
--- a/third_party/WebKit/Source/platform/heap/ThreadState.cpp
+++ b/third_party/WebKit/Source/platform/heap/ThreadState.cpp
@@ -958,9 +958,8 @@
   // eagerly.
   DCHECK(IsSweepingInProgress());
 
-  // Mirroring the completeSweep() condition; see its comment.
-  if (SweepForbidden())
-    return;
+  // TODO(yhirano): Turn this CHECK to DCHECK before M63 branch is cut.
+  CHECK(!SweepForbidden());
 
   SweepForbiddenScope scope(this);
   ScriptForbiddenIfMainThreadScope script_forbidden_scope;

To view, visit change 620508. To unsubscribe, or for help writing mail filters, visit settings.

Reply all

Reply to author

Forward