176262 2017-09-01 18:19:12 -0700 WSL should check unreachable code and no returns 2018-10-13 17:09:51 -0700 1 1 1 Unclassified WebKit WebGPU WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 176199 1 fpizlo fpizlo keith_miller mmaxfield webkit-bug-importer oldest_to_newest 1344713 0 fpizlo 2017-09-01 18:19:12 -0700 Patch forthcoming. 1344714 1 319684 fpizlo 2017-09-01 18:23:43 -0700 Created attachment 319684 the patch 1344719 2 319684 mmaxfield 2017-09-01 19:18:17 -0700 Comment on attachment 319684 the patch I'd like to add control flow statements soon. Hopefully I'm up to the task! 1344721 3 fpizlo 2017-09-01 19:33:02 -0700 (In reply to Myles C. Maxfield from comment #2) > Comment on attachment 319684 [details] > the patch > > I'd like to add control flow statements soon. Hopefully I'm up to the task! The nice thing about those is that the type system basically doesn't have to know about them, so you can probably just let the Checker's and NameResolver's default Visitor methods take care of those control flow nodes. The one exception is ternaries. But that's easy - just verify that the two cases return the same type, and then return that type. I guess to do control flow, we'll either need a bool type, or we'll need a story for which types can be used as bools. How should that work? I guess bool could be a native type. Then you'd need to add a BoolLiteral class. Shouldn't be that hard. Do you want to do that, too? 1344722 4 fpizlo 2017-09-01 19:34:27 -0700 Landed in https://trac.webkit.org/changeset/221513/webkit 1344821 5 mmaxfield 2017-09-02 10:54:38 -0700 (In reply to Filip Pizlo from comment #3) > (In reply to Myles C. Maxfield from comment #2) > > Comment on attachment 319684 [details] > > the patch > > > > I'd like to add control flow statements soon. Hopefully I'm up to the task! > > The nice thing about those is that the type system basically doesn't have to > know about them, so you can probably just let the Checker's and > NameResolver's default Visitor methods take care of those control flow nodes. > > The one exception is ternaries. But that's easy - just verify that the two > cases return the same type, and then return that type. > > I guess to do control flow, we'll either need a bool type, or we'll need a > story for which types can be used as bools. How should that work? > > I guess bool could be a native type. Then you'd need to add a BoolLiteral > class. Shouldn't be that hard. Do you want to do that, too? HLSL, GLSL, Metal, and OpenCL all have a native bool type. I see no reason to be different here. 1353721 6 webkit-bug-importer 2017-09-27 12:54:00 -0700 <rdar://problem/34694242> 1468960 7 mmaxfield 2018-10-13 17:09:51 -0700 Migrated to https://github.com/gpuweb/WHLSL/issues/161 319684 2017-09-01 18:23:43 -0700 2017-09-01 19:18:17 -0700 the patch blah.patch text/plain 12472 fpizlo SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIyMTUxMSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDM0IEBACisyMDE3LTA5LTAxICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisK KyAgICAgICAgV1NMIHNob3VsZCBjaGVjayB1bnJlYWNoYWJsZSBjb2RlIGFuZCBubyByZXR1cm5z CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzYyNjIK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAg IFRoaXMgYWRkcyBwaGFzZXMgdG8gY2hlY2sgd2hldGhlciBub24tdm9pZCBmdW5jdGlvbnMgcmV0 dXJuIGFuZCB3aGV0aGVyIHRoZXJlIGlzIGFueSBjb2RlIGFmdGVyCisgICAgICAgIGEgcmV0dXJu IGluIGFueSBibG9jay4gQWRkZWQgdGVzdHMgZm9yIHNpbXBsZSB2ZXJzaW9ucyBvZiBib3RoIG9m IHRob3NlIHRoaW5ncy4gV2UgY2Fubm90IGFkZAorICAgICAgICBtb3JlIGNvbXBsZXggdmVyc2lv bnMgdW50aWwgd2Ugc3VwcG9ydCBjb250cm9sIGZsb3cgc3RhdGVtZW50cy4KKworICAgICAgICAq IFdlYkdQVVNoYWRpbmdMYW5ndWFnZVJJL0FsbC5qczoKKyAgICAgICAgKiBXZWJHUFVTaGFkaW5n TGFuZ3VhZ2VSSS9DaGVja1JldHVybnMuanM6IEFkZGVkLgorICAgICAgICAoY2hlY2tSZXR1cm5z KToKKyAgICAgICAgKiBXZWJHUFVTaGFkaW5nTGFuZ3VhZ2VSSS9DaGVja1VucmVhY2hhYmxlQ29k ZS5qczogQWRkZWQuCisgICAgICAgIChjaGVja1VucmVhY2hhYmxlQ29kZSk6CisgICAgICAgICog V2ViR1BVU2hhZGluZ0xhbmd1YWdlUkkvUGFyc2UuanM6CisgICAgICAgIChwYXJzZVJldHVybik6 CisgICAgICAgICogV2ViR1BVU2hhZGluZ0xhbmd1YWdlUkkvUHJlcGFyZS5qczoKKyAgICAgICAg KHByZXBhcmUpOgorICAgICAgICAqIFdlYkdQVVNoYWRpbmdMYW5ndWFnZVJJL1JldHVybkNoZWNr ZXIuanM6IEFkZGVkLgorICAgICAgICAoUmV0dXJuQ2hlY2tlci5wcm90b3R5cGUudmlzaXRGdW5j RGVmKToKKyAgICAgICAgKFJldHVybkNoZWNrZXIucHJvdG90eXBlLnZpc2l0QmxvY2spOgorICAg ICAgICAoUmV0dXJuQ2hlY2tlci5wcm90b3R5cGUudmlzaXRSZXR1cm4pOgorICAgICAgICAoUmV0 dXJuQ2hlY2tlcik6CisgICAgICAgICogV2ViR1BVU2hhZGluZ0xhbmd1YWdlUkkvVGVzdC5qczoK KyAgICAgICAgKFRFU1Rfc2ltcGxlTm9SZXR1cm4pOgorICAgICAgICAqIFdlYkdQVVNoYWRpbmdM YW5ndWFnZVJJL1VucmVhY2hhYmxlQ29kZUNoZWNrZXIuanM6IEFkZGVkLgorICAgICAgICAoVW5y ZWFjaGFibGVDb2RlQ2hlY2tlci5wcm90b3R5cGUudmlzaXRCbG9jayk6CisgICAgICAgIChVbnJl YWNoYWJsZUNvZGVDaGVja2VyKToKKwogMjAxNy0wOS0wMSAgRmlsaXAgUGl6bG8gIDxmcGl6bG9A YXBwbGUuY29tPgogCiAgICAgICAgIFdTTCBzaG91bGQgdXNlICYgZm9yIGdldHRpbmcgYSBeIGFu ZCBAIGZvciBnZXR0aW5nIGEgW10KSW5kZXg6IFRvb2xzL1dlYkdQVVNoYWRpbmdMYW5ndWFnZVJJ L0FsbC5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9XZWJHUFVTaGFkaW5nTGFuZ3VhZ2VSSS9BbGwu anMJKHJldmlzaW9uIDIyMTUxMCkKKysrIFRvb2xzL1dlYkdQVVNoYWRpbmdMYW5ndWFnZVJJL0Fs bC5qcwkod29ya2luZyBjb3B5KQpAQCAtNDEsNiArNDEsOCBAQCBsb2FkKCJDYWxsQXNzaWdubWVu dC5qcyIpOwogbG9hZCgiQ2FsbEV4cHJlc3Npb24uanMiKTsKIGxvYWQoIkNhbGxGdW5jdGlvbi5q cyIpOwogbG9hZCgiQ2hlY2suanMiKTsKK2xvYWQoIkNoZWNrUmV0dXJucy5qcyIpOworbG9hZCgi Q2hlY2tVbnJlYWNoYWJsZUNvZGUuanMiKTsKIGxvYWQoIkNoZWNrZXIuanMiKTsKIGxvYWQoIkNv bW1hRXhwcmVzc2lvbi5qcyIpOwogbG9hZCgiQ29uc3RleHByVHlwZVBhcmFtZXRlci5qcyIpOwpA QCAtODQsNiArODYsNyBAQCBsb2FkKCJSZXNvbHZlTmFtZXMuanMiKTsKIGxvYWQoIlJlc29sdmVP dmVybG9hZEltcGwuanMiKTsKIGxvYWQoIlJlc29sdmVUeXBlRGVmcy5qcyIpOwogbG9hZCgiUmV0 dXJuLmpzIik7Citsb2FkKCJSZXR1cm5DaGVja2VyLmpzIik7CiBsb2FkKCJSZXR1cm5FeGNlcHRp b24uanMiKTsKIGxvYWQoIlN0YW5kYXJkTGlicmFyeS5qcyIpOwogbG9hZCgiU3RydWN0VHlwZS5q cyIpOwpAQCAtOTcsNiArMTAwLDcgQEAgbG9hZCgiVHlwZVZhcmlhYmxlLmpzIik7CiBsb2FkKCJU eXBlZFZhbHVlLmpzIik7CiBsb2FkKCJVaW50TGl0ZXJhbC5qcyIpOwogbG9hZCgiVW5pZmljYXRp b25Db250ZXh0LmpzIik7Citsb2FkKCJVbnJlYWNoYWJsZUNvZGVDaGVja2VyLmpzIik7CiBsb2Fk KCJWYXJpYWJsZURlY2wuanMiKTsKIGxvYWQoIlZhcmlhYmxlUmVmLmpzIik7CiBsb2FkKCJWaXNp dGluZ1NldC5qcyIpOwpJbmRleDogVG9vbHMvV2ViR1BVU2hhZGluZ0xhbmd1YWdlUkkvQ2hlY2tS ZXR1cm5zLmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1dlYkdQVVNoYWRpbmdMYW5ndWFnZVJJL0No ZWNrUmV0dXJucy5qcwkobm9uZXhpc3RlbnQpCisrKyBUb29scy9XZWJHUFVTaGFkaW5nTGFuZ3Vh Z2VSSS9DaGVja1JldHVybnMuanMJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwzMSBAQAorLyoK KyAqIENvcHlyaWdodCAoQykgMjAxNyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisg KgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywg d2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQg dGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3Ry aWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAor ICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBk aXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVw cm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNv bmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3Vt ZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmli dXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIGBg QVMgSVMnJyBBTkQgQU5ZCisgKiBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVE SU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFRIRQorICogSU1QTElFRCBXQVJSQU5USUVTIE9GIE1F UkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFS RSBESVNDTEFJTUVELiAgSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUgorICogQ09OVFJJ QlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQ RUNJQUwsCisgKiBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5H LCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RT IE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IKKyAqIFBST0ZJVFM7IE9SIEJVU0lO RVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkKKyAqIE9G IExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9S VAorICogKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkg V0FZIE9VVCBPRiBUSEUgVVNFCisgKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQg T0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLiAKKyAqLworInVzZSBzdHJpY3QiOwor CitmdW5jdGlvbiBjaGVja1JldHVybnMocHJvZ3JhbSkKK3sKKyAgICBwcm9ncmFtLnZpc2l0KG5l dyBSZXR1cm5DaGVja2VyKCkpOworfQorCkluZGV4OiBUb29scy9XZWJHUFVTaGFkaW5nTGFuZ3Vh Z2VSSS9DaGVja1VucmVhY2hhYmxlQ29kZS5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9XZWJHUFVT aGFkaW5nTGFuZ3VhZ2VSSS9DaGVja1VucmVhY2hhYmxlQ29kZS5qcwkobm9uZXhpc3RlbnQpCisr KyBUb29scy9XZWJHUFVTaGFkaW5nTGFuZ3VhZ2VSSS9DaGVja1VucmVhY2hhYmxlQ29kZS5qcwko d29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDMxIEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDE3 IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBh bmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1v ZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29u ZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29k ZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlz dCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRp c3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHly aWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxv d2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIg bWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNP RlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gYGBBUyBJUycnIEFORCBBTlkKKyAqIEVY UFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBU TywgVEhFCisgKiBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRO RVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuICBJTiBOTyBF VkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SCisgKiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBB TlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwKKyAqIEVYRU1QTEFSWSwg T1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywK KyAqIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0Yg VVNFLCBEQVRBLCBPUgorICogUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dF VkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWQorICogT0YgTElBQklMSVRZLCBXSEVUSEVSIElO IENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisgKiAoSU5DTFVESU5HIE5FR0xJ R0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKKyAq IE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0Yg U1VDSCBEQU1BR0UuIAorICovCisidXNlIHN0cmljdCI7CisKK2Z1bmN0aW9uIGNoZWNrVW5yZWFj aGFibGVDb2RlKHByb2dyYW0pCit7CisgICAgcHJvZ3JhbS52aXNpdChuZXcgVW5yZWFjaGFibGVD b2RlQ2hlY2tlcigpKTsKK30KKwpJbmRleDogVG9vbHMvV2ViR1BVU2hhZGluZ0xhbmd1YWdlUkkv UGFyc2UuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvV2ViR1BVU2hhZGluZ0xhbmd1YWdlUkkvUGFy c2UuanMJKHJldmlzaW9uIDIyMTUxMSkKKysrIFRvb2xzL1dlYkdQVVNoYWRpbmdMYW5ndWFnZVJJ L1BhcnNlLmpzCSh3b3JraW5nIGNvcHkpCkBAIC01NDgsNiArNTQ4LDggQEAgZnVuY3Rpb24gcGFy c2UocHJvZ3JhbSwgb3JpZ2luLCBsaW5lTnVtYgogICAgIGZ1bmN0aW9uIHBhcnNlUmV0dXJuKCkK ICAgICB7CiAgICAgICAgIGxldCBvcmlnaW4gPSBjb25zdW1lKCJyZXR1cm4iKTsKKyAgICAgICAg aWYgKHRyeUNvbnN1bWUoIjsiKSkKKyAgICAgICAgICAgIHJldHVybiBuZXcgUmV0dXJuKG9yaWdp biwgbnVsbCk7CiAgICAgICAgIGxldCBleHByZXNzaW9uID0gcGFyc2VFeHByZXNzaW9uKCk7CiAg ICAgICAgIGNvbnN1bWUoIjsiKTsKICAgICAgICAgcmV0dXJuIG5ldyBSZXR1cm4ob3JpZ2luLCBl eHByZXNzaW9uKTsKSW5kZXg6IFRvb2xzL1dlYkdQVVNoYWRpbmdMYW5ndWFnZVJJL1ByZXBhcmUu anMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gVG9vbHMvV2ViR1BVU2hhZGluZ0xhbmd1YWdlUkkvUHJlcGFyZS5q cwkocmV2aXNpb24gMjIxNTEwKQorKysgVG9vbHMvV2ViR1BVU2hhZGluZ0xhbmd1YWdlUkkvUHJl cGFyZS5qcwkod29ya2luZyBjb3B5KQpAQCAtMzIsNiArMzIsOCBAQCBmdW5jdGlvbiBwcmVwYXJl KG9yaWdpbiwgbGluZU51bWJlck9mZnNlCiAgICAgcmVzb2x2ZU5hbWVzKHByb2dyYW0pOwogICAg IHJlc29sdmVUeXBlRGVmcyhwcm9ncmFtKTsKICAgICBjaGVjayhwcm9ncmFtKTsKKyAgICBjaGVj a1JldHVybnMocHJvZ3JhbSk7CisgICAgY2hlY2tVbnJlYWNoYWJsZUNvZGUocHJvZ3JhbSk7CiAg ICAgaW5saW5lKHByb2dyYW0pOwogICAgIHJldHVybiBwcm9ncmFtOwogfQpJbmRleDogVG9vbHMv V2ViR1BVU2hhZGluZ0xhbmd1YWdlUkkvUmV0dXJuQ2hlY2tlci5qcwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9XZWJHUFVTaGFkaW5nTGFuZ3VhZ2VSSS9SZXR1cm5DaGVja2VyLmpzCShub25leGlzdGVu dCkKKysrIFRvb2xzL1dlYkdQVVNoYWRpbmdMYW5ndWFnZVJJL1JldHVybkNoZWNrZXIuanMJKHdv cmtpbmcgY29weSkKQEAgLTAsMCArMSw0OSBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxNyBB cHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5k IHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2Rp ZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRp dGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUg bXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qg b2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0 cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmln aHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dp bmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1h dGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZU V0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIGBgQVMgSVMnJyBBTkQgQU5ZCisgKiBFWFBS RVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8s IFRIRQorICogSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVT UyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiAgSU4gTk8gRVZF TlQgU0hBTEwgQVBQTEUgSU5DLiBPUgorICogQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5Z IERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsCisgKiBFWEVNUExBUlksIE9S IENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisg KiBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVT RSwgREFUQSwgT1IKKyAqIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZF UiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkKKyAqIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBD T05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAorICogKElOQ0xVRElORyBORUdMSUdF TkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCisgKiBP RiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNV Q0ggREFNQUdFLiAKKyAqLworInVzZSBzdHJpY3QiOworCitjbGFzcyBSZXR1cm5DaGVja2VyIGV4 dGVuZHMgVmlzaXRvciB7CisgICAgdmlzaXRGdW5jRGVmKG5vZGUpCisgICAgeworICAgICAgICBp ZiAobm9kZS5yZXR1cm5UeXBlLmVxdWFscyhub2RlLnByb2dyYW0uaW50cmluc2ljcy52b2lkKSkK KyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgCisgICAgICAgIGlmICghbm9kZS5ib2R5LnZp c2l0KHRoaXMpKQorICAgICAgICAgICAgdGhyb3cgbmV3IFdUeXBlRXJyb3Iobm9kZS5vcmlnaW4u b3JpZ2luU3RyaW5nLCAiRnVuY3Rpb24gZG9lcyBub3QgcmV0dXJuIik7CisgICAgfQorICAgIAor ICAgIHZpc2l0QmxvY2sobm9kZSkKKyAgICB7CisgICAgICAgIHJldHVybiBub2RlLnN0YXRlbWVu dHMucmVkdWNlKChyZXN1bHQsIHN0YXRlbWVudCkgPT4gcmVzdWx0IHx8IHN0YXRlbWVudC52aXNp dCh0aGlzKSwgZmFsc2UpOworICAgIH0KKyAgICAKKyAgICAvLyBXaGVuIHdlIGFkZCBjb250cm9s IGZsb3cgc3RhdGVtZW50cywgd2UnbGwgbmVlZCB0byByZXR1cm4gdHJ1ZSBvbmx5IGlmIGJvdGgg YmxvY2tzIHJldHVybiB0cnVlLgorICAgIC8vIElmIGEgbG9vcCByZXR1cm5zLCB0aGVuIGl0IGNv dW50cyBvbmx5IGlmIHRoZSBsb29wIGlzIGd1YXJhbnRlZWQgdG8gcnVuIGF0IGxlYXN0IG9uY2Uu CisgICAgCisgICAgdmlzaXRSZXR1cm4obm9kZSkKKyAgICB7CisgICAgICAgIHJldHVybiB0cnVl OworICAgIH0KK30KSW5kZXg6IFRvb2xzL1dlYkdQVVNoYWRpbmdMYW5ndWFnZVJJL1Rlc3QuanMK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gVG9vbHMvV2ViR1BVU2hhZGluZ0xhbmd1YWdlUkkvVGVzdC5qcwkocmV2 aXNpb24gMjIxNTExKQorKysgVG9vbHMvV2ViR1BVU2hhZGluZ0xhbmd1YWdlUkkvVGVzdC5qcwko d29ya2luZyBjb3B5KQpAQCAtMzU2LDYgKzM1NiwyNiBAQCBmdW5jdGlvbiBURVNUX2xleGVyS2V5 d29yZCgpCiAgICAgY2hlY2tMZXhlclRva2VuKHJlc3VsdFsxMl0sIDQwLCAiaWRlbnRpZmllciIs ICAiYTMiKTsKIH0KIAorZnVuY3Rpb24gVEVTVF9zaW1wbGVOb1JldHVybigpCit7CisgICAgY2hl Y2tGYWlsKAorICAgICAgICAoKSA9PiBkb1ByZXAoImludCBmb28oKSB7IH0iKSwKKyAgICAgICAg KGUpID0+IGUgaW5zdGFuY2VvZiBXVHlwZUVycm9yKTsKK30KKworZnVuY3Rpb24gVEVTVF9zaW1w bGVVbnJlYWNoYWJsZUNvZGUoKQoreworICAgIGNoZWNrRmFpbCgKKyAgICAgICAgKCkgPT4gZG9Q cmVwKGAKKyAgICAgICAgICAgIHZvaWQgZm9vKCkKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAg ICAgICByZXR1cm47CisgICAgICAgICAgICAgICAgaW50IHg7CisgICAgICAgICAgICB9CisgICAg ICAgIGApLAorICAgICAgICAoZSkgPT4gZSBpbnN0YW5jZW9mIFdUeXBlRXJyb3IpOworfQorCiBs ZXQgYmVmb3JlID0gcHJlY2lzZVRpbWUoKTsKIAogbGV0IGZpbHRlciA9IC8uKi87IC8vIHJ1biBl dmVyeXRoaW5nIGJ5IGRlZmF1bHQKSW5kZXg6IFRvb2xzL1dlYkdQVVNoYWRpbmdMYW5ndWFnZVJJ L1VucmVhY2hhYmxlQ29kZUNoZWNrZXIuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvV2ViR1BVU2hh ZGluZ0xhbmd1YWdlUkkvVW5yZWFjaGFibGVDb2RlQ2hlY2tlci5qcwkobm9uZXhpc3RlbnQpCisr KyBUb29scy9XZWJHUFVTaGFkaW5nTGFuZ3VhZ2VSSS9VbnJlYWNoYWJsZUNvZGVDaGVja2VyLmpz CSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsNDQgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIw MTcgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9u IGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICog bW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBj b25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBj b2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBs aXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJl ZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29w eXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9s bG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhl ciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMg U09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBgYEFTIElTJycgQU5EIEFOWQorICog RVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVE IFRPLCBUSEUKKyAqIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJ VE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gIElOIE5P IEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IKKyAqIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9S IEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLAorICogRVhFTVBMQVJZ LCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRP LAorICogUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBP RiBVU0UsIERBVEEsIE9SCisgKiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhP V0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZCisgKiBPRiBMSUFCSUxJVFksIFdIRVRIRVIg SU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyAqIChJTkNMVURJTkcgTkVH TElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQor ICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBP RiBTVUNIIERBTUFHRS4gCisgKi8KKyJ1c2Ugc3RyaWN0IjsKKworY2xhc3MgVW5yZWFjaGFibGVD b2RlQ2hlY2tlciBleHRlbmRzIFZpc2l0b3IgeworICAgIGNvbnN0cnVjdG9yKCkKKyAgICB7Cisg ICAgICAgIHN1cGVyKCk7CisgICAgICAgIHRoaXMuX3JldHVybkNoZWNrZXIgPSBuZXcgUmV0dXJu Q2hlY2tlcigpOworICAgIH0KKyAgICAKKyAgICB2aXNpdEJsb2NrKG5vZGUpCisgICAgeworICAg ICAgICBmb3IgKGxldCBpID0gMDsgaSA8IG5vZGUuc3RhdGVtZW50cy5sZW5ndGggLSAxOyArK2kp IHsKKyAgICAgICAgICAgIGxldCBzdGF0ZW1lbnQgPSBub2RlLnN0YXRlbWVudHNbaV07CisgICAg ICAgICAgICBpZiAoc3RhdGVtZW50LnZpc2l0KHRoaXMuX3JldHVybkNoZWNrZXIpKQorICAgICAg ICAgICAgICAgIHRocm93IG5ldyBXVHlwZUVycm9yKAorICAgICAgICAgICAgICAgICAgICBub2Rl LnN0YXRlbWVudHNbaSArIDFdLm9yaWdpbi5vcmlnaW5TdHJpbmcsCisgICAgICAgICAgICAgICAg ICAgICJVbnJlYWNoYWJsZSBjb2RlIik7CisgICAgICAgIH0KKyAgICB9Cit9Cg==