Bug 148245 – [JSC] Get rid of DFG's MergeMode

• Status: RESOLVED
• Resolution: FIXED
• Component: New Bugs

[Benjamin Poulain]

[JSC] Get rid of DFG's MergeMode

[Benjamin Poulain]

Created attachment 259493 [details]
Patch

[Filip Pizlo]

Comment on attachment 259493 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=259493&action=review

> Source/JavaScriptCore/dfg/DFGInPlaceAbstractState.h:86
>      // the block's data structures. There are three return modes, depending
>      // on the value of mergeMode:
>      //
> -    // DontMerge:
> -    //    Always returns false.
> -    //
> -    // MergeToTail:
> -    //    Returns true if the state of the block at the tail was changed.
> -    //    This means that you must call mergeToSuccessors(), and if that
> -    //    returns true, then you must revisit (at least) the successor
> -    //    blocks. False will always be returned if the block is terminal
> -    //    (i.e. ends in Throw or Return, or has a ForceOSRExit inside it).
> -    //
> -    // MergeToSuccessors:
>      //    Returns true if the state of the block at the tail was changed,
>      //    and, if the state at the heads of successors was changed.
>      //    A true return means that you must revisit (at least) the successor
>      //    blocks. This also sets cfaShouldRevisit to true for basic blocks
>      //    that must be visited next.
> -    bool endBasicBlock(MergeMode);
> +    bool endBasicBlock();

You should probably update this comment a bit!

[Benjamin Poulain]

Created attachment 259538 [details]
Patch

[Mark Lam]

Comment on attachment 259538 [details]
Patch

r=me.

Please also remove the entries for DFGMergeMode.h from JavaScriptCore.vcxproj and JavaScriptCore.vcxproj.filters in Source/JavaScriptCore/JavaScriptCore.vcxproj.

[Benjamin Poulain]

Committed r189138: <http://trac.webkit.org/changeset/189138>