Request for reviews (S): 6809798: SafePointScalarObject node placed into incorrect block during GCM

[Christian Thalinger]

On Thu, 2009-02-26 at 14:23 -0800, Vladimir Kozlov wrote:
> I changed comments as suggested, added the assert into
> replace_block_proj_ctrl() and ran CTW with -XX:+DoEscapeAnalysis.
> I did not get any failures.
> 
> I updated webrev http://cr.openjdk.java.net/~kvn/6809798/webrev.01
> and I will push the fix with Tom as reviewer.

Oh no!  This small change:

+   void PhaseCFG::replace_block_proj_ctrl( Node *n );

broke compilation on recent GCCs again:

src/share/vm/opto/block.hpp:350: error: extra qualification 'PhaseCFG::' on member 'replace_block_proj_ctrl'

Unfortunately I have already pushed the changeset of 6778669.  How
should I proceed?  Create a new CR for that or a sub-CR of 6778669
(however that works)?

-- Christian