Bug 151622 – Don't hide the argument name inside for block in AirIteratedRegisterCoalescing.cpp

• Status: RESOLVED
• Resolution: FIXED
• Component: JavaScriptCore

[Csaba Osztrogonác]

Source/JavaScriptCore/b3/air/AirIteratedRegisterCoalescing.cpp

void addEdges(Inst& inst, const HashSet<Tmp>& liveTmp)
{
    // All the Def()s interfere with everthing live.
    inst.forEachDefAndExtraClobberedTmp(type, [&] (Tmp& arg) {
        for (const Tmp& liveTmp : liveTmp) {                        <================== BANG!
            if (liveTmp.isGP() == (type == Arg::GP))
                addEdge(arg, liveTmp);
        }
...
}

It's not so elegant to hide the liveTmp argument inside the for loop
with using the same variable name. Additionally GCC can't build it:

../../Source/JavaScriptCore/b3/air/AirIteratedRegisterCoalescing.cpp: In instantiation of 'JSC::B3::Air::IteratedRegisterCoalescingAllocator<type>::addEdges(JSC::B3::Air::Inst&, const WTF::HashSet<JSC::B3::Air::Tmp>&)::<lambda(JSC::B3::Air::Tmp&)> [with JSC::B3::Air::Arg::Type type = (JSC::B3::Air::Arg::Type)0]':
../../Source/JavaScriptCore/b3/air/AirIteratedRegisterCoalescing.cpp:302:53:   required from 'struct JSC::B3::Air::IteratedRegisterCoalescingAllocator<type>::addEdges(JSC::B3::Air::Inst&, const WTF::HashSet<JSC::B3::Air::Tmp>&) [with JSC::B3::Air::Arg::Type type = (JSC::B3::Air::Arg::Type)0]::<lambda(class JSC::B3::Air::Tmp&)>'
../../Source/JavaScriptCore/b3/air/AirIteratedRegisterCoalescing.cpp:302:9:   required from 'void JSC::B3::Air::IteratedRegisterCoalescingAllocator<type>::addEdges(JSC::B3::Air::Inst&, const WTF::HashSet<JSC::B3::Air::Tmp>&) [with JSC::B3::Air::Arg::Type type = (JSC::B3::Air::Arg::Type)0]'
../../Source/JavaScriptCore/b3/air/AirIteratedRegisterCoalescing.cpp:199:44:   required from 'void JSC::B3::Air::IteratedRegisterCoalescingAllocator<type>::build(JSC::B3::Air::Inst&, const JSC::B3::Air::Liveness<JSC::B3::Air::Tmp>::LocalCalc&) [with JSC::B3::Air::Arg::Type type = (JSC::B3::Air::Arg::Type)0]'
../../Source/JavaScriptCore/b3/air/AirIteratedRegisterCoalescing.cpp:1072:50:   required from here
../../Source/JavaScriptCore/b3/air/AirIteratedRegisterCoalescing.cpp:303:13: error: 'begin' was not declared in this scope

...

[Csaba Osztrogonác]

Created attachment 266181 [details]
Patch

[WebKit Commit Bot]

Comment on attachment 266181 [details]
Patch

Rejecting attachment 266181 [details] from commit-queue.

Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-01', 'apply-attachment', '--no-update', '--non-interactive', 266181, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit

Last 500 characters of output:
EWS/WebKit

Parsed 2 diffs from patch file(s).
patching file Source/JavaScriptCore/ChangeLog
Hunk #1 succeeded at 1 with fuzz 3.
patching file Source/JavaScriptCore/b3/air/AirIteratedRegisterCoalescing.cpp
Hunk #1 FAILED at 296.
1 out of 1 hunk FAILED -- saving rejects to file Source/JavaScriptCore/b3/air/AirIteratedRegisterCoalescing.cpp.rej

Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Darin Adler']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit

Full output: http://webkit-queues.webkit.org/results/500210

[Csaba Osztrogonác]

Created attachment 266337 [details]
Patch for landing

[WebKit Commit Bot]

Comment on attachment 266337 [details]
Patch for landing

Clearing flags on attachment: 266337

Committed r192873: <http://trac.webkit.org/changeset/192873>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.