121994 2013-09-26 16:14:51 -0700 Workaround template overloading bug in MSVC 2013-09-27 11:35:03 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) PC Windows 7 RESOLVED FIXED P2 Minor --- 0 alex.christensen webkit-unassigned commit-queue fpizlo msaboff oliver oldest_to_newest 933771 0 alex.christensen 2013-09-26 16:14:51 -0700 r156184 broke the Win64 build because of a bug in Visual Studio similar to http://stackoverflow.com/questions/8684583/template-specialization-works-with-g-but-not-with-visual-c A simple workaround is to name setupTwoStubArgs either setupTwoStubArgsGFR or setupTwoStubArgsFPR instead of sharing the name for the overloaded template function. 933773 1 212765 alex.christensen 2013-09-26 16:18:25 -0700 Created attachment 212765 Patch 933837 2 alex.christensen 2013-09-26 19:27:47 -0700 By the way, this didn't break the Win32 build because the second one is protected by #if CPU(X86_64), so Visual Studio did not see an overloaded template function with different enum types, which makes the Visual Studio bug cause a compile error. 934027 3 212765 commit-queue 2013-09-27 11:35:02 -0700 Comment on attachment 212765 Patch Clearing flags on attachment: 212765 Committed r156559: <http://trac.webkit.org/changeset/156559> 934028 4 commit-queue 2013-09-27 11:35:03 -0700 All reviewed patches have been landed. Closing bug. 212765 2013-09-26 16:18:25 -0700 2013-09-27 11:35:02 -0700 Patch bug-121994-20130926172002.patch text/plain 6229 alex.christensen SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTU2NTEyKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBA CisyMDEzLTA5LTI2ICBBbGV4IENocmlzdGVuc2VuICA8YWxleC5jaHJpc3RlbnNlbkBmbGV4c2lt LmNvbT4KKworICAgICAgICBGaXhlZCBXaW42NCBidWlsZCBhZnRlciByMTU2MTg0LgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIxOTk0CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBqaXQvQ0NhbGxIZWxw ZXJzLmg6CisgICAgICAgIChKU0M6OkNDYWxsSGVscGVyczo6c2V0dXBUd29TdHViQXJnc0dQUik6 CisgICAgICAgIChKU0M6OkNDYWxsSGVscGVyczo6c2V0dXBUd29TdHViQXJnc0ZQUik6CisgICAg ICAgIFJlbmFtZWQgZnJvbSBzZXR1cFR3b1N0dWJBcmdzLgorICAgICAgICBWaXN1YWwgU3R1ZGlv IHg2NCBjb21waWxlciBmYWlscyB0byBzZWUgdGhhdCB0aGlzIGlzIGFuIG92ZXJsb2FkZWQgdGVt cGxhdGUgZnVuY3Rpb24uCisgICAgICAgIChKU0M6OkNDYWxsSGVscGVyczo6c2V0dXBTdHViQXJn dW1lbnRzKToKKyAgICAgICAgKEpTQzo6Q0NhbGxIZWxwZXJzOjpzZXR1cEFyZ3VtZW50cyk6Cisg ICAgICAgIChKU0M6OkNDYWxsSGVscGVyczo6c2V0dXBBcmd1bWVudHNXaXRoRXhlY1N0YXRlKToK KyAgICAgICAgVXNlIHNldHVwVHdvU3R1YkFyZ3NHUFIgb3Igc2V0dXBUd29TdHViQXJnc0ZQUiBp bnN0ZWFkIG9mIHNldHVwVHdvU3R1YkFyZ3MuCisKIDIwMTMtMDktMjYgIE1pY2hhZWwgU2Fib2Zm ICA8bXNhYm9mZkBhcHBsZS5jb20+CiAKICAgICAgICAgVmlydHVhbFJlZ2lzdGVyIHNob3VsZCBi ZSBhIGNsYXNzCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0NDYWxsSGVscGVycy5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvQ0NhbGxIZWxwZXJzLmgJ KHJldmlzaW9uIDE1NjQ5NCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvQ0NhbGxIZWxw ZXJzLmgJKHdvcmtpbmcgY29weSkKQEAgLTM2Nyw3ICszNjcsNyBAQCBwdWJsaWM6CiAgICAgLy8g YXQgbGVhc3QgNCBhcmd1bWVudCByZWdpc3RlcnMsIGUuZy4gWDg2XzY0LCBBUk12Ny4KICNpZiBO VU1CRVJfT0ZfQVJHVU1FTlRfUkVHSVNURVJTID49IDQKICAgICB0ZW1wbGF0ZTxHUFJSZWcgZGVz dEEsIEdQUlJlZyBkZXN0Qj4KLSAgICB2b2lkIHNldHVwVHdvU3R1YkFyZ3MoR1BSUmVnIHNyY0Es IEdQUlJlZyBzcmNCKQorICAgIHZvaWQgc2V0dXBUd29TdHViQXJnc0dQUihHUFJSZWcgc3JjQSwg R1BSUmVnIHNyY0IpCiAgICAgewogICAgICAgICAvLyBBc3N1bWluZyB0aGF0IHNyY0EgIT0gc3Jj QiwgdGhlcmUgYXJlIDcgaW50ZXJlc3Rpbmcgc3RhdGVzIHRoZSByZWdpc3RlcnMgbWF5IGJlIGlu OgogICAgICAgICAvLyAoMSkgYm90aCBhcmUgYWxyZWFkeSBpbiBhcmcgcmVncywgdGhlIHJpZ2h0 IHdheSBhcm91bmQuCkBAIC0zOTYsNyArMzk2LDcgQEAgcHVibGljOgogICAgIH0KICNpZiBDUFUo WDg2XzY0KQogICAgIHRlbXBsYXRlPEZQUlJlZyBkZXN0QSwgRlBSUmVnIGRlc3RCPgotICAgIHZv aWQgc2V0dXBUd29TdHViQXJncyhGUFJSZWcgc3JjQSwgRlBSUmVnIHNyY0IpCisgICAgdm9pZCBz ZXR1cFR3b1N0dWJBcmdzRlBSKEZQUlJlZyBzcmNBLCBGUFJSZWcgc3JjQikKICAgICB7CiAgICAg ICAgIC8vIEFzc3VtaW5nIHRoYXQgc3JjQSAhPSBzcmNCLCB0aGVyZSBhcmUgNyBpbnRlcmVzdGlu ZyBzdGF0ZXMgdGhlIHJlZ2lzdGVycyBtYXkgYmUgaW46CiAgICAgICAgIC8vICgxKSBib3RoIGFy ZSBhbHJlYWR5IGluIGFyZyByZWdzLCB0aGUgcmlnaHQgd2F5IGFyb3VuZC4KQEAgLTQ0NCw3ICs0 NDQsNyBAQCBwdWJsaWM6CiAjZW5kaWYKICAgICB2b2lkIHNldHVwU3R1YkFyZ3VtZW50cyhHUFJS ZWcgYXJnMSwgR1BSUmVnIGFyZzIpCiAgICAgewotICAgICAgICBzZXR1cFR3b1N0dWJBcmdzPEdQ UkluZm86OmFyZ3VtZW50R1BSMSwgR1BSSW5mbzo6YXJndW1lbnRHUFIyPihhcmcxLCBhcmcyKTsK KyAgICAgICAgc2V0dXBUd29TdHViQXJnc0dQUjxHUFJJbmZvOjphcmd1bWVudEdQUjEsIEdQUklu Zm86OmFyZ3VtZW50R1BSMj4oYXJnMSwgYXJnMik7CiAgICAgfQogICAgIHZvaWQgc2V0dXBTdHVi QXJndW1lbnRzKEdQUlJlZyBhcmcxLCBHUFJSZWcgYXJnMiwgR1BSUmVnIGFyZzMpCiAgICAgewpA QCAtNDUyLDcgKzQ1Miw3IEBAIHB1YmxpYzoKICAgICAgICAgLy8gVGhlbiB3ZSBjYW4gdXNlIHNl dHVwVHdvU3R1YkFyZ3MgdG8gZml4IGFyZzIvYXJnMy4KICAgICAgICAgaWYgKGFyZzIgIT0gR1BS SW5mbzo6YXJndW1lbnRHUFIxICYmIGFyZzMgIT0gR1BSSW5mbzo6YXJndW1lbnRHUFIxKSB7CiAg ICAgICAgICAgICBtb3ZlKGFyZzEsIEdQUkluZm86OmFyZ3VtZW50R1BSMSk7Ci0gICAgICAgICAg ICBzZXR1cFR3b1N0dWJBcmdzPEdQUkluZm86OmFyZ3VtZW50R1BSMiwgR1BSSW5mbzo6YXJndW1l bnRHUFIzPihhcmcyLCBhcmczKTsKKyAgICAgICAgICAgIHNldHVwVHdvU3R1YkFyZ3NHUFI8R1BS SW5mbzo6YXJndW1lbnRHUFIyLCBHUFJJbmZvOjphcmd1bWVudEdQUjM+KGFyZzIsIGFyZzMpOwog ICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKQEAgLTQ2MCw3ICs0NjAsNyBAQCBwdWJs aWM6CiAgICAgICAgIC8vIFRoZW4gd2UgY2FuIHVzZSBzZXR1cFR3b1N0dWJBcmdzIHRvIGZpeCBh cmcxL2FyZzMuCiAgICAgICAgIGlmIChhcmcxICE9IEdQUkluZm86OmFyZ3VtZW50R1BSMiAmJiBh cmczICE9IEdQUkluZm86OmFyZ3VtZW50R1BSMikgewogICAgICAgICAgICAgbW92ZShhcmcyLCBH UFJJbmZvOjphcmd1bWVudEdQUjIpOwotICAgICAgICAgICAgc2V0dXBUd29TdHViQXJnczxHUFJJ bmZvOjphcmd1bWVudEdQUjEsIEdQUkluZm86OmFyZ3VtZW50R1BSMz4oYXJnMSwgYXJnMyk7Cisg ICAgICAgICAgICBzZXR1cFR3b1N0dWJBcmdzR1BSPEdQUkluZm86OmFyZ3VtZW50R1BSMSwgR1BS SW5mbzo6YXJndW1lbnRHUFIzPihhcmcxLCBhcmczKTsKICAgICAgICAgICAgIHJldHVybjsKICAg ICAgICAgfQogCkBAIC00NjgsNyArNDY4LDcgQEAgcHVibGljOgogICAgICAgICAvLyBUaGVuIHdl IGNhbiB1c2Ugc2V0dXBUd29TdHViQXJncyB0byBmaXggYXJnMS9hcmcyLgogICAgICAgICBpZiAo YXJnMSAhPSBHUFJJbmZvOjphcmd1bWVudEdQUjMgJiYgYXJnMiAhPSBHUFJJbmZvOjphcmd1bWVu dEdQUjMpIHsKICAgICAgICAgICAgIG1vdmUoYXJnMywgR1BSSW5mbzo6YXJndW1lbnRHUFIzKTsK LSAgICAgICAgICAgIHNldHVwVHdvU3R1YkFyZ3M8R1BSSW5mbzo6YXJndW1lbnRHUFIxLCBHUFJJ bmZvOjphcmd1bWVudEdQUjI+KGFyZzEsIGFyZzIpOworICAgICAgICAgICAgc2V0dXBUd29TdHVi QXJnc0dQUjxHUFJJbmZvOjphcmd1bWVudEdQUjEsIEdQUkluZm86OmFyZ3VtZW50R1BSMj4oYXJn MSwgYXJnMik7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIApAQCAtNTEyLDcgKzUx Miw3IEBAIHB1YmxpYzoKIAogICAgIEFMV0FZU19JTkxJTkUgdm9pZCBzZXR1cEFyZ3VtZW50cyhG UFJSZWcgYXJnMSwgRlBSUmVnIGFyZzIpCiAgICAgewotICAgICAgICBzZXR1cFR3b1N0dWJBcmdz PEZQUkluZm86OmFyZ3VtZW50RlBSMCwgRlBSSW5mbzo6YXJndW1lbnRGUFIxPihhcmcxLCBhcmcy KTsKKyAgICAgICAgc2V0dXBUd29TdHViQXJnc0ZQUjxGUFJJbmZvOjphcmd1bWVudEZQUjAsIEZQ UkluZm86OmFyZ3VtZW50RlBSMT4oYXJnMSwgYXJnMik7CiAgICAgfQogICAgIAogICAgIEFMV0FZ U19JTkxJTkUgdm9pZCBzZXR1cEFyZ3VtZW50c1dpdGhFeGVjU3RhdGUoRlBSUmVnIGFyZzEsIEdQ UlJlZyBhcmcyKQpAQCAtNzA5LDcgKzcwOSw3IEBAIHB1YmxpYzoKIAogICAgIEFMV0FZU19JTkxJ TkUgdm9pZCBzZXR1cEFyZ3VtZW50cyhHUFJSZWcgYXJnMSwgR1BSUmVnIGFyZzIpCiAgICAgewot ICAgICAgICBzZXR1cFR3b1N0dWJBcmdzPEdQUkluZm86OmFyZ3VtZW50R1BSMCwgR1BSSW5mbzo6 YXJndW1lbnRHUFIxPihhcmcxLCBhcmcyKTsKKyAgICAgICAgc2V0dXBUd29TdHViQXJnc0dQUjxH UFJJbmZvOjphcmd1bWVudEdQUjAsIEdQUkluZm86OmFyZ3VtZW50R1BSMT4oYXJnMSwgYXJnMik7 CiAgICAgfQogICAgIAogICAgIEFMV0FZU19JTkxJTkUgdm9pZCBzZXR1cEFyZ3VtZW50cyhUcnVz dGVkSW1tUHRyIGFyZzEpCkBAIC04MzgsNyArODM4LDcgQEAgcHVibGljOgogCiAgICAgQUxXQVlT X0lOTElORSB2b2lkIHNldHVwQXJndW1lbnRzV2l0aEV4ZWNTdGF0ZShHUFJSZWcgYXJnMSwgVHJ1 c3RlZEltbTMyIGFyZzIsIEdQUlJlZyBhcmczKQogICAgIHsKLSAgICAgICAgc2V0dXBUd29TdHVi QXJnczxHUFJJbmZvOjphcmd1bWVudEdQUjEsIEdQUkluZm86OmFyZ3VtZW50R1BSMz4oYXJnMSwg YXJnMyk7CisgICAgICAgIHNldHVwVHdvU3R1YkFyZ3NHUFI8R1BSSW5mbzo6YXJndW1lbnRHUFIx LCBHUFJJbmZvOjphcmd1bWVudEdQUjM+KGFyZzEsIGFyZzMpOwogICAgICAgICBtb3ZlKGFyZzIs IEdQUkluZm86OmFyZ3VtZW50R1BSMik7CiAgICAgICAgIG1vdmUoR1BSSW5mbzo6Y2FsbEZyYW1l UmVnaXN0ZXIsIEdQUkluZm86OmFyZ3VtZW50R1BSMCk7CiAgICAgfQpAQCAtOTAwLDE0ICs5MDAs MTQgQEAgcHVibGljOgogCiAgICAgQUxXQVlTX0lOTElORSB2b2lkIHNldHVwQXJndW1lbnRzV2l0 aEV4ZWNTdGF0ZShUcnVzdGVkSW1tMzIgYXJnMSwgR1BSUmVnIGFyZzIsIEdQUlJlZyBhcmczKQog ICAgIHsKLSAgICAgICAgc2V0dXBUd29TdHViQXJnczxHUFJJbmZvOjphcmd1bWVudEdQUjIsIEdQ UkluZm86OmFyZ3VtZW50R1BSMz4oYXJnMiwgYXJnMyk7CisgICAgICAgIHNldHVwVHdvU3R1YkFy Z3NHUFI8R1BSSW5mbzo6YXJndW1lbnRHUFIyLCBHUFJJbmZvOjphcmd1bWVudEdQUjM+KGFyZzIs IGFyZzMpOwogICAgICAgICBtb3ZlKGFyZzEsIEdQUkluZm86OmFyZ3VtZW50R1BSMSk7CiAgICAg ICAgIG1vdmUoR1BSSW5mbzo6Y2FsbEZyYW1lUmVnaXN0ZXIsIEdQUkluZm86OmFyZ3VtZW50R1BS MCk7CiAgICAgfQogCiAgICAgQUxXQVlTX0lOTElORSB2b2lkIHNldHVwQXJndW1lbnRzV2l0aEV4 ZWNTdGF0ZShUcnVzdGVkSW1tUHRyIGFyZzEsIEdQUlJlZyBhcmcyLCBHUFJSZWcgYXJnMykKICAg ICB7Ci0gICAgICAgIHNldHVwVHdvU3R1YkFyZ3M8R1BSSW5mbzo6YXJndW1lbnRHUFIyLCBHUFJJ bmZvOjphcmd1bWVudEdQUjM+KGFyZzIsIGFyZzMpOworICAgICAgICBzZXR1cFR3b1N0dWJBcmdz R1BSPEdQUkluZm86OmFyZ3VtZW50R1BSMiwgR1BSSW5mbzo6YXJndW1lbnRHUFIzPihhcmcyLCBh cmczKTsKICAgICAgICAgbW92ZShhcmcxLCBHUFJJbmZvOjphcmd1bWVudEdQUjEpOwogICAgICAg ICBtb3ZlKEdQUkluZm86OmNhbGxGcmFtZVJlZ2lzdGVyLCBHUFJJbmZvOjphcmd1bWVudEdQUjAp OwogICAgIH0KQEAgLTEwNjEsNyArMTA2MSw3IEBAIHB1YmxpYzoKICNpZiBOVU1CRVJfT0ZfQVJH VU1FTlRfUkVHSVNURVJTID49IDUKICAgICBBTFdBWVNfSU5MSU5FIHZvaWQgc2V0dXBBcmd1bWVu dHNXaXRoRXhlY1N0YXRlKEdQUlJlZyBhcmcxLCBUcnVzdGVkSW1tUHRyIGFyZzIsIFRydXN0ZWRJ bW0zMiBhcmczLCBHUFJSZWcgYXJnNCkKICAgICB7Ci0gICAgICAgIHNldHVwVHdvU3R1YkFyZ3M8 R1BSSW5mbzo6YXJndW1lbnRHUFIxLCBHUFJJbmZvOjphcmd1bWVudEdQUjQ+KGFyZzEsIGFyZzQp OworICAgICAgICBzZXR1cFR3b1N0dWJBcmdzR1BSPEdQUkluZm86OmFyZ3VtZW50R1BSMSwgR1BS SW5mbzo6YXJndW1lbnRHUFI0PihhcmcxLCBhcmc0KTsKICAgICAgICAgbW92ZShhcmcyLCBHUFJJ bmZvOjphcmd1bWVudEdQUjIpOwogICAgICAgICBtb3ZlKGFyZzMsIEdQUkluZm86OmFyZ3VtZW50 R1BSMyk7CiAgICAgICAgIG1vdmUoR1BSSW5mbzo6Y2FsbEZyYW1lUmVnaXN0ZXIsIEdQUkluZm86 OmFyZ3VtZW50R1BSMCk7Cg==