57337 2011-03-29 07:17:34 -0700 Fix compilation with Solaris 10/Sun Studio 12 CC : types must match on ?: 2011-04-13 07:59:16 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC Other RESOLVED FIXED P2 Normal --- 0 bentaylor.solx86 webkit-unassigned commit-queue webkit.review.bot oldest_to_newest 375289 0 bentaylor.solx86 2011-03-29 07:17:34 -0700 in Source/WebCore/dom/NodeRenderStyle.h, the construct in line 36 return m_renderer ? m_renderer->style() : nonRendererRenderStyle(); fails to compile on Solaris 10/Sun Studio 12 CC, with the error: Error: Different types for "?:" (bool and WebCore::RenderStyle*). 375306 1 87320 bentaylor.solx86 2011-03-29 07:31:53 -0700 Created attachment 87320 Proposed patch which compiles correctly in qt-4.7.2 with webkit enabled on Solaris 10 with SS12 C++ compiler Fix for the above error, just cast the first conditional return to the appropriate type. 375309 2 webkit.review.bot 2011-03-29 07:34:49 -0700 Attachment 87320 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/ChangeLog:1: ChangeLog entry has no bug number [changelog/bugnumber] [5] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 375355 3 bentaylor.solx86 2011-03-29 08:15:09 -0700 ChangeLog entry has a bug number in it. First line. Is the style checker so pedantic, that it can't handle a trailing comma? 375689 4 87320 eric 2011-03-29 13:04:51 -0700 Comment on attachment 87320 Proposed patch which compiles correctly in qt-4.7.2 with webkit enabled on Solaris 10 with SS12 C++ compiler We don't use c-style casts in WebKit. static_cast is your friend. :) How is style() not a RenderStyle? 375702 5 bentaylor.solx86 2011-03-29 13:22:15 -0700 (In reply to comment #4) > (From update of attachment 87320 [details]) > We don't use c-style casts in WebKit. static_cast is your friend. :) How is style() not a RenderStyle? The compiler reports this as a mismatch. I can recode as a static_cast, or do as Thiago did in his original patch and say: + if (m_renderer) + return m_renderer->style(); + return nonRendererRenderStyle(); I follow your guidance. 375983 6 87449 bentaylor.solx86 2011-03-29 18:54:37 -0700 Created attachment 87449 Updated patch which compiles correctly in qt-4.7.2 with webkit enabled on Solaris 10 with SS12 C++ compiler, changed to static_cast updated patch using recommended static_cast 375991 7 87450 bentaylor.solx86 2011-03-29 19:02:50 -0700 Created attachment 87450 Updated patch which compiles correctly in qt-4.7.2 with webkit enabled on Solaris 10 with SS12 C++ compiler, changed to static_cast and fix style issue (extra space) fix extra space in the patch issue, that would have surely flagged the style bot... 377262 8 87450 eric 2011-03-31 09:53:15 -0700 Comment on attachment 87450 Updated patch which compiles correctly in qt-4.7.2 with webkit enabled on Solaris 10 with SS12 C++ compiler, changed to static_cast and fix style issue (extra space) http://trac.webkit.org/browser/trunk/Source/WebCore/rendering/RenderObject.h#L598 Note that style() is already a RenderStyle*. Something is fishy here. 377294 9 bentaylor.solx86 2011-03-31 10:23:52 -0700 (In reply to comment #8) > (From update of attachment 87450 [details]) > http://trac.webkit.org/browser/trunk/Source/WebCore/rendering/RenderObject.h#L598 > > Note that style() is already a RenderStyle*. Something is fishy here. Would you prefer I used Thiago's method? 378545 10 88008 bentaylor.solx86 2011-04-03 06:49:00 -0700 Created attachment 88008 Fixed patch that correct the compile, without trying to static_cast a variable that is already the right type (obviously compiler issue) This was Thiago Macieria's version of this patch. 382246 11 88008 eric 2011-04-08 08:24:14 -0700 Comment on attachment 88008 Fixed patch that correct the compile, without trying to static_cast a variable that is already the right type (obviously compiler issue) This looks fine, but I would prefer if you would add a comment here: // Using a ternary here confuses The Solaris 10 compiler: // http://link-to-solaris-10-compiler-bug That way someone is unlikely to break it again. Do we understand why only this one ternary fails? We have lots of similar ternaries througout the project 382253 12 bentaylor.solx86 2011-04-08 08:32:38 -0700 (In reply to comment #11) > (From update of attachment 88008 [details]) > This looks fine, but I would prefer if you would add a comment here: > // Using a ternary here confuses The Solaris 10 compiler: > // http://link-to-solaris-10-compiler-bug > > That way someone is unlikely to break it again. > > Do we understand why only this one ternary fails? We have lots of similar ternaries througout the project This is a weird one. I've patched on bunch of the ternary operations (similar type things where the types were in fact different) over the last month for webkit. I will research the bug and see what I can find, and hold off on a updated patch until I can identify it. 383351 13 bentaylor.solx86 2011-04-11 12:11:43 -0700 (In reply to comment #11) > (From update of attachment 88008 [details]) > This looks fine, but I would prefer if you would add a comment here: > // Using a ternary here confuses The Solaris 10 compiler: > // http://link-to-solaris-10-compiler-bug > > That way someone is unlikely to break it again. > > Do we understand why only this one ternary fails? We have lots of similar ternaries througout the project Bug id found. If I remove the inline from the template, the problem goes away which confirms bug CR 6569194, "Problem with question operator binding in inline function". However, the recommendation was to use the if clause to fix this problem as removing the inline was not a good work around. Fixing up the comments and will resubmit the patch. However, the Bug report is not publically available, so will just provide the bug number and description. 383366 14 89050 bentaylor.solx86 2011-04-11 12:24:52 -0700 Created attachment 89050 Updated patch which explains that we are working around Solaris Studio 12/12.1/12.2 compiler bug with ternary operations. Patch updated with proper comments on why we fix the bug the way we did. 384844 15 89050 eric 2011-04-13 06:53:57 -0700 Comment on attachment 89050 Updated patch which explains that we are working around Solaris Studio 12/12.1/12.2 compiler bug with ternary operations. Thanks! This is a much much much better fix. (Since it won't regress since it's commented, and with the bug number we now have some way of eventually removing it.) 384883 16 commit-queue 2011-04-13 07:55:50 -0700 The commit-queue encountered the following flaky tests while processing attachment 89050: fast/loader/recursive-before-unload-crash.html bug 50880 (authors: beidson@apple.com and eric@webkit.org) The commit-queue is continuing to process your patch. 384886 17 89050 commit-queue 2011-04-13 07:59:12 -0700 Comment on attachment 89050 Updated patch which explains that we are working around Solaris Studio 12/12.1/12.2 compiler bug with ternary operations. Clearing flags on attachment: 89050 Committed r83736: <http://trac.webkit.org/changeset/83736> 384887 18 commit-queue 2011-04-13 07:59:16 -0700 All reviewed patches have been landed. Closing bug. 87320 2011-03-29 07:31:53 -0700 2011-03-29 18:54:37 -0700 Proposed patch which compiles correctly in qt-4.7.2 with webkit enabled on Solaris 10 with SS12 C++ compiler webkit-bug-57337-fix-types-in-NodeRenderStyle.h.diff text/plain 1281 bentaylor.solx86 SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgyMjQ2KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDMtMjkgIEJlbiBUYXls b3IgIDxiZW50YXlsb3Iuc29seDg2QGdtYWlsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NTczMzcsIGVycm9yIGZpcnN0CisgICAgICAgIHJlcG9ydGVkIGluIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNDkzMgorICAgICAgICBieSBUaGlhZ28g TWFjaWVyaWEuIFBhdGNoIGRlcml2ZWQgZnJvbSBpZGVhIGluIHBhdGNoMTAvMTcuCisKKyAgICAg ICAgRml4IGNvbXBpbGUgZXJyb3Igb24gU29sYXJpcyAxMC9TdW4gU3R1ZGlvIDEyLCB0eXBlcyBt dXN0CisgICAgICAgIG1hdGNoIG9uIHRoZSBjb25kaXRpb25hbHMgb2YgYSAiPzoiIGNvbnN0cnVj dC4KKworICAgICAgICAqIGRvbS9Ob2RlUmVuZGVyU3R5bGUuaDoKKyAgICAgICAgKFdlYkNvcmU6 Ok5vZGU6OnJlbmRlclN0eWxlKToKKwogMjAxMS0wMy0yOSAgRXJpYyBTZWlkZWwgIDxlcmljQHdl YmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgUnlvc3VrZSBOaXdhLgpJbmRleDogU291 cmNlL1dlYkNvcmUvZG9tL05vZGVSZW5kZXJTdHlsZS5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL2RvbS9Ob2RlUmVuZGVyU3R5bGUuaAkocmV2aXNpb24gODIyNDQpCisrKyBTb3VyY2Uv V2ViQ29yZS9kb20vTm9kZVJlbmRlclN0eWxlLmgJKHdvcmtpbmcgY29weSkKQEAgLTMzLDcgKzMz LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBpbmxpbmUgUmVuZGVyU3R5bGUqIE5vZGU6OnJl bmRlclN0eWxlKCkgY29uc3QKIHsKLSAgICByZXR1cm4gbV9yZW5kZXJlciA/IG1fcmVuZGVyZXIt PnN0eWxlKCkgOiBub25SZW5kZXJlclJlbmRlclN0eWxlKCk7CisgICAgcmV0dXJuIG1fcmVuZGVy ZXIgPyAoV2ViQ29yZTo6UmVuZGVyU3R5bGUqKW1fcmVuZGVyZXItPnN0eWxlKCkgOiBub25SZW5k ZXJlclJlbmRlclN0eWxlKCk7CiB9CiAKIH0K 87449 2011-03-29 18:54:37 -0700 2011-03-29 19:02:50 -0700 Updated patch which compiles correctly in qt-4.7.2 with webkit enabled on Solaris 10 with SS12 C++ compiler, changed to static_cast webkit-bug-57337-fix_conditional_expression_on_Solaris10_SS12.diff text/plain 1150 bentaylor.solx86 SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgyMzc5KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDMtMjkgIEJlbiBUYXls b3IgIDxiZW50YXlsb3Iuc29seDg2QGdtYWlsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NTczMzcKKworICAgICAgICBmaXggY29tcGlsZSBlcnJvciBvbiBTb2xhcmlzIDEw L1N1biBTdHVkaW8gMTIgZm9yIG1pc21hdGNoZWQKKyAgICAgICAgb3BlcmFuZHMgaW4gYSBjb25k aXRpb25hbCBleHByZXNzaW9uICg/OikKKworICAgICAgICAqIGRvbS9Ob2RlUmVuZGVyU3R5bGUu aDoKKyAgICAgICAgKFdlYkNvcmU6Ok5vZGU6OnJlbmRlclN0eWxlKToKKwogMjAxMS0wMy0yOSAg VG9ueSBHZW50aWxjb3JlICA8dG9ueWdAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IEFkYW0gQmFydGguCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vTm9kZVJlbmRlclN0eWxl LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL05vZGVSZW5kZXJTdHlsZS5oCShy ZXZpc2lvbiA4MjI0OCkKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlUmVuZGVyU3R5bGUuaAko d29ya2luZyBjb3B5KQpAQCAtMzMsNyArMzMsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGlu bGluZSBSZW5kZXJTdHlsZSogTm9kZTo6cmVuZGVyU3R5bGUoKSBjb25zdAogewotICAgIHJldHVy biBtX3JlbmRlcmVyID8gbV9yZW5kZXJlci0+c3R5bGUoKSA6IG5vblJlbmRlcmVyUmVuZGVyU3R5 bGUoKTsKKyAgICByZXR1cm4gbV9yZW5kZXJlciA/ICBzdGF0aWNfY2FzdDxXZWJDb3JlOjpSZW5k ZXJTdHlsZSo+KG1fcmVuZGVyZXItPnN0eWxlKCkpIDogbm9uUmVuZGVyZXJSZW5kZXJTdHlsZSgp OwogfQogCiB9Cg== 87450 2011-03-29 19:02:50 -0700 2011-04-03 06:49:00 -0700 Updated patch which compiles correctly in qt-4.7.2 with webkit enabled on Solaris 10 with SS12 C++ compiler, changed to static_cast and fix style issue (extra space) webkit-bug-57337-fix_conditional_expression_on_Solaris10_SS12.diff text/plain 1149 bentaylor.solx86 SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgyMzc5KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDMtMjkgIEJlbiBUYXls b3IgIDxiZW50YXlsb3Iuc29seDg2QGdtYWlsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NTczMzcKKworICAgICAgICBmaXggY29tcGlsZSBlcnJvciBvbiBTb2xhcmlzIDEw L1N1biBTdHVkaW8gMTIgZm9yIG1pc21hdGNoZWQKKyAgICAgICAgb3BlcmFuZHMgaW4gYSBjb25k aXRpb25hbCBleHByZXNzaW9uICg/OikKKworICAgICAgICAqIGRvbS9Ob2RlUmVuZGVyU3R5bGUu aDoKKyAgICAgICAgKFdlYkNvcmU6Ok5vZGU6OnJlbmRlclN0eWxlKToKKwogMjAxMS0wMy0yOSAg VG9ueSBHZW50aWxjb3JlICA8dG9ueWdAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IEFkYW0gQmFydGguCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vTm9kZVJlbmRlclN0eWxl LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL05vZGVSZW5kZXJTdHlsZS5oCShy ZXZpc2lvbiA4MjI0OCkKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlUmVuZGVyU3R5bGUuaAko d29ya2luZyBjb3B5KQpAQCAtMzMsNyArMzMsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGlu bGluZSBSZW5kZXJTdHlsZSogTm9kZTo6cmVuZGVyU3R5bGUoKSBjb25zdAogewotICAgIHJldHVy biBtX3JlbmRlcmVyID8gbV9yZW5kZXJlci0+c3R5bGUoKSA6IG5vblJlbmRlcmVyUmVuZGVyU3R5 bGUoKTsKKyAgICByZXR1cm4gbV9yZW5kZXJlciA/IHN0YXRpY19jYXN0PFdlYkNvcmU6OlJlbmRl clN0eWxlKj4obV9yZW5kZXJlci0+c3R5bGUoKSkgOiBub25SZW5kZXJlclJlbmRlclN0eWxlKCk7 CiB9CiAKIH0K 88008 2011-04-03 06:49:00 -0700 2011-04-11 12:24:52 -0700 Fixed patch that correct the compile, without trying to static_cast a variable that is already the right type (obviously compiler issue) webkit-bug-57377-NodeRenderStyle.h.diff text/plain 1136 bentaylor.solx86 SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgyNzkyKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDQtMDMgIEJlbiBUYXls b3IgIDxiZW50YXlsb3Iuc29seDg2QGdtYWlsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NTczMzcKKworICAgICAgICBmaXggY29tcGlsZSBlcnJvciBvbiBTb2xhcmlzIDEw L1N1biBTdHVkaW8gMTIgZm9yIG1pc21hdGNoZWQKKyAgICAgICAgb3BlcmFuZHMgaW4gYSBjb25k aXRpb25hbCBleHByZXNzaW9uICg/OikgCisKKyAgICAgICAgKiBkb20vTm9kZVJlbmRlclN0eWxl Lmg6CisgICAgICAgIChXZWJDb3JlOjpOb2RlOjpyZW5kZXJTdHlsZSk6CisKIDIwMTEtMDQtMDMg IEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERh biBCZXJuc3RlaW4uCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vTm9kZVJlbmRlclN0eWxlLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL05vZGVSZW5kZXJTdHlsZS5oCShyZXZp c2lvbiA4Mjc5MikKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlUmVuZGVyU3R5bGUuaAkod29y a2luZyBjb3B5KQpAQCAtMzMsNyArMzMsMTAgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBpbmxp bmUgUmVuZGVyU3R5bGUqIE5vZGU6OnJlbmRlclN0eWxlKCkgY29uc3QKIHsKLSAgICByZXR1cm4g bV9yZW5kZXJlciA/IG1fcmVuZGVyZXItPnN0eWxlKCkgOiBub25SZW5kZXJlclJlbmRlclN0eWxl KCk7CisgICAgaWYgKG1fcmVuZGVyZXIpCisgICAgICAgIHJldHVybiBtX3JlbmRlcmVyLT5zdHls ZSgpOworICAgIHJldHVybiBub25SZW5kZXJlclJlbmRlclN0eWxlKCk7CisKIH0KIAogfQo= 89050 2011-04-11 12:24:52 -0700 2011-04-13 07:59:12 -0700 Updated patch which explains that we are working around Solaris Studio 12/12.1/12.2 compiler bug with ternary operations. webkit-bug-57337-workaround-ternary-operation-bug-in-studio-compilers.diff text/plain 1312 bentaylor.solx86 SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgzNDc0KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDQtMTEgIEJlbiBUYXls b3IgIDxiZW50YXlsb3Iuc29seDg2QGdtYWlsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NTczMzcKKworICAgICAgICBXb3JrIGFyb3VuZCBhIGJ1ZyBpbiB0ZXJuYXJ5IG9w ZXJ0aW9ucyBpbiB0aGUgU29sYXJpcyBTdHVkaW8KKyAgICAgICAgMTIvMTIuMS8xMi4yIGNvbXBp bGVycywgdXNpbmcgYW4gaWYgY2xhdXNlLgorCisgICAgICAgICogZG9tL05vZGVSZW5kZXJTdHls ZS5oOgorICAgICAgICAoV2ViQ29yZTo6Tm9kZTo6cmVuZGVyU3R5bGUpOgorCiAyMDExLTA0LTEx ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmll d2VkIGJ5IERhbiBCZXJuc3RlaW4uCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vTm9kZVJlbmRl clN0eWxlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL05vZGVSZW5kZXJTdHls ZS5oCShyZXZpc2lvbiA4MzQ0NikKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlUmVuZGVyU3R5 bGUuaAkod29ya2luZyBjb3B5KQpAQCAtMzMsNyArMzMsMTEgQEAgbmFtZXNwYWNlIFdlYkNvcmUg ewogCiBpbmxpbmUgUmVuZGVyU3R5bGUqIE5vZGU6OnJlbmRlclN0eWxlKCkgY29uc3QKIHsKLSAg ICByZXR1cm4gbV9yZW5kZXJlciA/IG1fcmVuZGVyZXItPnN0eWxlKCkgOiBub25SZW5kZXJlclJl bmRlclN0eWxlKCk7CisgICAgLy8gVXNpbmcgYSB0ZXJuYXJ5IGhlcmUgY29uZnVzZXMgdGhlIFNv bGFyaXMgU3R1ZGlvIDEyLzEyLjEvMTIuMiBjb21waWxlcnM6CisgICAgLy8gQnVnIGlzIENSIDY1 NjkxOTQsICJQcm9ibGVtIHdpdGggcXVlc3Rpb24gb3BlcmF0b3IgYmluZGluZyBpbiBpbmxpbmUg ZnVuY3Rpb24iCisgICAgaWYgKG1fcmVuZGVyZXIpIAorICAgICAgICByZXR1cm4gbV9yZW5kZXJl ci0+c3R5bGUoKTsKKyAgICByZXR1cm4gbm9uUmVuZGVyZXJSZW5kZXJTdHlsZSgpOwogfQogCiB9 Cg==