176381 2017-09-05 10:35:54 -0700 [Win] Compile errors in Document::updateTitleElement. 2017-09-11 12:39:03 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pvollan pvollan achristensen bfulgham buildbot cdumez darin dbates esprehn+autocc kangil.han koivisto webkit-bug-importer oldest_to_newest 1345505 0 pvollan 2017-09-05 10:35:54 -0700 c:\cygwin\home\buildbot\slave\win-release\build\source\webcore\dom\Document.cpp(1570): error C2446: ':': no conversion from 'WebCore::Document::updateTitleElement::<lambda_16b62001404c23de7212dde0d19dd8c0>' to 'WebCore::Document::updateTitleElement::<lambda_8c64903d313d33c5fcf4c4945dc4e7bd>' (compiling source file C:\cygwin\home\buildbot\slave\win-release\build\Source\WebCore\dom\DOMAllInOne.cpp) [C:\cygwin\home\buildbot\slave\win-release\build\WebKitBuild\Release\Source\WebCore\WebCore.vcxproj] c:\cygwin\home\buildbot\slave\win-release\build\source\webcore\dom\Document.cpp(1570): note: No user-defined-conversion operator available that can perform this conversion, or the operator cannot be called (compiling source file C:\cygwin\home\buildbot\slave\win-release\build\Source\WebCore\dom\DOMAllInOne.cpp) c:\cygwin\home\buildbot\slave\win-release\build\source\webcore\dom\Document.cpp(1571): error C2446: ':': no conversion from 'WebCore::Document::updateTitleElement::<lambda_b90aca9775183a3a847bb0f92fa5dde7>' to 'WebCore::Document::updateTitleElement::<lambda_5bf19252f147055cda21dc9527885b1b>' (compiling source file C:\cygwin\home\buildbot\slave\win-release\build\Source\WebCore\dom\DOMAllInOne.cpp) [C:\cygwin\home\buildbot\slave\win-release\build\WebKitBuild\Release\Source\WebCore\WebCore.vcxproj] c:\cygwin\home\buildbot\slave\win-release\build\source\webcore\dom\Document.cpp(1571): note: No user-defined-conversion operator available that can perform this conversion, or the operator cannot be called (compiling source file C:\cygwin\home\buildbot\slave\win-release\build\Source\WebCore\dom\DOMAllInOne.cpp) c:\cygwin\home\buildbot\slave\win-release\build\source\webcore\dom\Document.cpp(1572): error C2446: ':': no conversion from 'WebCore::Document::updateTitleElement::<lambda_7d10b9bb64b9bf807f86fa41f4b56cfc>' to 'WebCore::Document::updateTitleElement::<lambda_a2b965e941c6d63acb9048aedb2d8536>' (compiling source file C:\cygwin\home\buildbot\slave\win-release\build\Source\WebCore\dom\DOMAllInOne.cpp) [C:\cygwin\home\buildbot\slave\win-release\build\WebKitBuild\Release\Source\WebCore\WebCore.vcxproj] c:\cygwin\home\buildbot\slave\win-release\build\source\webcore\dom\Document.cpp(1572): note: No user-defined-conversion operator available that can perform this conversion, or the operator cannot be called (compiling source file C:\cygwin\home\buildbot\slave\win-release\build\Source\WebCore\dom\DOMAllInOne.cpp) c:\cygwin\home\buildbot\slave\win-release\build\source\webcore\dom\Document.cpp(1574): error C2064: term does not evaluate to a function taking 1 arguments (compiling source file C:\cygwin\home\buildbot\slave\win-release\build\Source\WebCore\dom\DOMAllInOne.cpp) [C:\cygwin\home\buildbot\slave\win-release\build\WebKitBuild\Release\Source\WebCore\WebCore.vcxproj] c:\cygwin\home\buildbot\slave\win-release\build\source\webcore\dom\Document.cpp(1581): error C2064: term does not evaluate to a function taking 1 arguments (compiling source file C:\cygwin\home\buildbot\slave\win-release\build\Source\WebCore\dom\DOMAllInOne.cpp) [C:\cygwin\home\buildbot\slave\win-release\build\WebKitBuild\Release\Source\WebCore\WebCore.vcxproj] c:\cygwin\home\buildbot\slave\win-release\build\source\webcore\dom\Document.cpp(1585): error C2064: term does not evaluate to a function taking 1 arguments (compiling source file C:\cygwin\home\buildbot\slave\win-release\build\Source\WebCore\dom\DOMAllInOne.cpp) [C:\cygwin\home\buildbot\slave\win-release\build\WebKitBuild\Release\Source\WebCore\WebCore.vcxproj] 1345520 1 319915 pvollan 2017-09-05 11:01:19 -0700 Created attachment 319915 Patch 1345524 2 319916 pvollan 2017-09-05 11:09:24 -0700 Created attachment 319916 Patch 1345533 3 pvollan 2017-09-05 11:21:23 -0700 This has already been fixed. 1345949 4 pvollan 2017-09-06 09:12:20 -0700 I am seeing this compile error again, now. 1345960 5 319916 darin 2017-09-06 09:34:34 -0700 Comment on attachment 319916 Patch This change makes things less efficient and less elegant. But maybe there is no other way to work around the limitations of the Windows compiler. 1345961 6 319916 darin 2017-09-06 09:36:50 -0700 Comment on attachment 319916 Patch A better way to work around this unfortunate limitation of the Windows compiler it is to convert all 6 of the lambdas into plain old functions, outside Document::updateTitleElement, just local functions like: static Element* findHTMLTitle(Document& document) { } 1345968 7 pvollan 2017-09-06 09:49:08 -0700 (In reply to Darin Adler from comment #6) > Comment on attachment 319916 [details] > Patch > > A better way to work around this unfortunate limitation of the Windows > compiler it is to convert all 6 of the lambdas into plain old functions, > outside Document::updateTitleElement, just local functions like: > > static Element* findHTMLTitle(Document& document) > { > } Thanks for reviewing! I will update the patch. 1345979 8 320034 pvollan 2017-09-06 10:01:38 -0700 Created attachment 320034 Patch 1345992 9 320034 achristensen 2017-09-06 10:26:21 -0700 Comment on attachment 320034 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=320034&action=review > Source/WebCore/dom/Document.cpp:1567 > +static bool isSVGTitle(Element& element) > +{ > + return is<SVGTitleElement>(element); Can we not just use is<SVGTitleElement> where we use isSVGTitle instead of making a wrapper? Same with isHTMLTitle 1346005 10 pvollan 2017-09-06 10:49:03 -0700 Committed r221684: <https://trac.webkit.org/changeset/221684/webkit> 1346009 11 pvollan 2017-09-06 10:57:02 -0700 (In reply to Alex Christensen from comment #9) > Comment on attachment 320034 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=320034&action=review > > > Source/WebCore/dom/Document.cpp:1567 > > +static bool isSVGTitle(Element& element) > > +{ > > + return is<SVGTitleElement>(element); > > Can we not just use is<SVGTitleElement> where we use isSVGTitle instead of > making a wrapper? Same with isHTMLTitle isSVGTitle and isHTMLTitle is only used when assigning one of the function pointers to a local variable, I don't think we can use is<SVGTitleElement> there, if I understand you correctly? Thanks for reviewing! 1346125 12 320034 darin 2017-09-06 15:44:44 -0700 Comment on attachment 320034 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=320034&action=review >>> Source/WebCore/dom/Document.cpp:1567 >>> + return is<SVGTitleElement>(element); >> >> Can we not just use is<SVGTitleElement> where we use isSVGTitle instead of making a wrapper? Same with isHTMLTitle > > isSVGTitle and isHTMLTitle is only used when assigning one of the function pointers to a local variable, I don't think we can use is<SVGTitleElement> there, if I understand you correctly? > > Thanks for reviewing! I think we can use is<SVGTitleElement> and is<HTMLTitleElement>. Those are functions--template functions are functions--and can be turned into function pointers. Did you try it? 1346132 13 pvollan 2017-09-06 16:00:56 -0700 (In reply to Darin Adler from comment #12) > Comment on attachment 320034 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=320034&action=review > > >>> Source/WebCore/dom/Document.cpp:1567 > >>> + return is<SVGTitleElement>(element); > >> > >> Can we not just use is<SVGTitleElement> where we use isSVGTitle instead of making a wrapper? Same with isHTMLTitle > > > > isSVGTitle and isHTMLTitle is only used when assigning one of the function pointers to a local variable, I don't think we can use is<SVGTitleElement> there, if I understand you correctly? > > > > Thanks for reviewing! > > I think we can use is<SVGTitleElement> and is<HTMLTitleElement>. Those are > functions--template functions are functions--and can be turned into function > pointers. Did you try it? Yes, I tried it, but this also gave compile errors. MSVC was not able to resolve, since is<> has several overloads. 1346323 14 darin 2017-09-07 08:56:06 -0700 I thought of another way to write this that would be slightly more elegant. Working on a patch for that. 1347546 15 pvollan 2017-09-11 12:39:03 -0700 <rdar://problem/34373638> 319915 2017-09-05 11:01:19 -0700 2017-09-05 11:09:23 -0700 Patch bug-176381-20170905200119.patch text/plain 3743 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyMTYyMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDE3LTA5LTA1ICBQZXIgQXJu ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbV2luXSBDb21waWxlIGVy cm9ycyBpbiBEb2N1bWVudDo6dXBkYXRlVGl0bGVFbGVtZW50LgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc2MzgxCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTVNWQyBpcyBub3QgYWJsZSB0byBjb21waWxl IHRoZSBzdGF0ZW1lbnQ6CisgICAgICAgIGF1dG8gcmVzdWx0ID0gYm9vbEV4cHJlc3Npb24gPyBs YW1iZGExIDogbGFtYmRhMjsKKyAgICAgICAgd2hlcmUgbGFtYmRhMSBhbmQgbGFtYmRhMiBoYXZl IHRoZSBzYW1lIHNpZ25hdHVyZS4KKworICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpEb2N1bWVudDo6dXBkYXRlVGl0bGVFbGVtZW50KToKKwogMjAxNy0wOS0w NSAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1v dmUgc29tZSB1bnVzZWQgYml0cyBvZiBjb2RlIGFuZCByZXNvdXJjZXMKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9t L0RvY3VtZW50LmNwcAkocmV2aXNpb24gMjIxNjE3KQorKysgU291cmNlL1dlYkNvcmUvZG9tL0Rv Y3VtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTU0NCw0NiArMTU0NCwzOSBAQCB2b2lkIERv Y3VtZW50OjpzZXRUaXRsZShjb25zdCBTdHJpbmcmIHRpCiAKIHZvaWQgRG9jdW1lbnQ6OnVwZGF0 ZVRpdGxlRWxlbWVudChFbGVtZW50JiBjaGFuZ2luZ1RpdGxlRWxlbWVudCkKIHsKLSAgICBhdXRv IGZpbmRIVE1MVGl0bGUgPSBbXSAoRG9jdW1lbnQmIGRvY3VtZW50KSAtPiBFbGVtZW50KiB7Cisg ICAgYXV0byBmaW5kVGl0bGUgPSBbXSAoRG9jdW1lbnQmIGRvY3VtZW50LCBib29sIHVzZVNWR1Rp dGxlKSAtPiBFbGVtZW50KiB7CisgICAgICAgIGlmICh1c2VTVkdUaXRsZSkKKyAgICAgICAgICAg IHJldHVybiBkZXNjZW5kYW50c09mVHlwZTxIVE1MVGl0bGVFbGVtZW50Pihkb2N1bWVudCkuZmly c3QoKTsKICAgICAgICAgcmV0dXJuIGRlc2NlbmRhbnRzT2ZUeXBlPEhUTUxUaXRsZUVsZW1lbnQ+ KGRvY3VtZW50KS5maXJzdCgpOwogICAgIH07Ci0gICAgYXV0byBpc0hUTUxUaXRsZSA9IFtdIChF bGVtZW50JiBlbGVtZW50KSB7CisgICAgYXV0byBpc1RpdGxlID0gW10gKEVsZW1lbnQmIGVsZW1l bnQsIGJvb2wgdXNlU1ZHVGl0bGUpIHsKKyAgICAgICAgaWYgKHVzZVNWR1RpdGxlKQorICAgICAg ICAgICAgcmV0dXJuIGlzPFNWR1RpdGxlRWxlbWVudD4oZWxlbWVudCk7CiAgICAgICAgIHJldHVy biBpczxIVE1MVGl0bGVFbGVtZW50PihlbGVtZW50KTsKICAgICB9OwotICAgIGF1dG8gaXNIVE1M VGl0bGVFbGlnaWJsZSA9IFtdIChFbGVtZW50JiBlbGVtZW50KSB7CisgICAgYXV0byBpc1RpdGxl RWxpZ2libGUgPSBbXSAoRWxlbWVudCYgZWxlbWVudCwgYm9vbCB1c2VTVkdUaXRsZSkgeworICAg ICAgICBpZiAodXNlU1ZHVGl0bGUpCisgICAgICAgICAgICByZXR1cm4gZWxlbWVudC5wYXJlbnRO b2RlKCkgPT0gZWxlbWVudC5kb2N1bWVudCgpLmRvY3VtZW50RWxlbWVudCgpOwogICAgICAgICBy ZXR1cm4gZWxlbWVudC5pc0Nvbm5lY3RlZCgpICYmICFlbGVtZW50LmlzSW5TaGFkb3dUcmVlKCk7 CiAgICAgfTsKIAotICAgIGF1dG8gZmluZFNWR1RpdGxlID0gW10gKERvY3VtZW50JiBkb2N1bWVu dCkgLT4gRWxlbWVudCogewotICAgICAgICByZXR1cm4gY2hpbGRyZW5PZlR5cGU8U1ZHVGl0bGVF bGVtZW50PigqZG9jdW1lbnQuZG9jdW1lbnRFbGVtZW50KCkpLmZpcnN0KCk7Ci0gICAgfTsKLSAg ICBhdXRvIGlzU1ZHVGl0bGUgPSBbXSAoRWxlbWVudCYgZWxlbWVudCkgewotICAgICAgICByZXR1 cm4gaXM8U1ZHVGl0bGVFbGVtZW50PihlbGVtZW50KTsKLSAgICB9OwotICAgIGF1dG8gaXNTVkdU aXRsZUVsaWdpYmxlID0gW10gKEVsZW1lbnQmIGVsZW1lbnQpIHsKLSAgICAgICAgcmV0dXJuIGVs ZW1lbnQucGFyZW50Tm9kZSgpID09IGVsZW1lbnQuZG9jdW1lbnQoKS5kb2N1bWVudEVsZW1lbnQo KTsKLSAgICB9OwotCiAgICAgLy8gTW9zdCBkb2N1bWVudHMgdXNlIEhUTUwgdGl0bGUgcnVsZXMu CiAgICAgLy8gRG9jdW1lbnRzIHdpdGggU1ZHIGRvY3VtZW50IGVsZW1lbnRzIHVzZSBTVkcgdGl0 bGUgcnVsZXMuCiAgICAgYm9vbCB1c2VTVkdUaXRsZSA9IGlzPFNWR1NWR0VsZW1lbnQ+KGRvY3Vt ZW50RWxlbWVudCgpKTsKLSAgICBhdXRvIGZpbmRUaXRsZSA9IHVzZVNWR1RpdGxlID8gZmluZFNW R1RpdGxlIDogZmluZEhUTUxUaXRsZTsKLSAgICBhdXRvIGlzVGl0bGUgPSB1c2VTVkdUaXRsZSA/ IGlzU1ZHVGl0bGUgOiBpc0hUTUxUaXRsZTsKLSAgICBhdXRvIGlzVGl0bGVFbGlnaWJsZSA9IHVz ZVNWR1RpdGxlID8gaXNTVkdUaXRsZUVsaWdpYmxlIDogaXNIVE1MVGl0bGVFbGlnaWJsZTsKIAot ICAgIGlmICghaXNUaXRsZShjaGFuZ2luZ1RpdGxlRWxlbWVudCkpIHsKLSAgICAgICAgQVNTRVJU KG1fdGl0bGVFbGVtZW50ID09IGZpbmRUaXRsZSgqdGhpcykpOworICAgIGlmICghaXNUaXRsZShj aGFuZ2luZ1RpdGxlRWxlbWVudCwgdXNlU1ZHVGl0bGUpKSB7CisgICAgICAgIEFTU0VSVChtX3Rp dGxlRWxlbWVudCA9PSBmaW5kVGl0bGUoKnRoaXMsIHVzZVNWR1RpdGxlKSk7CiAgICAgICAgIHJl dHVybjsKICAgICB9CiAKICAgICBFbGVtZW50KiBuZXdUaXRsZUVsZW1lbnQ7CiAgICAgaWYgKG1f dGl0bGVFbGVtZW50KQotICAgICAgICBuZXdUaXRsZUVsZW1lbnQgPSBmaW5kVGl0bGUoKnRoaXMp OworICAgICAgICBuZXdUaXRsZUVsZW1lbnQgPSBmaW5kVGl0bGUoKnRoaXMsIHVzZVNWR1RpdGxl KTsKICAgICBlbHNlIHsKICAgICAgICAgLy8gT3B0aW1pemVkIGNvbW1vbiBjYXNlOiBXZSBoYXZl IG5vIHRpdGxlIGVsZW1lbnQgeWV0LgogICAgICAgICAvLyBXZSBjYW4gZmlndXJlIG91dCB3aGlj aCB0aXRsZSBlbGVtZW50IHNob3VsZCBiZSB1c2VkIHdpdGhvdXQgc2VhcmNoaW5nLgotICAgICAg ICBuZXdUaXRsZUVsZW1lbnQgPSBpc1RpdGxlRWxpZ2libGUoY2hhbmdpbmdUaXRsZUVsZW1lbnQp ID8gJmNoYW5naW5nVGl0bGVFbGVtZW50IDogbnVsbHB0cjsKLSAgICAgICAgQVNTRVJUKG5ld1Rp dGxlRWxlbWVudCA9PSBmaW5kVGl0bGUoKnRoaXMpKTsKKyAgICAgICAgbmV3VGl0bGVFbGVtZW50 ID0gaXNUaXRsZUVsaWdpYmxlKGNoYW5naW5nVGl0bGVFbGVtZW50LCB1c2VTVkdUaXRsZSkgPyAm Y2hhbmdpbmdUaXRsZUVsZW1lbnQgOiBudWxscHRyOworICAgICAgICBBU1NFUlQobmV3VGl0bGVF bGVtZW50ID09IGZpbmRUaXRsZSgqdGhpcywgdXNlU1ZHVGl0bGUpKTsKICAgICB9CiAKICAgICBp ZiAobV90aXRsZUVsZW1lbnQgPT0gbmV3VGl0bGVFbGVtZW50KQo= 319916 2017-09-05 11:09:24 -0700 2017-09-06 10:01:37 -0700 Patch bug-176381-20170905200923.patch text/plain 3758 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyMTYyMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDE3LTA5LTA1ICBQZXIgQXJu ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbV2luXSBDb21waWxlIGVy cm9ycyBpbiBEb2N1bWVudDo6dXBkYXRlVGl0bGVFbGVtZW50LgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc2MzgxCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTVNWQyBpcyBub3QgYWJsZSB0byBjb21waWxl IHRoZSBzdGF0ZW1lbnQ6CisgICAgICAgIGF1dG8gcmVzdWx0ID0gYm9vbEV4cHJlc3Npb24gPyBs YW1iZGExIDogbGFtYmRhMjsKKyAgICAgICAgd2hlcmUgbGFtYmRhMSBhbmQgbGFtYmRhMiBoYXZl IHRoZSBzYW1lIHNpZ25hdHVyZS4KKworICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpEb2N1bWVudDo6dXBkYXRlVGl0bGVFbGVtZW50KToKKwogMjAxNy0wOS0w NSAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1v dmUgc29tZSB1bnVzZWQgYml0cyBvZiBjb2RlIGFuZCByZXNvdXJjZXMKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9t L0RvY3VtZW50LmNwcAkocmV2aXNpb24gMjIxNjE3KQorKysgU291cmNlL1dlYkNvcmUvZG9tL0Rv Y3VtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTU0NCw0NiArMTU0NCwzOSBAQCB2b2lkIERv Y3VtZW50OjpzZXRUaXRsZShjb25zdCBTdHJpbmcmIHRpCiAKIHZvaWQgRG9jdW1lbnQ6OnVwZGF0 ZVRpdGxlRWxlbWVudChFbGVtZW50JiBjaGFuZ2luZ1RpdGxlRWxlbWVudCkKIHsKLSAgICBhdXRv IGZpbmRIVE1MVGl0bGUgPSBbXSAoRG9jdW1lbnQmIGRvY3VtZW50KSAtPiBFbGVtZW50KiB7Cisg ICAgYXV0byBmaW5kVGl0bGUgPSBbXSAoRG9jdW1lbnQmIGRvY3VtZW50LCBib29sIHVzZVNWR1Rp dGxlKSAtPiBFbGVtZW50KiB7CisgICAgICAgIGlmICh1c2VTVkdUaXRsZSkKKyAgICAgICAgICAg IHJldHVybiBjaGlsZHJlbk9mVHlwZTxTVkdUaXRsZUVsZW1lbnQ+KCpkb2N1bWVudC5kb2N1bWVu dEVsZW1lbnQoKSkuZmlyc3QoKTsKICAgICAgICAgcmV0dXJuIGRlc2NlbmRhbnRzT2ZUeXBlPEhU TUxUaXRsZUVsZW1lbnQ+KGRvY3VtZW50KS5maXJzdCgpOwogICAgIH07Ci0gICAgYXV0byBpc0hU TUxUaXRsZSA9IFtdIChFbGVtZW50JiBlbGVtZW50KSB7CisgICAgYXV0byBpc1RpdGxlID0gW10g KEVsZW1lbnQmIGVsZW1lbnQsIGJvb2wgdXNlU1ZHVGl0bGUpIHsKKyAgICAgICAgaWYgKHVzZVNW R1RpdGxlKQorICAgICAgICAgICAgcmV0dXJuIGlzPFNWR1RpdGxlRWxlbWVudD4oZWxlbWVudCk7 CiAgICAgICAgIHJldHVybiBpczxIVE1MVGl0bGVFbGVtZW50PihlbGVtZW50KTsKICAgICB9Owot ICAgIGF1dG8gaXNIVE1MVGl0bGVFbGlnaWJsZSA9IFtdIChFbGVtZW50JiBlbGVtZW50KSB7Cisg ICAgYXV0byBpc1RpdGxlRWxpZ2libGUgPSBbXSAoRWxlbWVudCYgZWxlbWVudCwgYm9vbCB1c2VT VkdUaXRsZSkgeworICAgICAgICBpZiAodXNlU1ZHVGl0bGUpCisgICAgICAgICAgICByZXR1cm4g ZWxlbWVudC5wYXJlbnROb2RlKCkgPT0gZWxlbWVudC5kb2N1bWVudCgpLmRvY3VtZW50RWxlbWVu dCgpOwogICAgICAgICByZXR1cm4gZWxlbWVudC5pc0Nvbm5lY3RlZCgpICYmICFlbGVtZW50Lmlz SW5TaGFkb3dUcmVlKCk7CiAgICAgfTsKIAotICAgIGF1dG8gZmluZFNWR1RpdGxlID0gW10gKERv Y3VtZW50JiBkb2N1bWVudCkgLT4gRWxlbWVudCogewotICAgICAgICByZXR1cm4gY2hpbGRyZW5P ZlR5cGU8U1ZHVGl0bGVFbGVtZW50PigqZG9jdW1lbnQuZG9jdW1lbnRFbGVtZW50KCkpLmZpcnN0 KCk7Ci0gICAgfTsKLSAgICBhdXRvIGlzU1ZHVGl0bGUgPSBbXSAoRWxlbWVudCYgZWxlbWVudCkg ewotICAgICAgICByZXR1cm4gaXM8U1ZHVGl0bGVFbGVtZW50PihlbGVtZW50KTsKLSAgICB9Owot ICAgIGF1dG8gaXNTVkdUaXRsZUVsaWdpYmxlID0gW10gKEVsZW1lbnQmIGVsZW1lbnQpIHsKLSAg ICAgICAgcmV0dXJuIGVsZW1lbnQucGFyZW50Tm9kZSgpID09IGVsZW1lbnQuZG9jdW1lbnQoKS5k b2N1bWVudEVsZW1lbnQoKTsKLSAgICB9OwotCiAgICAgLy8gTW9zdCBkb2N1bWVudHMgdXNlIEhU TUwgdGl0bGUgcnVsZXMuCiAgICAgLy8gRG9jdW1lbnRzIHdpdGggU1ZHIGRvY3VtZW50IGVsZW1l bnRzIHVzZSBTVkcgdGl0bGUgcnVsZXMuCiAgICAgYm9vbCB1c2VTVkdUaXRsZSA9IGlzPFNWR1NW R0VsZW1lbnQ+KGRvY3VtZW50RWxlbWVudCgpKTsKLSAgICBhdXRvIGZpbmRUaXRsZSA9IHVzZVNW R1RpdGxlID8gZmluZFNWR1RpdGxlIDogZmluZEhUTUxUaXRsZTsKLSAgICBhdXRvIGlzVGl0bGUg PSB1c2VTVkdUaXRsZSA/IGlzU1ZHVGl0bGUgOiBpc0hUTUxUaXRsZTsKLSAgICBhdXRvIGlzVGl0 bGVFbGlnaWJsZSA9IHVzZVNWR1RpdGxlID8gaXNTVkdUaXRsZUVsaWdpYmxlIDogaXNIVE1MVGl0 bGVFbGlnaWJsZTsKIAotICAgIGlmICghaXNUaXRsZShjaGFuZ2luZ1RpdGxlRWxlbWVudCkpIHsK LSAgICAgICAgQVNTRVJUKG1fdGl0bGVFbGVtZW50ID09IGZpbmRUaXRsZSgqdGhpcykpOworICAg IGlmICghaXNUaXRsZShjaGFuZ2luZ1RpdGxlRWxlbWVudCwgdXNlU1ZHVGl0bGUpKSB7CisgICAg ICAgIEFTU0VSVChtX3RpdGxlRWxlbWVudCA9PSBmaW5kVGl0bGUoKnRoaXMsIHVzZVNWR1RpdGxl KSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKICAgICBFbGVtZW50KiBuZXdUaXRsZUVsZW1l bnQ7CiAgICAgaWYgKG1fdGl0bGVFbGVtZW50KQotICAgICAgICBuZXdUaXRsZUVsZW1lbnQgPSBm aW5kVGl0bGUoKnRoaXMpOworICAgICAgICBuZXdUaXRsZUVsZW1lbnQgPSBmaW5kVGl0bGUoKnRo aXMsIHVzZVNWR1RpdGxlKTsKICAgICBlbHNlIHsKICAgICAgICAgLy8gT3B0aW1pemVkIGNvbW1v biBjYXNlOiBXZSBoYXZlIG5vIHRpdGxlIGVsZW1lbnQgeWV0LgogICAgICAgICAvLyBXZSBjYW4g ZmlndXJlIG91dCB3aGljaCB0aXRsZSBlbGVtZW50IHNob3VsZCBiZSB1c2VkIHdpdGhvdXQgc2Vh cmNoaW5nLgotICAgICAgICBuZXdUaXRsZUVsZW1lbnQgPSBpc1RpdGxlRWxpZ2libGUoY2hhbmdp bmdUaXRsZUVsZW1lbnQpID8gJmNoYW5naW5nVGl0bGVFbGVtZW50IDogbnVsbHB0cjsKLSAgICAg ICAgQVNTRVJUKG5ld1RpdGxlRWxlbWVudCA9PSBmaW5kVGl0bGUoKnRoaXMpKTsKKyAgICAgICAg bmV3VGl0bGVFbGVtZW50ID0gaXNUaXRsZUVsaWdpYmxlKGNoYW5naW5nVGl0bGVFbGVtZW50LCB1 c2VTVkdUaXRsZSkgPyAmY2hhbmdpbmdUaXRsZUVsZW1lbnQgOiBudWxscHRyOworICAgICAgICBB U1NFUlQobmV3VGl0bGVFbGVtZW50ID09IGZpbmRUaXRsZSgqdGhpcywgdXNlU1ZHVGl0bGUpKTsK ICAgICB9CiAKICAgICBpZiAobV90aXRsZUVsZW1lbnQgPT0gbmV3VGl0bGVFbGVtZW50KQo= 320034 2017-09-06 10:01:38 -0700 2017-09-06 10:26:21 -0700 Patch bug-176381-20170906190139.patch text/plain 3103 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyMTY3OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDE3LTA5LTA2ICBQZXIgQXJu ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbV2luXSBDb21waWxlIGVy cm9ycyBpbiBEb2N1bWVudDo6dXBkYXRlVGl0bGVFbGVtZW50LgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc2MzgxCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTVNWQyBpcyBub3QgYWJsZSB0byBjb21waWxl IHRoZSBzdGF0ZW1lbnQ6CisgICAgICAgICdhdXRvIHJlc3VsdCA9IGJvb2xFeHByZXNzaW9uID8g bGFtYmRhMSA6IGxhbWJkYTI7JworICAgICAgICB3aGVyZSAnbGFtYmRhMScgYW5kICdsYW1iZGEy JyBoYXZlIHRoZSBzYW1lIHNpZ25hdHVyZS4KKworICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpmaW5kSFRNTFRpdGxlKToKKyAgICAgICAgKFdlYkNvcmU6Omlz SFRNTFRpdGxlKToKKyAgICAgICAgKFdlYkNvcmU6OmlzSFRNTFRpdGxlRWxpZ2libGUpOgorICAg ICAgICAoV2ViQ29yZTo6ZmluZFNWR1RpdGxlKToKKyAgICAgICAgKFdlYkNvcmU6OmlzU1ZHVGl0 bGUpOgorICAgICAgICAoV2ViQ29yZTo6aXNTVkdUaXRsZUVsaWdpYmxlKToKKyAgICAgICAgKFdl YkNvcmU6OkRvY3VtZW50Ojp1cGRhdGVUaXRsZUVsZW1lbnQpOgorCiAyMDE3LTA5LTA2ICBUb21h cyBQb3BlbGEgIDx0cG9wZWxhQHJlZGhhdC5jb20+CiAKICAgICAgICAgTWlzc2luZyBicmVhayBp biBVUkxQYXJzZXIKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAkocmV2aXNpb24gMjIxNjcx KQorKysgU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAt MTU0MiwyOCArMTU0MiwzOSBAQCB2b2lkIERvY3VtZW50OjpzZXRUaXRsZShjb25zdCBTdHJpbmcm IHRpCiAgICAgICAgIHVwZGF0ZVRpdGxlKHsgdGl0bGUsIExUUiB9KTsKIH0KIAotdm9pZCBEb2N1 bWVudDo6dXBkYXRlVGl0bGVFbGVtZW50KEVsZW1lbnQmIGNoYW5naW5nVGl0bGVFbGVtZW50KQor c3RhdGljIEVsZW1lbnQqIGZpbmRIVE1MVGl0bGUoRG9jdW1lbnQmIGRvY3VtZW50KQoreworICAg IHJldHVybiBkZXNjZW5kYW50c09mVHlwZTxIVE1MVGl0bGVFbGVtZW50Pihkb2N1bWVudCkuZmly c3QoKTsKK307CisKK3N0YXRpYyBib29sIGlzSFRNTFRpdGxlKEVsZW1lbnQmIGVsZW1lbnQpCit7 CisgICAgcmV0dXJuIGlzPEhUTUxUaXRsZUVsZW1lbnQ+KGVsZW1lbnQpOworfTsKKworc3RhdGlj IGJvb2wgaXNIVE1MVGl0bGVFbGlnaWJsZShFbGVtZW50JiBlbGVtZW50KQoreworICAgIHJldHVy biBlbGVtZW50LmlzQ29ubmVjdGVkKCkgJiYgIWVsZW1lbnQuaXNJblNoYWRvd1RyZWUoKTsKK307 CisKK3N0YXRpYyBFbGVtZW50KiBmaW5kU1ZHVGl0bGUoRG9jdW1lbnQmIGRvY3VtZW50KQogewot ICAgIGF1dG8gZmluZEhUTUxUaXRsZSA9IFtdIChEb2N1bWVudCYgZG9jdW1lbnQpIC0+IEVsZW1l bnQqIHsKLSAgICAgICAgcmV0dXJuIGRlc2NlbmRhbnRzT2ZUeXBlPEhUTUxUaXRsZUVsZW1lbnQ+ KGRvY3VtZW50KS5maXJzdCgpOwotICAgIH07Ci0gICAgYXV0byBpc0hUTUxUaXRsZSA9IFtdIChF bGVtZW50JiBlbGVtZW50KSB7Ci0gICAgICAgIHJldHVybiBpczxIVE1MVGl0bGVFbGVtZW50Pihl bGVtZW50KTsKLSAgICB9OwotICAgIGF1dG8gaXNIVE1MVGl0bGVFbGlnaWJsZSA9IFtdIChFbGVt ZW50JiBlbGVtZW50KSB7Ci0gICAgICAgIHJldHVybiBlbGVtZW50LmlzQ29ubmVjdGVkKCkgJiYg IWVsZW1lbnQuaXNJblNoYWRvd1RyZWUoKTsKLSAgICB9OwotCi0gICAgYXV0byBmaW5kU1ZHVGl0 bGUgPSBbXSAoRG9jdW1lbnQmIGRvY3VtZW50KSAtPiBFbGVtZW50KiB7Ci0gICAgICAgIHJldHVy biBjaGlsZHJlbk9mVHlwZTxTVkdUaXRsZUVsZW1lbnQ+KCpkb2N1bWVudC5kb2N1bWVudEVsZW1l bnQoKSkuZmlyc3QoKTsKLSAgICB9OwotICAgIGF1dG8gaXNTVkdUaXRsZSA9IFtdIChFbGVtZW50 JiBlbGVtZW50KSB7Ci0gICAgICAgIHJldHVybiBpczxTVkdUaXRsZUVsZW1lbnQ+KGVsZW1lbnQp OwotICAgIH07Ci0gICAgYXV0byBpc1NWR1RpdGxlRWxpZ2libGUgPSBbXSAoRWxlbWVudCYgZWxl bWVudCkgewotICAgICAgICByZXR1cm4gZWxlbWVudC5wYXJlbnROb2RlKCkgPT0gZWxlbWVudC5k b2N1bWVudCgpLmRvY3VtZW50RWxlbWVudCgpOwotICAgIH07CisgICAgcmV0dXJuIGNoaWxkcmVu T2ZUeXBlPFNWR1RpdGxlRWxlbWVudD4oKmRvY3VtZW50LmRvY3VtZW50RWxlbWVudCgpKS5maXJz dCgpOworfTsKIAorc3RhdGljIGJvb2wgaXNTVkdUaXRsZShFbGVtZW50JiBlbGVtZW50KQorewor ICAgIHJldHVybiBpczxTVkdUaXRsZUVsZW1lbnQ+KGVsZW1lbnQpOworfTsKKworc3RhdGljIGJv b2wgaXNTVkdUaXRsZUVsaWdpYmxlKEVsZW1lbnQmIGVsZW1lbnQpCit7CisgICAgcmV0dXJuIGVs ZW1lbnQucGFyZW50Tm9kZSgpID09IGVsZW1lbnQuZG9jdW1lbnQoKS5kb2N1bWVudEVsZW1lbnQo KTsKK307CisKKwordm9pZCBEb2N1bWVudDo6dXBkYXRlVGl0bGVFbGVtZW50KEVsZW1lbnQmIGNo YW5naW5nVGl0bGVFbGVtZW50KQorewogICAgIC8vIE1vc3QgZG9jdW1lbnRzIHVzZSBIVE1MIHRp dGxlIHJ1bGVzLgogICAgIC8vIERvY3VtZW50cyB3aXRoIFNWRyBkb2N1bWVudCBlbGVtZW50cyB1 c2UgU1ZHIHRpdGxlIHJ1bGVzLgogICAgIGJvb2wgdXNlU1ZHVGl0bGUgPSBpczxTVkdTVkdFbGVt ZW50Pihkb2N1bWVudEVsZW1lbnQoKSk7Cg==