151622 2015-11-26 05:53:48 -0800 Don't hide the argument name inside for block in AirIteratedRegisterCoalescing.cpp 2016-02-12 04:21:23 -0800 1 1 1 Unclassified WebKit JavaScriptCore Other Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=154162 P2 Normal --- 152248 1 ossy ossy benjamin commit-queue fpizlo ggaren keith_miller mark.lam msaboff saam oldest_to_newest 1144498 0 ossy 2015-11-26 05:53:48 -0800 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 ... 1144499 1 266181 ossy 2015-11-26 05:58:05 -0800 Created attachment 266181 Patch 1145133 2 266181 commit-queue 2015-11-30 22:14:23 -0800 Comment on attachment 266181 Patch Rejecting attachment 266181 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 1145164 3 266337 ossy 2015-12-01 00:08:49 -0800 Created attachment 266337 Patch for landing 1145180 4 266337 commit-queue 2015-12-01 01:05:50 -0800 Comment on attachment 266337 Patch for landing Clearing flags on attachment: 266337 Committed r192873: <http://trac.webkit.org/changeset/192873> 1145181 5 commit-queue 2015-12-01 01:05:54 -0800 All reviewed patches have been landed. Closing bug. 266181 2015-11-26 05:58:05 -0800 2015-12-01 00:08:43 -0800 Patch bug-151622-20151126145747.patch text/plain 1782 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTkyNzcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA2 NDRkNzZiNzBkZjdhNGIyN2Q0YmI4OTVhYTg1ZTM5NWE5MWE3MDNlLi4zYWQyMjg4Y2ZmNGY5MDI4 ZmE4ODg1MjUzNmVlNmJmZGVjNDM3MTlmIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMyBAQAorMjAxNS0xMS0yNiAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQu b3JnPgorCisgICAgICAgIERvbid0IGhpZGUgdGhlIGFyZ3VtZW50IG5hbWUgaW5zaWRlIGZvciBi bG9jayBpbiBBaXJJdGVyYXRlZFJlZ2lzdGVyQ29hbGVzY2luZy5jcHAKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MTYyMgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogYjMvYWlyL0Fpckl0ZXJhdGVkUmVn aXN0ZXJDb2FsZXNjaW5nLmNwcDoKKyAgICAgICAgKEpTQzo6QjM6OkFpcjo6SXRlcmF0ZWRSZWdp c3RlckNvYWxlc2NpbmdBbGxvY2F0b3I6OmFkZEVkZ2VzKToKKwogMjAxNS0xMS0yNCAgQ2FpdGxp biBQb3R0ZXIgIDxjYWl0cEBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtKU0NdIHN1cHBvcnQgQ29t cHV0ZWQgUHJvcGVydHkgTmFtZXMgaW4gZGVzdHJ1Y3R1cmluZyBQYXR0ZXJucwpkaWZmIC0tZ2l0 IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2IzL2Fpci9BaXJJdGVyYXRlZFJlZ2lzdGVyQ29hbGVz Y2luZy5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYjMvYWlyL0Fpckl0ZXJhdGVkUmVnaXN0 ZXJDb2FsZXNjaW5nLmNwcAppbmRleCA4ZWY4ZDE3NWE5MGI4NjYyNWE1ZmY1OWRhMTRlN2MyZTFh NzI4MWY2Li40Y2JlNjM5NzU4ZGRmMTBkNTNhMTBkM2MwNmJjYmNkOGE4OWRmZjM4IDEwMDY0NAot LS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYjMvYWlyL0Fpckl0ZXJhdGVkUmVnaXN0ZXJDb2Fs ZXNjaW5nLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYjMvYWlyL0Fpckl0ZXJhdGVk UmVnaXN0ZXJDb2FsZXNjaW5nLmNwcApAQCAtMjk2LDExICsyOTYsMTEgQEAgcHJpdmF0ZToKICAg ICAgICAgYnplcm8obV9kZWdyZWVzLmRhdGEoKSArIGZpcnN0Tm9uUmVnSW5kZXgsICh0bXBBcnJh eVNpemUgLSBmaXJzdE5vblJlZ0luZGV4KSAqIHNpemVvZih1bnNpZ25lZCkpOwogICAgIH0KIAot ICAgIHZvaWQgYWRkRWRnZXMoSW5zdCYgaW5zdCwgY29uc3QgSGFzaFNldDxUbXA+JiBsaXZlVG1w KQorICAgIHZvaWQgYWRkRWRnZXMoSW5zdCYgaW5zdCwgY29uc3QgSGFzaFNldDxUbXA+JiBsaXZl VG1wcykKICAgICB7CiAgICAgICAgIC8vIEFsbCB0aGUgRGVmKClzIGludGVyZmVyZSB3aXRoIGV2 ZXJ0aGluZyBsaXZlLgogICAgICAgICBpbnN0LmZvckVhY2hEZWZBbmRFeHRyYUNsb2JiZXJlZFRt cCh0eXBlLCBbJl0gKFRtcCYgYXJnKSB7Ci0gICAgICAgICAgICBmb3IgKGNvbnN0IFRtcCYgbGl2 ZVRtcCA6IGxpdmVUbXApIHsKKyAgICAgICAgICAgIGZvciAoY29uc3QgVG1wJiBsaXZlVG1wIDog bGl2ZVRtcHMpIHsKICAgICAgICAgICAgICAgICBpZiAobGl2ZVRtcC5pc0dQKCkgPT0gKHR5cGUg PT0gQXJnOjpHUCkpCiAgICAgICAgICAgICAgICAgICAgIGFkZEVkZ2UoYXJnLCBsaXZlVG1wKTsK ICAgICAgICAgICAgIH0K 266337 2015-12-01 00:08:49 -0800 2015-12-01 01:05:50 -0800 Patch for landing bug-151622-20151201000826.patch text/plain 1950 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTkyODYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA2 N2Y5ZDdmMTQzM2ZiODU1OTFmNTEzOGExYzY2OTA4NmQ5MDFhOWU5Li41MzRmZTkwOGI1NDFlZDZj Y2Q1MjVlYmVlMjAyMzhjZjg2MDlmZmQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMyBAQAorMjAxNS0xMi0wMSAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQu b3JnPgorCisgICAgICAgIERvbid0IGhpZGUgdGhlIGFyZ3VtZW50IG5hbWUgaW5zaWRlIGZvciBi bG9jayBpbiBBaXJJdGVyYXRlZFJlZ2lzdGVyQ29hbGVzY2luZy5jcHAKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MTYyMgorCisgICAgICAgIFJldmll d2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgICogYjMvYWlyL0Fpckl0ZXJhdGVkUmVnaXN0 ZXJDb2FsZXNjaW5nLmNwcDoKKyAgICAgICAgKEpTQzo6QjM6OkFpcjo6SXRlcmF0ZWRSZWdpc3Rl ckNvYWxlc2NpbmdBbGxvY2F0b3I6OmFkZEVkZ2VzKToKKwogMjAxNS0xMS0zMCAgRmlsaXAgUGl6 bG8gIDxmcGl6bG9AYXBwbGUuY29tPgogCiAgICAgICAgIEIzOjpWYWx1ZVJlcDo6QW55IHNob3Vs ZCB0cmFuc2xhdGUgaW50byBhIEFyZzo6Q29sZFVzZSByb2xlIGluIEFpcgpkaWZmIC0tZ2l0IGEv U291cmNlL0phdmFTY3JpcHRDb3JlL2IzL2Fpci9BaXJJdGVyYXRlZFJlZ2lzdGVyQ29hbGVzY2lu Zy5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYjMvYWlyL0Fpckl0ZXJhdGVkUmVnaXN0ZXJD b2FsZXNjaW5nLmNwcAppbmRleCBmNzRjMjMyMjhjZmY2MmRlYmQwODJhMThlNGYxZTQ1ODVlNDEx NDE0Li5lNTFhNTYzODk3ZTdjYjQ2MmQ3ZDZmMzFiNzg2NmNjZWUyODMzMWJkIDEwMDY0NAotLS0g YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYjMvYWlyL0Fpckl0ZXJhdGVkUmVnaXN0ZXJDb2FsZXNj aW5nLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYjMvYWlyL0Fpckl0ZXJhdGVkUmVn aXN0ZXJDb2FsZXNjaW5nLmNwcApAQCAtMjQ3LDcgKzI0Nyw3IEBAIHByaXZhdGU6CiAgICAgICAg ICAgICBhZGRFZGdlcyhpbnN0LCBuZXh0SW5zdCwgbG9jYWxDYWxjLmxpdmUoKSk7CiAgICAgfQog Ci0gICAgdm9pZCBhZGRFZGdlcyhJbnN0JiBpbnN0LCBJbnN0KiBuZXh0SW5zdCwgdHlwZW5hbWUg VG1wTGl2ZW5lc3M8dHlwZT46OkxvY2FsQ2FsYzo6SXRlcmFibGUgbGl2ZVRtcCkKKyAgICB2b2lk IGFkZEVkZ2VzKEluc3QmIGluc3QsIEluc3QqIG5leHRJbnN0LCB0eXBlbmFtZSBUbXBMaXZlbmVz czx0eXBlPjo6TG9jYWxDYWxjOjpJdGVyYWJsZSBsaXZlVG1wcykKICAgICB7CiAgICAgICAgIC8v IEFsbCB0aGUgRGVmKClzIGludGVyZmVyZSB3aXRoIGV2ZXJ0aGluZyBsaXZlLgogICAgICAgICBp bnN0LmZvckVhY2hUbXBXaXRoRXh0cmFDbG9iYmVyZWRSZWdzKApAQCAtMjU2LDcgKzI1Niw3IEBA IHByaXZhdGU6CiAgICAgICAgICAgICAgICAgaWYgKCFBcmc6OmlzRGVmKHJvbGUpIHx8IGFyZ1R5 cGUgIT0gdHlwZSkKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgICAg IAotICAgICAgICAgICAgICAgIGZvciAoY29uc3QgVG1wJiBsaXZlVG1wIDogbGl2ZVRtcCkgewor ICAgICAgICAgICAgICAgIGZvciAoY29uc3QgVG1wJiBsaXZlVG1wIDogbGl2ZVRtcHMpIHsKICAg ICAgICAgICAgICAgICAgICAgaWYgKGxpdmVUbXAuaXNHUCgpID09ICh0eXBlID09IEFyZzo6R1Ap KQogICAgICAgICAgICAgICAgICAgICAgICAgYWRkRWRnZShhcmcsIGxpdmVUbXApOwogICAgICAg ICAgICAgICAgIH0K