58725 2011-04-16 00:11:12 -0700 Fix compilation on Solaris 10 with Sun Studio 12: ternary opertors must have matching types 2011-04-21 12:27:49 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC Other RESOLVED FIXED P2 Normal --- 1 bentaylor.solx86 webkit-unassigned commit-queue eric oldest_to_newest 387224 0 bentaylor.solx86 2011-04-16 00:11:12 -0700 Solaris Studio 12 Compilers on Solaris 10 enforce strong type checking on ternary operators: Error: Ambiguous "?:" expression, second operand of type "WTF::PassRefPtr<WebCore::DocumentFragment>" and third operand of type "int" can be converted to one another. Error: Ambiguous "?:" expression, second operand of type "WTF::PassRefPtr<JSC::Label>" and third operand of type "int" can be converted to one another. [and others similar] 387227 1 89918 bentaylor.solx86 2011-04-16 00:45:44 -0700 Created attachment 89918 Patch to fix the mis-matched types in a ternary operation on Solaris 10 with Sun Studio 12 A compile fix for Solaris 10 with Sun Studio 12 CC compiler, ternary operators must have matching types. 387314 2 89918 ap 2011-04-16 23:24:17 -0700 Comment on attachment 89918 Patch to fix the mis-matched types in a ternary operation on Solaris 10 with Sun Studio 12 - LabelScope scope(type, name, scopeDepth(), newLabel(), type == LabelScope::Loop ? newLabel() : PassRefPtr<Label>()); // Only loops have continue targets. + LabelScope scope(type, name, scopeDepth(), newLabel(), type == LabelScope::Loop ? newLabel() : PassRefPtr<Label>(0)); // Only loops have continue targets. I don't see this change explained - types already match here. 387345 3 89947 bentaylor.solx86 2011-04-17 04:03:12 -0700 Created attachment 89947 Fix compilation on Solaris 10 with Sun Studio 12, ternary operators must match types, updated. Updated patch per review (good catch). 387822 4 eric 2011-04-18 10:02:36 -0700 Is there not a newer compiler than this one? Does GCC work on Solaris? This particular compiler seems über-lame. 387841 5 bentaylor.solx86 2011-04-18 10:19:44 -0700 (In reply to comment #4) > Is there not a newer compiler than this one? Does GCC work on Solaris? This particular compiler seems über-lame. gcc has a different ABI from Sun Studio 12/12.1/12.2, which means we either build QT/WebKit/KDE4 from gcc or Sun Studio. Studio happens to be a more stict compiler. I can't use 12.2 because there are compiler failures which are not fixed when compiling QT. The other problem is that unless one has a support contract with Oracle, you can't get the Studio patches for free anymore, and I've been able to build QT/WebKit/KDE4 with SS12 and have it work. Testing the SS12.1 compiler is going to be challenging, because it is a new compiler, not an update of the SS12 compiler. So, new set of bugs. I have 2-3 more Solaris/Studio patches which I will be submitting, then we should be done for a while. 390247 6 89947 commit-queue 2011-04-21 12:27:44 -0700 Comment on attachment 89947 Fix compilation on Solaris 10 with Sun Studio 12, ternary operators must match types, updated. Clearing flags on attachment: 89947 Committed r84538: <http://trac.webkit.org/changeset/84538> 390248 7 commit-queue 2011-04-21 12:27:49 -0700 All reviewed patches have been landed. Closing bug. 89918 2011-04-16 00:45:44 -0700 2011-04-17 04:03:12 -0700 Patch to fix the mis-matched types in a ternary operation on Solaris 10 with Sun Studio 12 webkit-bug-58725-ternary-operators-on-Solaris-with-SS12-must-match-types.diff text/plain 8835 bentaylor.solx86 SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gODQwODIpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAK KzIwMTEtMDQtMTYgIEJlbiBUYXlsb3IgIDxiZW50YXlsb3Iuc29seDg2QGdtYWlsLmNvbT4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTg3MjUKKworICAgICAgICBGaXggYSBjb21w aWxlIGlzc3VlIG9uIFNvbGFyaXMgMTAgd2l0aCBTdW4gU3R1ZGlvIDEyLAorICAgICAgICB0ZXJu YXJ5IG9wZXJhdG9ycyAoPzopIG11c3QgaGF2ZSB0aGUgc2FtZSB0eXBlcworCisgICAgICAgICog Ynl0ZWNvbXBpbGVyL0J5dGVjb2RlR2VuZXJhdG9yLmNwcDoKKyAgICAgICAgKEpTQzo6Qnl0ZWNv ZGVHZW5lcmF0b3I6Om5ld0xhYmVsU2NvcGUpOgorCiAyMDExLTA0LTE1ICBTaGVyaWZmIEJvdCAg PHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xs aW5nIG91dCByODQwNjcuCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVy L0J5dGVjb2RlR2VuZXJhdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENv cmUvYnl0ZWNvbXBpbGVyL0J5dGVjb2RlR2VuZXJhdG9yLmNwcAkocmV2aXNpb24gODQwODIpCisr KyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVyL0J5dGVjb2RlR2VuZXJhdG9yLmNw cAkod29ya2luZyBjb3B5KQpAQCAtNjY2LDcgKzY2Niw3IEBAIFBhc3NSZWZQdHI8TGFiZWxTY29w ZT4gQnl0ZWNvZGVHZW5lcmF0b3IKICAgICAgICAgbV9sYWJlbFNjb3Blcy5yZW1vdmVMYXN0KCk7 CiAKICAgICAvLyBBbGxvY2F0ZSBuZXcgbGFiZWwgc2NvcGUuCi0gICAgTGFiZWxTY29wZSBzY29w ZSh0eXBlLCBuYW1lLCBzY29wZURlcHRoKCksIG5ld0xhYmVsKCksIHR5cGUgPT0gTGFiZWxTY29w ZTo6TG9vcCA/IG5ld0xhYmVsKCkgOiBQYXNzUmVmUHRyPExhYmVsPigpKTsgLy8gT25seSBsb29w cyBoYXZlIGNvbnRpbnVlIHRhcmdldHMuCisgICAgTGFiZWxTY29wZSBzY29wZSh0eXBlLCBuYW1l LCBzY29wZURlcHRoKCksIG5ld0xhYmVsKCksIHR5cGUgPT0gTGFiZWxTY29wZTo6TG9vcCA/IG5l d0xhYmVsKCkgOiBQYXNzUmVmUHRyPExhYmVsPigwKSk7IC8vIE9ubHkgbG9vcHMgaGF2ZSBjb250 aW51ZSB0YXJnZXRzLgogICAgIG1fbGFiZWxTY29wZXMuYXBwZW5kKHNjb3BlKTsKICAgICByZXR1 cm4gJm1fbGFiZWxTY29wZXMubGFzdCgpOwogfQpJbmRleDogU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gODQw ODIpCisrKyBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyAr MSwyOCBAQAorMjAxMS0wNC0xNiAgQmVuIFRheWxvciAgPGJlbnRheWxvci5zb2x4ODZAZ21haWwu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01ODcyNQorCisgICAgICAgIEZp eCBhIGNvbXBpbGUgaXNzdWUgb24gU29sYXJpcyAxMCB3aXRoIFN1biBTdHVkaW8gMTIsCisgICAg ICAgIHRlcm5hcnkgb3BlcmF0b3JzICg/OikgbXVzdCBoYXZlIHRoZSBzYW1lIHR5cGVzCisKKyAg ICAgICAgKiBsb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9j dW1lbnRMb2FkZXI6OnBvcEFyY2hpdmVGb3JTdWJmcmFtZSk6CisgICAgICAgICogbG9hZGVyL2Fy Y2hpdmUvQXJjaGl2ZUZhY3RvcnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QXJjaGl2ZUZhY3Rv cnk6OmNyZWF0ZSk6CisgICAgICAgICogbG9hZGVyL2ljb24vSWNvbkRhdGFiYXNlLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6Okljb25EYXRhYmFzZTo6c2V0SWNvbkRhdGFGb3JJY29uVVJMKToKKyAg ICAgICAgKiBwYWdlL2FuaW1hdGlvbi9BbmltYXRpb25CYXNlLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OmJsZW5kRnVuYyk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjp1cGRhdGVTY3JvbGxDb3JuZXJTdHlsZSk6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6dXBkYXRlUmVzaXplclN0eWxlKToKKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVyU2Nyb2xsYmFyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlclNjcm9sbGJhcjo6dXBkYXRlU2Nyb2xsYmFyUGFydCk6CisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlclRleHRGcmFnbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUZXh0RnJh Z21lbnQ6OlJlbmRlclRleHRGcmFnbWVudCk6CisKIDIwMTEtMDQtMTUgIElseWEgVGlraG9ub3Zz a3kgIDxsb2lzbG9AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFBhdmVsIEZl bGRtYW4uCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAJKHJl dmlzaW9uIDg0MDgyKQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNw cAkod29ya2luZyBjb3B5KQpAQCAtNDc5LDcgKzQ3OSw3IEBAIHZvaWQgRG9jdW1lbnRMb2FkZXI6 OmFkZEFyY2hpdmVSZXNvdXJjZSgKIAogUGFzc1JlZlB0cjxBcmNoaXZlPiBEb2N1bWVudExvYWRl cjo6cG9wQXJjaGl2ZUZvclN1YmZyYW1lKGNvbnN0IFN0cmluZyYgZnJhbWVOYW1lKQogewotICAg IHJldHVybiBtX2FyY2hpdmVSZXNvdXJjZUNvbGxlY3Rpb24gPyBtX2FyY2hpdmVSZXNvdXJjZUNv bGxlY3Rpb24tPnBvcFN1YmZyYW1lQXJjaGl2ZShmcmFtZU5hbWUpIDogMDsKKyAgICByZXR1cm4g bV9hcmNoaXZlUmVzb3VyY2VDb2xsZWN0aW9uID8gbV9hcmNoaXZlUmVzb3VyY2VDb2xsZWN0aW9u LT5wb3BTdWJmcmFtZUFyY2hpdmUoZnJhbWVOYW1lKSA6IFBhc3NSZWZQdHI8QXJjaGl2ZT4oMCk7 CiB9CiAKIHZvaWQgRG9jdW1lbnRMb2FkZXI6OmNsZWFyQXJjaGl2ZVJlc291cmNlcygpCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXJjaGl2ZS9BcmNoaXZlRmFjdG9yeS5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL2FyY2hpdmUvQXJjaGl2ZUZhY3RvcnkuY3Bw CShyZXZpc2lvbiA4NDA4MikKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9hcmNoaXZlL0FyY2hp dmVGYWN0b3J5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzYsNyArNzYsNyBAQCBib29sIEFyY2hp dmVGYWN0b3J5Ojppc0FyY2hpdmVNaW1lVHlwZShjCiBQYXNzUmVmUHRyPEFyY2hpdmU+IEFyY2hp dmVGYWN0b3J5OjpjcmVhdGUoU2hhcmVkQnVmZmVyKiBkYXRhLCBjb25zdCBTdHJpbmcmIG1pbWVU eXBlKQogewogICAgIFJhd0RhdGFDcmVhdGlvbkZ1bmN0aW9uKiBmdW5jdGlvbiA9IG1pbWVUeXBl LmlzRW1wdHkoKSA/IDAgOiBhcmNoaXZlTUlNRVR5cGVzKCkuZ2V0KG1pbWVUeXBlKTsKLSAgICBy ZXR1cm4gZnVuY3Rpb24gPyBmdW5jdGlvbihkYXRhKSA6IDA7CisgICAgcmV0dXJuIGZ1bmN0aW9u ID8gZnVuY3Rpb24oZGF0YSkgOiBQYXNzUmVmUHRyPEFyY2hpdmU+KDApOwogfQogCiB2b2lkIEFy Y2hpdmVGYWN0b3J5OjpyZWdpc3Rlcktub3duQXJjaGl2ZU1JTUVUeXBlcygpCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvaWNvbi9JY29uRGF0YWJhc2UuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL2xvYWRlci9pY29uL0ljb25EYXRhYmFzZS5jcHAJKHJldmlzaW9uIDg0MDgy KQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL2ljb24vSWNvbkRhdGFiYXNlLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNTEyLDcgKzUxMiw3IEBAIHZvaWQgSWNvbkRhdGFiYXNlOjpzZXRJY29uRGF0 YUZvckljb25VUkwKICAgICBpZiAoIWlzT3BlbigpIHx8IGljb25VUkxPcmlnaW5hbC5pc0VtcHR5 KCkpCiAgICAgICAgIHJldHVybjsKICAgICAKLSAgICBSZWZQdHI8U2hhcmVkQnVmZmVyPiBkYXRh ID0gZGF0YU9yaWdpbmFsID8gZGF0YU9yaWdpbmFsLT5jb3B5KCkgOiAwOworICAgIFJlZlB0cjxT aGFyZWRCdWZmZXI+IGRhdGEgPSBkYXRhT3JpZ2luYWwgPyBkYXRhT3JpZ2luYWwtPmNvcHkoKSA6 IFBhc3NSZWZQdHI8U2hhcmVkQnVmZmVyPigwKTsKICAgICBTdHJpbmcgaWNvblVSTCA9IGljb25V UkxPcmlnaW5hbC5jcm9zc1RocmVhZFN0cmluZygpOwogICAgIAogICAgIFZlY3RvcjxTdHJpbmc+ IHBhZ2VVUkxzOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vQW5pbWF0aW9u QmFzZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vQW5p bWF0aW9uQmFzZS5jcHAJKHJldmlzaW9uIDg0MDgyKQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9h bmltYXRpb24vQW5pbWF0aW9uQmFzZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE2Niw3ICsxNjYs NyBAQCBzdGF0aWMgaW5saW5lIFRyYW5zZm9ybU9wZXJhdGlvbnMgYmxlbmRGCiAgICAgICAgIGZv ciAodW5zaWduZWQgaSA9IDA7IGkgPCBzaXplOyBpKyspIHsKICAgICAgICAgICAgIFJlZlB0cjxU cmFuc2Zvcm1PcGVyYXRpb24+IGZyb21PcCA9IChpIDwgZnJvbVNpemUpID8gZnJvbS5vcGVyYXRp b25zKClbaV0uZ2V0KCkgOiAwOwogICAgICAgICAgICAgUmVmUHRyPFRyYW5zZm9ybU9wZXJhdGlv bj4gdG9PcCA9IChpIDwgdG9TaXplKSA/IHRvLm9wZXJhdGlvbnMoKVtpXS5nZXQoKSA6IDA7Ci0g ICAgICAgICAgICBSZWZQdHI8VHJhbnNmb3JtT3BlcmF0aW9uPiBibGVuZGVkT3AgPSB0b09wID8g dG9PcC0+YmxlbmQoZnJvbU9wLmdldCgpLCBwcm9ncmVzcykgOiAoZnJvbU9wID8gZnJvbU9wLT5i bGVuZCgwLCBwcm9ncmVzcywgdHJ1ZSkgOiAwKTsKKyAgICAgICAgICAgIFJlZlB0cjxUcmFuc2Zv cm1PcGVyYXRpb24+IGJsZW5kZWRPcCA9IHRvT3AgPyB0b09wLT5ibGVuZChmcm9tT3AuZ2V0KCks IHByb2dyZXNzKSA6IChmcm9tT3AgPyBmcm9tT3AtPmJsZW5kKDAsIHByb2dyZXNzLCB0cnVlKSA6 IFBhc3NSZWZQdHI8VHJhbnNmb3JtT3BlcmF0aW9uPigwKSk7CiAgICAgICAgICAgICBpZiAoYmxl bmRlZE9wKQogICAgICAgICAgICAgICAgIHJlc3VsdC5vcGVyYXRpb25zKCkuYXBwZW5kKGJsZW5k ZWRPcCk7CiAgICAgICAgICAgICBlbHNlIHsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJMYXllci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyLmNwcAkocmV2aXNpb24gODQwODIpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MDIwLDcgKzQwMjAsNyBA QCB2b2lkIFJlbmRlckxheWVyOjpzdHlsZUNoYW5nZWQoU3R5bGVEaWZmCiB2b2lkIFJlbmRlckxh eWVyOjp1cGRhdGVTY3JvbGxDb3JuZXJTdHlsZSgpCiB7CiAgICAgUmVuZGVyT2JqZWN0KiBhY3R1 YWxSZW5kZXJlciA9IHJlbmRlcmVyKCktPm5vZGUoKSA/IHJlbmRlcmVyKCktPm5vZGUoKS0+c2hh ZG93QW5jZXN0b3JOb2RlKCktPnJlbmRlcmVyKCkgOiByZW5kZXJlcigpOwotICAgIFJlZlB0cjxS ZW5kZXJTdHlsZT4gY29ybmVyID0gcmVuZGVyZXIoKS0+aGFzT3ZlcmZsb3dDbGlwKCkgPyBhY3R1 YWxSZW5kZXJlci0+Z2V0VW5jYWNoZWRQc2V1ZG9TdHlsZShTQ1JPTExCQVJfQ09STkVSLCBhY3R1 YWxSZW5kZXJlci0+c3R5bGUoKSkgOiAwOworICAgIFJlZlB0cjxSZW5kZXJTdHlsZT4gY29ybmVy ID0gcmVuZGVyZXIoKS0+aGFzT3ZlcmZsb3dDbGlwKCkgPyBhY3R1YWxSZW5kZXJlci0+Z2V0VW5j YWNoZWRQc2V1ZG9TdHlsZShTQ1JPTExCQVJfQ09STkVSLCBhY3R1YWxSZW5kZXJlci0+c3R5bGUo KSkgOiBQYXNzUmVmUHRyPFJlbmRlclN0eWxlPigwKTsKICAgICBpZiAoY29ybmVyKSB7CiAgICAg ICAgIGlmICghbV9zY3JvbGxDb3JuZXIpIHsKICAgICAgICAgICAgIG1fc2Nyb2xsQ29ybmVyID0g bmV3IChyZW5kZXJlcigpLT5yZW5kZXJBcmVuYSgpKSBSZW5kZXJTY3JvbGxiYXJQYXJ0KHJlbmRl cmVyKCktPmRvY3VtZW50KCkpOwpAQCAtNDAzNiw3ICs0MDM2LDcgQEAgdm9pZCBSZW5kZXJMYXll cjo6dXBkYXRlU2Nyb2xsQ29ybmVyU3R5bAogdm9pZCBSZW5kZXJMYXllcjo6dXBkYXRlUmVzaXpl clN0eWxlKCkKIHsKICAgICBSZW5kZXJPYmplY3QqIGFjdHVhbFJlbmRlcmVyID0gcmVuZGVyZXIo KS0+bm9kZSgpID8gcmVuZGVyZXIoKS0+bm9kZSgpLT5zaGFkb3dBbmNlc3Rvck5vZGUoKS0+cmVu ZGVyZXIoKSA6IHJlbmRlcmVyKCk7Ci0gICAgUmVmUHRyPFJlbmRlclN0eWxlPiByZXNpemVyID0g cmVuZGVyZXIoKS0+aGFzT3ZlcmZsb3dDbGlwKCkgPyBhY3R1YWxSZW5kZXJlci0+Z2V0VW5jYWNo ZWRQc2V1ZG9TdHlsZShSRVNJWkVSLCBhY3R1YWxSZW5kZXJlci0+c3R5bGUoKSkgOiAwOworICAg IFJlZlB0cjxSZW5kZXJTdHlsZT4gcmVzaXplciA9IHJlbmRlcmVyKCktPmhhc092ZXJmbG93Q2xp cCgpID8gYWN0dWFsUmVuZGVyZXItPmdldFVuY2FjaGVkUHNldWRvU3R5bGUoUkVTSVpFUiwgYWN0 dWFsUmVuZGVyZXItPnN0eWxlKCkpIDogUGFzc1JlZlB0cjxSZW5kZXJTdHlsZT4oMCk7CiAgICAg aWYgKHJlc2l6ZXIpIHsKICAgICAgICAgaWYgKCFtX3Jlc2l6ZXIpIHsKICAgICAgICAgICAgIG1f cmVzaXplciA9IG5ldyAocmVuZGVyZXIoKS0+cmVuZGVyQXJlbmEoKSkgUmVuZGVyU2Nyb2xsYmFy UGFydChyZW5kZXJlcigpLT5kb2N1bWVudCgpKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJTY3JvbGxiYXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJTY3JvbGxiYXIuY3BwCShyZXZpc2lvbiA4NDA4MikKKysrIFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJTY3JvbGxiYXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0y MjksNyArMjI5LDcgQEAgdm9pZCBSZW5kZXJTY3JvbGxiYXI6OnVwZGF0ZVNjcm9sbGJhclBhcgog ICAgIGlmIChwYXJ0VHlwZSA9PSBOb1BhcnQpCiAgICAgICAgIHJldHVybjsKIAotICAgIFJlZlB0 cjxSZW5kZXJTdHlsZT4gcGFydFN0eWxlID0gIWRlc3Ryb3kgPyBnZXRTY3JvbGxiYXJQc2V1ZG9T dHlsZShwYXJ0VHlwZSwgIHBzZXVkb0ZvclNjcm9sbGJhclBhcnQocGFydFR5cGUpKSA6IDA7Cisg ICAgUmVmUHRyPFJlbmRlclN0eWxlPiBwYXJ0U3R5bGUgPSAhZGVzdHJveSA/IGdldFNjcm9sbGJh clBzZXVkb1N0eWxlKHBhcnRUeXBlLCAgcHNldWRvRm9yU2Nyb2xsYmFyUGFydChwYXJ0VHlwZSkp IDogUGFzc1JlZlB0cjxSZW5kZXJTdHlsZT4oMCk7CiAgICAgCiAgICAgYm9vbCBuZWVkUmVuZGVy ZXIgPSAhZGVzdHJveSAmJiBwYXJ0U3R5bGUgJiYgcGFydFN0eWxlLT5kaXNwbGF5KCkgIT0gTk9O RSAmJiBwYXJ0U3R5bGUtPnZpc2liaWxpdHkoKSA9PSBWSVNJQkxFOwogICAgIApJbmRleDogU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRGcmFnbWVudC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRGcmFnbWVudC5jcHAJKHJldmlz aW9uIDg0MDgyKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRGcmFnbWVu dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI5LDcgKzI5LDcgQEAKIG5hbWVzcGFjZSBXZWJDb3Jl IHsKIAogUmVuZGVyVGV4dEZyYWdtZW50OjpSZW5kZXJUZXh0RnJhZ21lbnQoTm9kZSogbm9kZSwg U3RyaW5nSW1wbCogc3RyLCBpbnQgc3RhcnRPZmZzZXQsIGludCBsZW5ndGgpCi0gICAgOiBSZW5k ZXJUZXh0KG5vZGUsIHN0ciA/IHN0ci0+c3Vic3RyaW5nKHN0YXJ0T2Zmc2V0LCBsZW5ndGgpIDog MCkKKyAgICA6IFJlbmRlclRleHQobm9kZSwgc3RyID8gc3RyLT5zdWJzdHJpbmcoc3RhcnRPZmZz ZXQsIGxlbmd0aCkgOiBQYXNzUmVmUHRyPFN0cmluZ0ltcGw+KDApKQogICAgICwgbV9zdGFydChz dGFydE9mZnNldCkKICAgICAsIG1fZW5kKGxlbmd0aCkKICAgICAsIG1fZmlyc3RMZXR0ZXIoMCkK 89947 2011-04-17 04:03:12 -0700 2011-04-21 12:27:44 -0700 Fix compilation on Solaris 10 with Sun Studio 12, ternary operators must match types, updated. webkit-bug-58725-ternary-operators-on-Solaris-with-SS12-must-match-types_updated.diff text/plain 7324 bentaylor.solx86 SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg0MDgyKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjggQEAKKzIwMTEtMDQtMTYgIEJlbiBUYXls b3IgIDxiZW50YXlsb3Iuc29seDg2QGdtYWlsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NTg3MjUKKworICAgICAgICBGaXggYSBjb21waWxlIGlzc3VlIG9uIFNvbGFyaXMg MTAgd2l0aCBTdW4gU3R1ZGlvIDEyLAorICAgICAgICB0ZXJuYXJ5IG9wZXJhdG9ycyAoPzopIG11 c3QgaGF2ZSB0aGUgc2FtZSB0eXBlcworCisgICAgICAgICogbG9hZGVyL0RvY3VtZW50TG9hZGVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50TG9hZGVyOjpwb3BBcmNoaXZlRm9yU3Vi ZnJhbWUpOgorICAgICAgICAqIGxvYWRlci9hcmNoaXZlL0FyY2hpdmVGYWN0b3J5LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkFyY2hpdmVGYWN0b3J5OjpjcmVhdGUpOgorICAgICAgICAqIGxvYWRl ci9pY29uL0ljb25EYXRhYmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJY29uRGF0YWJhc2U6 OnNldEljb25EYXRhRm9ySWNvblVSTCk6CisgICAgICAgICogcGFnZS9hbmltYXRpb24vQW5pbWF0 aW9uQmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpibGVuZEZ1bmMpOgorICAgICAgICAqIHJl bmRlcmluZy9SZW5kZXJMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6 dXBkYXRlU2Nyb2xsQ29ybmVyU3R5bGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6 OnVwZGF0ZVJlc2l6ZXJTdHlsZSk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclNjcm9sbGJh ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTY3JvbGxiYXI6OnVwZGF0ZVNjcm9sbGJh clBhcnQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUZXh0RnJhZ21lbnQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyVGV4dEZyYWdtZW50OjpSZW5kZXJUZXh0RnJhZ21lbnQpOgor CiAyMDExLTA0LTE1ICBJbHlhIFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KIAog ICAgICAgICBSZXZpZXdlZCBieSBQYXZlbCBGZWxkbWFuLgpJbmRleDogU291cmNlL1dlYkNvcmUv bG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9s b2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCShyZXZpc2lvbiA4NDA4MikKKysrIFNvdXJjZS9XZWJD b3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ3OSw3ICs0 NzksNyBAQCB2b2lkIERvY3VtZW50TG9hZGVyOjphZGRBcmNoaXZlUmVzb3VyY2UoCiAKIFBhc3NS ZWZQdHI8QXJjaGl2ZT4gRG9jdW1lbnRMb2FkZXI6OnBvcEFyY2hpdmVGb3JTdWJmcmFtZShjb25z dCBTdHJpbmcmIGZyYW1lTmFtZSkKIHsKLSAgICByZXR1cm4gbV9hcmNoaXZlUmVzb3VyY2VDb2xs ZWN0aW9uID8gbV9hcmNoaXZlUmVzb3VyY2VDb2xsZWN0aW9uLT5wb3BTdWJmcmFtZUFyY2hpdmUo ZnJhbWVOYW1lKSA6IDA7CisgICAgcmV0dXJuIG1fYXJjaGl2ZVJlc291cmNlQ29sbGVjdGlvbiA/ IG1fYXJjaGl2ZVJlc291cmNlQ29sbGVjdGlvbi0+cG9wU3ViZnJhbWVBcmNoaXZlKGZyYW1lTmFt ZSkgOiBQYXNzUmVmUHRyPEFyY2hpdmU+KDApOwogfQogCiB2b2lkIERvY3VtZW50TG9hZGVyOjpj bGVhckFyY2hpdmVSZXNvdXJjZXMoKQpJbmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL2FyY2hp dmUvQXJjaGl2ZUZhY3RvcnkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRl ci9hcmNoaXZlL0FyY2hpdmVGYWN0b3J5LmNwcAkocmV2aXNpb24gODQwODIpCisrKyBTb3VyY2Uv V2ViQ29yZS9sb2FkZXIvYXJjaGl2ZS9BcmNoaXZlRmFjdG9yeS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTc2LDcgKzc2LDcgQEAgYm9vbCBBcmNoaXZlRmFjdG9yeTo6aXNBcmNoaXZlTWltZVR5cGUo YwogUGFzc1JlZlB0cjxBcmNoaXZlPiBBcmNoaXZlRmFjdG9yeTo6Y3JlYXRlKFNoYXJlZEJ1ZmZl ciogZGF0YSwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSkKIHsKICAgICBSYXdEYXRhQ3JlYXRpb25G dW5jdGlvbiogZnVuY3Rpb24gPSBtaW1lVHlwZS5pc0VtcHR5KCkgPyAwIDogYXJjaGl2ZU1JTUVU eXBlcygpLmdldChtaW1lVHlwZSk7Ci0gICAgcmV0dXJuIGZ1bmN0aW9uID8gZnVuY3Rpb24oZGF0 YSkgOiAwOworICAgIHJldHVybiBmdW5jdGlvbiA/IGZ1bmN0aW9uKGRhdGEpIDogUGFzc1JlZlB0 cjxBcmNoaXZlPigwKTsKIH0KIAogdm9pZCBBcmNoaXZlRmFjdG9yeTo6cmVnaXN0ZXJLbm93bkFy Y2hpdmVNSU1FVHlwZXMoKQpJbmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL2ljb24vSWNvbkRh dGFiYXNlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvaWNvbi9JY29u RGF0YWJhc2UuY3BwCShyZXZpc2lvbiA4NDA4MikKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9p Y29uL0ljb25EYXRhYmFzZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUxMiw3ICs1MTIsNyBAQCB2 b2lkIEljb25EYXRhYmFzZTo6c2V0SWNvbkRhdGFGb3JJY29uVVJMCiAgICAgaWYgKCFpc09wZW4o KSB8fCBpY29uVVJMT3JpZ2luYWwuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm47CiAgICAgCi0g ICAgUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gZGF0YSA9IGRhdGFPcmlnaW5hbCA/IGRhdGFPcmlnaW5h bC0+Y29weSgpIDogMDsKKyAgICBSZWZQdHI8U2hhcmVkQnVmZmVyPiBkYXRhID0gZGF0YU9yaWdp bmFsID8gZGF0YU9yaWdpbmFsLT5jb3B5KCkgOiBQYXNzUmVmUHRyPFNoYXJlZEJ1ZmZlcj4oMCk7 CiAgICAgU3RyaW5nIGljb25VUkwgPSBpY29uVVJMT3JpZ2luYWwuY3Jvc3NUaHJlYWRTdHJpbmco KTsKICAgICAKICAgICBWZWN0b3I8U3RyaW5nPiBwYWdlVVJMczsKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL3BhZ2UvYW5pbWF0aW9uL0FuaW1hdGlvbkJhc2UuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0FuaW1hdGlvbkJhc2UuY3BwCShyZXZpc2lvbiA4NDA4 MikKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0FuaW1hdGlvbkJhc2UuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0xNjYsNyArMTY2LDcgQEAgc3RhdGljIGlubGluZSBUcmFuc2Zvcm1P cGVyYXRpb25zIGJsZW5kRgogICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgc2l6ZTsg aSsrKSB7CiAgICAgICAgICAgICBSZWZQdHI8VHJhbnNmb3JtT3BlcmF0aW9uPiBmcm9tT3AgPSAo aSA8IGZyb21TaXplKSA/IGZyb20ub3BlcmF0aW9ucygpW2ldLmdldCgpIDogMDsKICAgICAgICAg ICAgIFJlZlB0cjxUcmFuc2Zvcm1PcGVyYXRpb24+IHRvT3AgPSAoaSA8IHRvU2l6ZSkgPyB0by5v cGVyYXRpb25zKClbaV0uZ2V0KCkgOiAwOwotICAgICAgICAgICAgUmVmUHRyPFRyYW5zZm9ybU9w ZXJhdGlvbj4gYmxlbmRlZE9wID0gdG9PcCA/IHRvT3AtPmJsZW5kKGZyb21PcC5nZXQoKSwgcHJv Z3Jlc3MpIDogKGZyb21PcCA/IGZyb21PcC0+YmxlbmQoMCwgcHJvZ3Jlc3MsIHRydWUpIDogMCk7 CisgICAgICAgICAgICBSZWZQdHI8VHJhbnNmb3JtT3BlcmF0aW9uPiBibGVuZGVkT3AgPSB0b09w ID8gdG9PcC0+YmxlbmQoZnJvbU9wLmdldCgpLCBwcm9ncmVzcykgOiAoZnJvbU9wID8gZnJvbU9w LT5ibGVuZCgwLCBwcm9ncmVzcywgdHJ1ZSkgOiBQYXNzUmVmUHRyPFRyYW5zZm9ybU9wZXJhdGlv bj4oMCkpOwogICAgICAgICAgICAgaWYgKGJsZW5kZWRPcCkKICAgICAgICAgICAgICAgICByZXN1 bHQub3BlcmF0aW9ucygpLmFwcGVuZChibGVuZGVkT3ApOwogICAgICAgICAgICAgZWxzZSB7Cklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAJKHJldmlzaW9uIDg0 MDgyKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNDAyMCw3ICs0MDIwLDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6c3R5bGVDaGFu Z2VkKFN0eWxlRGlmZgogdm9pZCBSZW5kZXJMYXllcjo6dXBkYXRlU2Nyb2xsQ29ybmVyU3R5bGUo KQogewogICAgIFJlbmRlck9iamVjdCogYWN0dWFsUmVuZGVyZXIgPSByZW5kZXJlcigpLT5ub2Rl KCkgPyByZW5kZXJlcigpLT5ub2RlKCktPnNoYWRvd0FuY2VzdG9yTm9kZSgpLT5yZW5kZXJlcigp IDogcmVuZGVyZXIoKTsKLSAgICBSZWZQdHI8UmVuZGVyU3R5bGU+IGNvcm5lciA9IHJlbmRlcmVy KCktPmhhc092ZXJmbG93Q2xpcCgpID8gYWN0dWFsUmVuZGVyZXItPmdldFVuY2FjaGVkUHNldWRv U3R5bGUoU0NST0xMQkFSX0NPUk5FUiwgYWN0dWFsUmVuZGVyZXItPnN0eWxlKCkpIDogMDsKKyAg ICBSZWZQdHI8UmVuZGVyU3R5bGU+IGNvcm5lciA9IHJlbmRlcmVyKCktPmhhc092ZXJmbG93Q2xp cCgpID8gYWN0dWFsUmVuZGVyZXItPmdldFVuY2FjaGVkUHNldWRvU3R5bGUoU0NST0xMQkFSX0NP Uk5FUiwgYWN0dWFsUmVuZGVyZXItPnN0eWxlKCkpIDogUGFzc1JlZlB0cjxSZW5kZXJTdHlsZT4o MCk7CiAgICAgaWYgKGNvcm5lcikgewogICAgICAgICBpZiAoIW1fc2Nyb2xsQ29ybmVyKSB7CiAg ICAgICAgICAgICBtX3Njcm9sbENvcm5lciA9IG5ldyAocmVuZGVyZXIoKS0+cmVuZGVyQXJlbmEo KSkgUmVuZGVyU2Nyb2xsYmFyUGFydChyZW5kZXJlcigpLT5kb2N1bWVudCgpKTsKQEAgLTQwMzYs NyArNDAzNiw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnVwZGF0ZVNjcm9sbENvcm5lclN0eWwKIHZv aWQgUmVuZGVyTGF5ZXI6OnVwZGF0ZVJlc2l6ZXJTdHlsZSgpCiB7CiAgICAgUmVuZGVyT2JqZWN0 KiBhY3R1YWxSZW5kZXJlciA9IHJlbmRlcmVyKCktPm5vZGUoKSA/IHJlbmRlcmVyKCktPm5vZGUo KS0+c2hhZG93QW5jZXN0b3JOb2RlKCktPnJlbmRlcmVyKCkgOiByZW5kZXJlcigpOwotICAgIFJl ZlB0cjxSZW5kZXJTdHlsZT4gcmVzaXplciA9IHJlbmRlcmVyKCktPmhhc092ZXJmbG93Q2xpcCgp ID8gYWN0dWFsUmVuZGVyZXItPmdldFVuY2FjaGVkUHNldWRvU3R5bGUoUkVTSVpFUiwgYWN0dWFs UmVuZGVyZXItPnN0eWxlKCkpIDogMDsKKyAgICBSZWZQdHI8UmVuZGVyU3R5bGU+IHJlc2l6ZXIg PSByZW5kZXJlcigpLT5oYXNPdmVyZmxvd0NsaXAoKSA/IGFjdHVhbFJlbmRlcmVyLT5nZXRVbmNh Y2hlZFBzZXVkb1N0eWxlKFJFU0laRVIsIGFjdHVhbFJlbmRlcmVyLT5zdHlsZSgpKSA6IFBhc3NS ZWZQdHI8UmVuZGVyU3R5bGU+KDApOwogICAgIGlmIChyZXNpemVyKSB7CiAgICAgICAgIGlmICgh bV9yZXNpemVyKSB7CiAgICAgICAgICAgICBtX3Jlc2l6ZXIgPSBuZXcgKHJlbmRlcmVyKCktPnJl bmRlckFyZW5hKCkpIFJlbmRlclNjcm9sbGJhclBhcnQocmVuZGVyZXIoKS0+ZG9jdW1lbnQoKSk7 CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyU2Nyb2xsYmFyLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyU2Nyb2xsYmFyLmNwcAko cmV2aXNpb24gODQwODIpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyU2Nyb2xs YmFyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjI5LDcgKzIyOSw3IEBAIHZvaWQgUmVuZGVyU2Ny b2xsYmFyOjp1cGRhdGVTY3JvbGxiYXJQYXIKICAgICBpZiAocGFydFR5cGUgPT0gTm9QYXJ0KQog ICAgICAgICByZXR1cm47CiAKLSAgICBSZWZQdHI8UmVuZGVyU3R5bGU+IHBhcnRTdHlsZSA9ICFk ZXN0cm95ID8gZ2V0U2Nyb2xsYmFyUHNldWRvU3R5bGUocGFydFR5cGUsICBwc2V1ZG9Gb3JTY3Jv bGxiYXJQYXJ0KHBhcnRUeXBlKSkgOiAwOworICAgIFJlZlB0cjxSZW5kZXJTdHlsZT4gcGFydFN0 eWxlID0gIWRlc3Ryb3kgPyBnZXRTY3JvbGxiYXJQc2V1ZG9TdHlsZShwYXJ0VHlwZSwgIHBzZXVk b0ZvclNjcm9sbGJhclBhcnQocGFydFR5cGUpKSA6IFBhc3NSZWZQdHI8UmVuZGVyU3R5bGU+KDAp OwogICAgIAogICAgIGJvb2wgbmVlZFJlbmRlcmVyID0gIWRlc3Ryb3kgJiYgcGFydFN0eWxlICYm IHBhcnRTdHlsZS0+ZGlzcGxheSgpICE9IE5PTkUgJiYgcGFydFN0eWxlLT52aXNpYmlsaXR5KCkg PT0gVklTSUJMRTsKICAgICAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU ZXh0RnJhZ21lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJUZXh0RnJhZ21lbnQuY3BwCShyZXZpc2lvbiA4NDA4MikKKysrIFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJUZXh0RnJhZ21lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yOSw3 ICsyOSw3IEBACiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIFJlbmRlclRleHRGcmFnbWVudDo6UmVu ZGVyVGV4dEZyYWdtZW50KE5vZGUqIG5vZGUsIFN0cmluZ0ltcGwqIHN0ciwgaW50IHN0YXJ0T2Zm c2V0LCBpbnQgbGVuZ3RoKQotICAgIDogUmVuZGVyVGV4dChub2RlLCBzdHIgPyBzdHItPnN1YnN0 cmluZyhzdGFydE9mZnNldCwgbGVuZ3RoKSA6IDApCisgICAgOiBSZW5kZXJUZXh0KG5vZGUsIHN0 ciA/IHN0ci0+c3Vic3RyaW5nKHN0YXJ0T2Zmc2V0LCBsZW5ndGgpIDogUGFzc1JlZlB0cjxTdHJp bmdJbXBsPigwKSkKICAgICAsIG1fc3RhcnQoc3RhcnRPZmZzZXQpCiAgICAgLCBtX2VuZChsZW5n dGgpCiAgICAgLCBtX2ZpcnN0TGV0dGVyKDApCg==