189175 2018-08-30 14:46:42 -0700 [WHLSL] Fix array indexing behavior 2018-10-13 14:42:09 -0700 1 1 1 Unclassified WebKit WebGPU Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 189099 176199 1 tdenney tdenney commit-queue dino mmaxfield webkit-bug-importer oldest_to_newest 1455427 0 tdenney 2018-08-30 14:46:42 -0700 Currently WHLSL parses the declaration "int[2][3] array” as an array of length 3 of arrays of 2 integers; we need the reverse to match C. 1455474 1 348568 tdenney 2018-08-30 16:47:34 -0700 Created attachment 348568 Patch 1455475 2 348568 mmaxfield 2018-08-30 16:50:34 -0700 Comment on attachment 348568 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=348568&action=review > Tools/ChangeLog:7 > + > + Reviewed by NOBODY (OOPS!). > + Need some description > Tools/WebGPUShadingLanguageRI/Parse.js:266 > + // token is updated each iteration, so constructors must use the token associated with their iteration. > + const tokenCopy = token; can you fix this by saying "while (let token = ...)"? 1455478 3 348570 tdenney 2018-08-30 16:56:50 -0700 Created attachment 348570 Patch 1455481 4 348571 tdenney 2018-08-30 16:59:12 -0700 Created attachment 348571 Patch 1455490 5 348571 commit-queue 2018-08-30 17:39:16 -0700 Comment on attachment 348571 Patch Clearing flags on attachment: 348571 Committed r235533: <https://trac.webkit.org/changeset/235533> 1455491 6 commit-queue 2018-08-30 17:39:17 -0700 All reviewed patches have been landed. Closing bug. 1455707 7 webkit-bug-importer 2018-08-31 08:56:56 -0700 <rdar://problem/43941968> 1468825 8 mmaxfield 2018-10-13 14:42:09 -0700 Migrated to https://github.com/gpuweb/WHLSL/issues/50 348568 2018-08-30 16:47:34 -0700 2018-08-30 16:56:49 -0700 Patch bug-189175-20180830164733.patch text/plain 3249 tdenney U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1NTMyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTUwNDIyMTY4MTkxNWY1OTZhY2JjYmMzNmJlYTJiOWI4 M2RiOTg0ZC4uOWY4OTIzNWFmZGJhMmNiOTY1ZTJiMzk0OTE5NTdkMTY5YWY2OGM2ZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0 IEBACisyMDE4LTA4LTMwICBUaG9tYXMgRGVubmV5ICA8dGRlbm5leUBhcHBsZS5jb20+CisKKyAg ICAgICAgW1dITFNMXSBGaXggYXJyYXkgaW5kZXhpbmcgYmVoYXZpb3IKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4OTE3NQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViR1BVU2hhZGluZ0xhbmd1YWdl UkkvUGFyc2UuanM6CisgICAgICAgIChwYXJzZVR5cGUpOgorICAgICAgICAqIFdlYkdQVVNoYWRp bmdMYW5ndWFnZVJJL1Rlc3QuanM6CisKIDIwMTgtMDgtMzAgIFdlbnNvbiBIc2llaCAgPHdlbnNv bl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgRm9sbG93dXAgdG8gW2lPU10gVGVzdFdlYktp dEFQSS5QYXN0ZUltYWdlIHRlc3RzIGFyZSBmbGFreSBmYWlsdXJlcwpkaWZmIC0tZ2l0IGEvVG9v bHMvV2ViR1BVU2hhZGluZ0xhbmd1YWdlUkkvUGFyc2UuanMgYi9Ub29scy9XZWJHUFVTaGFkaW5n TGFuZ3VhZ2VSSS9QYXJzZS5qcwppbmRleCBhMjAyNDhkMzYxOWMwNTBmN2Q0YjM4YTJlYTBjZDBi MjlmMmMxODc5Li5kYTQ3MTQyZjUxOTA3ODI3YmEzNzZlNjgyNmYzMmFmNTIxNjVlMmQ4IDEwMDY0 NAotLS0gYS9Ub29scy9XZWJHUFVTaGFkaW5nTGFuZ3VhZ2VSSS9QYXJzZS5qcworKysgYi9Ub29s cy9XZWJHUFVTaGFkaW5nTGFuZ3VhZ2VSSS9QYXJzZS5qcwpAQCAtMjU5LDI0ICsyNTksMzUgQEAg ZnVuY3Rpb24gcGFyc2UocHJvZ3JhbSwgb3JpZ2luLCBvcmlnaW5LaW5kLCBsaW5lTnVtYmVyT2Zm c2V0LCB0ZXh0KQogICAgICAgICAgICAgcmV0dXJuIGNvbnN1bWUoLi4uYWRkcmVzc1NwYWNlcyku dGV4dDsKICAgICAgICAgfQogICAgICAgICAKKyAgICAgICAgY29uc3QgdHlwZUNvbnN0cnVjdG9y U3RhY2sgPSBbIF07CisKICAgICAgICAgd2hpbGUgKHRva2VuID0gdHJ5Q29uc3VtZSgiKiIsICJb IikpIHsKKyAgICAgICAgICAgIC8vIHRva2VuIGlzIHVwZGF0ZWQgZWFjaCBpdGVyYXRpb24sIHNv IGNvbnN0cnVjdG9ycyBtdXN0IHVzZSB0aGUgdG9rZW4gYXNzb2NpYXRlZCB3aXRoIHRoZWlyIGl0 ZXJhdGlvbi4KKyAgICAgICAgICAgIGNvbnN0IHRva2VuQ29weSA9IHRva2VuOwogICAgICAgICAg ICAgaWYgKHRva2VuLnRleHQgPT0gIioiKSB7Ci0gICAgICAgICAgICAgICAgdHlwZSA9IG5ldyBQ dHJUeXBlKHRva2VuLCBnZXRBZGRyZXNzU3BhY2UoKSwgdHlwZSk7CisgICAgICAgICAgICAgICAg Ly8gTGlrZXdpc2UsIHRoZSBhZGRyZXNzIHNwYWNlIG11c3QgYmUgcGFyc2VkIGJlZm9yZSBwYXJz aW5nIGNvbnRpbnVlcy4KKyAgICAgICAgICAgICAgICBjb25zdCBhZGRyZXNzU3BhY2UgPSBnZXRB ZGRyZXNzU3BhY2UoKTsKKyAgICAgICAgICAgICAgICB0eXBlQ29uc3RydWN0b3JTdGFjay51bnNo aWZ0KHR5cGUgPT4gbmV3IFB0clR5cGUodG9rZW5Db3B5LCBhZGRyZXNzU3BhY2UsIHR5cGUpKTsK ICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIAor CiAgICAgICAgICAgICBpZiAodHJ5Q29uc3VtZSgiXSIpKSB7Ci0gICAgICAgICAgICAgICAgdHlw ZSA9IG5ldyBBcnJheVJlZlR5cGUodG9rZW4sIGdldEFkZHJlc3NTcGFjZSgpLCB0eXBlKTsKKyAg ICAgICAgICAgICAgICBjb25zdCBhZGRyZXNzU3BhY2UgPSBnZXRBZGRyZXNzU3BhY2UoKTsKKyAg ICAgICAgICAgICAgICB0eXBlQ29uc3RydWN0b3JTdGFjay51bnNoaWZ0KHR5cGUgPT4gbmV3IEFy cmF5UmVmVHlwZSh0b2tlbkNvcHksIGFkZHJlc3NTcGFjZSwgdHlwZSkpOwogICAgICAgICAgICAg ICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgfQotICAgICAgICAgICAgCi0gICAgICAgICAgICB0 eXBlID0gbmV3IEFycmF5VHlwZSh0b2tlbiwgdHlwZSwgcGFyc2VDb25zdGV4cHIoKSk7CisKKyAg ICAgICAgICAgIGNvbnN0IGxlbmd0aEV4cHIgPSBwYXJzZUNvbnN0ZXhwcigpOworICAgICAgICAg ICAgdHlwZUNvbnN0cnVjdG9yU3RhY2sudW5zaGlmdCh0eXBlID0+IG5ldyBBcnJheVR5cGUodG9r ZW5Db3B5LCB0eXBlLCBsZW5ndGhFeHByKSk7CiAgICAgICAgICAgICBjb25zdW1lKCJdIik7CiAg ICAgICAgIH0KLSAgICAgICAgCisKKyAgICAgICAgZm9yIChsZXQgY29uc3RydWN0b3Igb2YgdHlw ZUNvbnN0cnVjdG9yU3RhY2spCisgICAgICAgICAgICB0eXBlID0gY29uc3RydWN0b3IodHlwZSk7 CisKICAgICAgICAgaWYgKGFkZHJlc3NTcGFjZSAmJiAhYWRkcmVzc1NwYWNlQ29uc3VtZWQpCiAg ICAgICAgICAgICBsZXhlci5mYWlsKCJBZGRyZXNzIHNwYWNlIHNwZWNpZmllZCBmb3IgdHlwZSB0 aGF0IGRvZXMgbm90IG5lZWQgYWRkcmVzcyBzcGFjZSIpOwotICAgICAgICAKKwogICAgICAgICBy ZXR1cm4gdHlwZTsKICAgICB9CiAgICAgCmRpZmYgLS1naXQgYS9Ub29scy9XZWJHUFVTaGFkaW5n TGFuZ3VhZ2VSSS9UZXN0LmpzIGIvVG9vbHMvV2ViR1BVU2hhZGluZ0xhbmd1YWdlUkkvVGVzdC5q cwppbmRleCAwMDBkMDU0MDcxMTU4NTBmZjMwZWMyMzY2YWViMTg1YWM1NzNkY2QzLi40YTExYzE4 NTg1OTk3NzhmZjM5MWIwNGYyNjM1YzViNzEwMDVkZjdmIDEwMDY0NAotLS0gYS9Ub29scy9XZWJH UFVTaGFkaW5nTGFuZ3VhZ2VSSS9UZXN0LmpzCisrKyBiL1Rvb2xzL1dlYkdQVVNoYWRpbmdMYW5n dWFnZVJJL1Rlc3QuanMKQEAgLTU1NTEsNyArNTU1MSw3IEBAIHRlc3RzLm1hdHJpeE11bHRpcGxp Y2F0aW9uID0gZnVuY3Rpb24oKSB7CiAgICAgY2hlY2tGbG9hdChwcm9ncmFtLCBjYWxsRnVuY3Rp b24ocHJvZ3JhbSwgImZvbzEzIiwgW10pLCAyOSAqIDcgKyA0MyAqIDExICsgNjEgKiAxMyk7CiB9 CiAKLXRlc3RzLkRJU0FCTEVEX2FycmF5SW5kZXggPSBmdW5jdGlvbigpIHsKK3Rlc3RzLmFycmF5 SW5kZXggPSBmdW5jdGlvbigpIHsKICAgICBsZXQgcHJvZ3JhbSA9IGRvUHJlcChgCiAgICAgICAg IHVpbnQgaW5uZXJBcnJheUxlbmd0aCgpIHsKICAgICAgICAgICAgIGludFsyXVszXSBhcnJheTsK 348570 2018-08-30 16:56:50 -0700 2018-08-30 16:59:10 -0700 Patch bug-189175-20180830165648.patch text/plain 3432 tdenney U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1NTMyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTUwNDIyMTY4MTkxNWY1OTZhY2JjYmMzNmJlYTJiOWI4 M2RiOTg0ZC4uZmRjNGYyNTlkMThiMjljN2Y5MDVhNTYxYjY3NDY2N2ZiMjgyNjY2MSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDE4LTA4LTMwICBUaG9tYXMgRGVubmV5ICA8dGRlbm5leUBhcHBsZS5jb20+CisKKyAg ICAgICAgW1dITFNMXSBGaXggYXJyYXkgaW5kZXhpbmcgYmVoYXZpb3IKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4OTE3NQorCisgICAgICAgIEFycmF5 LCBwb2ludGVyLCBhbmQgYXJyYXkgcmVmIHR5cGVzIGFyZSBub3cgcGFyc2VkIGFuZCB0aGVuIGNv bnN0cnVjdGVkCisgICAgICAgIGluIHJldmVyc2Ugc28gdGhhdCB0aGUgZGVjbGFyYXRpb24gb3Jk ZXIgbWF0Y2hlcyB0aGUgaW5kZXhpbmcgb3JkZXIsIGFzCisgICAgICAgIGluIEMvQysrLgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViR1BVU2hh ZGluZ0xhbmd1YWdlUkkvUGFyc2UuanM6CisgICAgICAgIChwYXJzZVR5cGUpOgorICAgICAgICAq IFdlYkdQVVNoYWRpbmdMYW5ndWFnZVJJL1Rlc3QuanM6CisKIDIwMTgtMDgtMzAgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgRm9sbG93dXAgdG8gW2lP U10gVGVzdFdlYktpdEFQSS5QYXN0ZUltYWdlIHRlc3RzIGFyZSBmbGFreSBmYWlsdXJlcwpkaWZm IC0tZ2l0IGEvVG9vbHMvV2ViR1BVU2hhZGluZ0xhbmd1YWdlUkkvUGFyc2UuanMgYi9Ub29scy9X ZWJHUFVTaGFkaW5nTGFuZ3VhZ2VSSS9QYXJzZS5qcwppbmRleCBhMjAyNDhkMzYxOWMwNTBmN2Q0 YjM4YTJlYTBjZDBiMjlmMmMxODc5Li5kYTQ3MTQyZjUxOTA3ODI3YmEzNzZlNjgyNmYzMmFmNTIx NjVlMmQ4IDEwMDY0NAotLS0gYS9Ub29scy9XZWJHUFVTaGFkaW5nTGFuZ3VhZ2VSSS9QYXJzZS5q cworKysgYi9Ub29scy9XZWJHUFVTaGFkaW5nTGFuZ3VhZ2VSSS9QYXJzZS5qcwpAQCAtMjU5LDI0 ICsyNTksMzUgQEAgZnVuY3Rpb24gcGFyc2UocHJvZ3JhbSwgb3JpZ2luLCBvcmlnaW5LaW5kLCBs aW5lTnVtYmVyT2Zmc2V0LCB0ZXh0KQogICAgICAgICAgICAgcmV0dXJuIGNvbnN1bWUoLi4uYWRk cmVzc1NwYWNlcykudGV4dDsKICAgICAgICAgfQogICAgICAgICAKKyAgICAgICAgY29uc3QgdHlw ZUNvbnN0cnVjdG9yU3RhY2sgPSBbIF07CisKICAgICAgICAgd2hpbGUgKHRva2VuID0gdHJ5Q29u c3VtZSgiKiIsICJbIikpIHsKKyAgICAgICAgICAgIC8vIHRva2VuIGlzIHVwZGF0ZWQgZWFjaCBp dGVyYXRpb24sIHNvIGNvbnN0cnVjdG9ycyBtdXN0IHVzZSB0aGUgdG9rZW4gYXNzb2NpYXRlZCB3 aXRoIHRoZWlyIGl0ZXJhdGlvbi4KKyAgICAgICAgICAgIGNvbnN0IHRva2VuQ29weSA9IHRva2Vu OwogICAgICAgICAgICAgaWYgKHRva2VuLnRleHQgPT0gIioiKSB7Ci0gICAgICAgICAgICAgICAg dHlwZSA9IG5ldyBQdHJUeXBlKHRva2VuLCBnZXRBZGRyZXNzU3BhY2UoKSwgdHlwZSk7CisgICAg ICAgICAgICAgICAgLy8gTGlrZXdpc2UsIHRoZSBhZGRyZXNzIHNwYWNlIG11c3QgYmUgcGFyc2Vk IGJlZm9yZSBwYXJzaW5nIGNvbnRpbnVlcy4KKyAgICAgICAgICAgICAgICBjb25zdCBhZGRyZXNz U3BhY2UgPSBnZXRBZGRyZXNzU3BhY2UoKTsKKyAgICAgICAgICAgICAgICB0eXBlQ29uc3RydWN0 b3JTdGFjay51bnNoaWZ0KHR5cGUgPT4gbmV3IFB0clR5cGUodG9rZW5Db3B5LCBhZGRyZXNzU3Bh Y2UsIHR5cGUpKTsKICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgIH0KLSAg ICAgICAgICAgIAorCiAgICAgICAgICAgICBpZiAodHJ5Q29uc3VtZSgiXSIpKSB7Ci0gICAgICAg ICAgICAgICAgdHlwZSA9IG5ldyBBcnJheVJlZlR5cGUodG9rZW4sIGdldEFkZHJlc3NTcGFjZSgp LCB0eXBlKTsKKyAgICAgICAgICAgICAgICBjb25zdCBhZGRyZXNzU3BhY2UgPSBnZXRBZGRyZXNz U3BhY2UoKTsKKyAgICAgICAgICAgICAgICB0eXBlQ29uc3RydWN0b3JTdGFjay51bnNoaWZ0KHR5 cGUgPT4gbmV3IEFycmF5UmVmVHlwZSh0b2tlbkNvcHksIGFkZHJlc3NTcGFjZSwgdHlwZSkpOwog ICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgfQotICAgICAgICAgICAgCi0g ICAgICAgICAgICB0eXBlID0gbmV3IEFycmF5VHlwZSh0b2tlbiwgdHlwZSwgcGFyc2VDb25zdGV4 cHIoKSk7CisKKyAgICAgICAgICAgIGNvbnN0IGxlbmd0aEV4cHIgPSBwYXJzZUNvbnN0ZXhwcigp OworICAgICAgICAgICAgdHlwZUNvbnN0cnVjdG9yU3RhY2sudW5zaGlmdCh0eXBlID0+IG5ldyBB cnJheVR5cGUodG9rZW5Db3B5LCB0eXBlLCBsZW5ndGhFeHByKSk7CiAgICAgICAgICAgICBjb25z dW1lKCJdIik7CiAgICAgICAgIH0KLSAgICAgICAgCisKKyAgICAgICAgZm9yIChsZXQgY29uc3Ry dWN0b3Igb2YgdHlwZUNvbnN0cnVjdG9yU3RhY2spCisgICAgICAgICAgICB0eXBlID0gY29uc3Ry dWN0b3IodHlwZSk7CisKICAgICAgICAgaWYgKGFkZHJlc3NTcGFjZSAmJiAhYWRkcmVzc1NwYWNl Q29uc3VtZWQpCiAgICAgICAgICAgICBsZXhlci5mYWlsKCJBZGRyZXNzIHNwYWNlIHNwZWNpZmll ZCBmb3IgdHlwZSB0aGF0IGRvZXMgbm90IG5lZWQgYWRkcmVzcyBzcGFjZSIpOwotICAgICAgICAK KwogICAgICAgICByZXR1cm4gdHlwZTsKICAgICB9CiAgICAgCmRpZmYgLS1naXQgYS9Ub29scy9X ZWJHUFVTaGFkaW5nTGFuZ3VhZ2VSSS9UZXN0LmpzIGIvVG9vbHMvV2ViR1BVU2hhZGluZ0xhbmd1 YWdlUkkvVGVzdC5qcwppbmRleCAwMDBkMDU0MDcxMTU4NTBmZjMwZWMyMzY2YWViMTg1YWM1NzNk Y2QzLi40YTExYzE4NTg1OTk3NzhmZjM5MWIwNGYyNjM1YzViNzEwMDVkZjdmIDEwMDY0NAotLS0g YS9Ub29scy9XZWJHUFVTaGFkaW5nTGFuZ3VhZ2VSSS9UZXN0LmpzCisrKyBiL1Rvb2xzL1dlYkdQ VVNoYWRpbmdMYW5ndWFnZVJJL1Rlc3QuanMKQEAgLTU1NTEsNyArNTU1MSw3IEBAIHRlc3RzLm1h dHJpeE11bHRpcGxpY2F0aW9uID0gZnVuY3Rpb24oKSB7CiAgICAgY2hlY2tGbG9hdChwcm9ncmFt LCBjYWxsRnVuY3Rpb24ocHJvZ3JhbSwgImZvbzEzIiwgW10pLCAyOSAqIDcgKyA0MyAqIDExICsg NjEgKiAxMyk7CiB9CiAKLXRlc3RzLkRJU0FCTEVEX2FycmF5SW5kZXggPSBmdW5jdGlvbigpIHsK K3Rlc3RzLmFycmF5SW5kZXggPSBmdW5jdGlvbigpIHsKICAgICBsZXQgcHJvZ3JhbSA9IGRvUHJl cChgCiAgICAgICAgIHVpbnQgaW5uZXJBcnJheUxlbmd0aCgpIHsKICAgICAgICAgICAgIGludFsy XVszXSBhcnJheTsK 348571 2018-08-30 16:59:12 -0700 2018-08-30 17:39:16 -0700 Patch bug-189175-20180830165910.patch text/plain 3323 tdenney U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1NTMyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTUwNDIyMTY4MTkxNWY1OTZhY2JjYmMzNmJlYTJiOWI4 M2RiOTg0ZC4uZmRjNGYyNTlkMThiMjljN2Y5MDVhNTYxYjY3NDY2N2ZiMjgyNjY2MSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDE4LTA4LTMwICBUaG9tYXMgRGVubmV5ICA8dGRlbm5leUBhcHBsZS5jb20+CisKKyAg ICAgICAgW1dITFNMXSBGaXggYXJyYXkgaW5kZXhpbmcgYmVoYXZpb3IKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4OTE3NQorCisgICAgICAgIEFycmF5 LCBwb2ludGVyLCBhbmQgYXJyYXkgcmVmIHR5cGVzIGFyZSBub3cgcGFyc2VkIGFuZCB0aGVuIGNv bnN0cnVjdGVkCisgICAgICAgIGluIHJldmVyc2Ugc28gdGhhdCB0aGUgZGVjbGFyYXRpb24gb3Jk ZXIgbWF0Y2hlcyB0aGUgaW5kZXhpbmcgb3JkZXIsIGFzCisgICAgICAgIGluIEMvQysrLgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViR1BVU2hh ZGluZ0xhbmd1YWdlUkkvUGFyc2UuanM6CisgICAgICAgIChwYXJzZVR5cGUpOgorICAgICAgICAq IFdlYkdQVVNoYWRpbmdMYW5ndWFnZVJJL1Rlc3QuanM6CisKIDIwMTgtMDgtMzAgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgRm9sbG93dXAgdG8gW2lP U10gVGVzdFdlYktpdEFQSS5QYXN0ZUltYWdlIHRlc3RzIGFyZSBmbGFreSBmYWlsdXJlcwpkaWZm IC0tZ2l0IGEvVG9vbHMvV2ViR1BVU2hhZGluZ0xhbmd1YWdlUkkvUGFyc2UuanMgYi9Ub29scy9X ZWJHUFVTaGFkaW5nTGFuZ3VhZ2VSSS9QYXJzZS5qcwppbmRleCBhMjAyNDhkMzYxOWMwNTBmN2Q0 YjM4YTJlYTBjZDBiMjlmMmMxODc5Li5lZTRjOTgwZjNhMTY3MmI2OGE3N2ViYjQ4NTI1ZWRkMjQ5 NDQzYTUzIDEwMDY0NAotLS0gYS9Ub29scy9XZWJHUFVTaGFkaW5nTGFuZ3VhZ2VSSS9QYXJzZS5q cworKysgYi9Ub29scy9XZWJHUFVTaGFkaW5nTGFuZ3VhZ2VSSS9QYXJzZS5qcwpAQCAtMjU5LDI0 ICsyNTksMzMgQEAgZnVuY3Rpb24gcGFyc2UocHJvZ3JhbSwgb3JpZ2luLCBvcmlnaW5LaW5kLCBs aW5lTnVtYmVyT2Zmc2V0LCB0ZXh0KQogICAgICAgICAgICAgcmV0dXJuIGNvbnN1bWUoLi4uYWRk cmVzc1NwYWNlcykudGV4dDsKICAgICAgICAgfQogICAgICAgICAKLSAgICAgICAgd2hpbGUgKHRv a2VuID0gdHJ5Q29uc3VtZSgiKiIsICJbIikpIHsKKyAgICAgICAgY29uc3QgdHlwZUNvbnN0cnVj dG9yU3RhY2sgPSBbIF07CisKKyAgICAgICAgZm9yIChsZXQgdG9rZW47IHRva2VuID0gdHJ5Q29u c3VtZSgiKiIsICJbIik7KSB7CiAgICAgICAgICAgICBpZiAodG9rZW4udGV4dCA9PSAiKiIpIHsK LSAgICAgICAgICAgICAgICB0eXBlID0gbmV3IFB0clR5cGUodG9rZW4sIGdldEFkZHJlc3NTcGFj ZSgpLCB0eXBlKTsKKyAgICAgICAgICAgICAgICAvLyBMaWtld2lzZSwgdGhlIGFkZHJlc3Mgc3Bh Y2UgbXVzdCBiZSBwYXJzZWQgYmVmb3JlIHBhcnNpbmcgY29udGludWVzLgorICAgICAgICAgICAg ICAgIGNvbnN0IGFkZHJlc3NTcGFjZSA9IGdldEFkZHJlc3NTcGFjZSgpOworICAgICAgICAgICAg ICAgIHR5cGVDb25zdHJ1Y3RvclN0YWNrLnVuc2hpZnQodHlwZSA9PiBuZXcgUHRyVHlwZSh0b2tl biwgYWRkcmVzc1NwYWNlLCB0eXBlKSk7CiAgICAgICAgICAgICAgICAgY29udGludWU7CiAgICAg ICAgICAgICB9Ci0gICAgICAgICAgICAKKwogICAgICAgICAgICAgaWYgKHRyeUNvbnN1bWUoIl0i KSkgewotICAgICAgICAgICAgICAgIHR5cGUgPSBuZXcgQXJyYXlSZWZUeXBlKHRva2VuLCBnZXRB ZGRyZXNzU3BhY2UoKSwgdHlwZSk7CisgICAgICAgICAgICAgICAgY29uc3QgYWRkcmVzc1NwYWNl ID0gZ2V0QWRkcmVzc1NwYWNlKCk7CisgICAgICAgICAgICAgICAgdHlwZUNvbnN0cnVjdG9yU3Rh Y2sudW5zaGlmdCh0eXBlID0+IG5ldyBBcnJheVJlZlR5cGUodG9rZW4sIGFkZHJlc3NTcGFjZSwg dHlwZSkpOwogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgfQotICAgICAg ICAgICAgCi0gICAgICAgICAgICB0eXBlID0gbmV3IEFycmF5VHlwZSh0b2tlbiwgdHlwZSwgcGFy c2VDb25zdGV4cHIoKSk7CisKKyAgICAgICAgICAgIGNvbnN0IGxlbmd0aEV4cHIgPSBwYXJzZUNv bnN0ZXhwcigpOworICAgICAgICAgICAgdHlwZUNvbnN0cnVjdG9yU3RhY2sudW5zaGlmdCh0eXBl ID0+IG5ldyBBcnJheVR5cGUodG9rZW4sIHR5cGUsIGxlbmd0aEV4cHIpKTsKICAgICAgICAgICAg IGNvbnN1bWUoIl0iKTsKICAgICAgICAgfQotICAgICAgICAKKworICAgICAgICBmb3IgKGxldCBj b25zdHJ1Y3RvciBvZiB0eXBlQ29uc3RydWN0b3JTdGFjaykKKyAgICAgICAgICAgIHR5cGUgPSBj b25zdHJ1Y3Rvcih0eXBlKTsKKwogICAgICAgICBpZiAoYWRkcmVzc1NwYWNlICYmICFhZGRyZXNz U3BhY2VDb25zdW1lZCkKICAgICAgICAgICAgIGxleGVyLmZhaWwoIkFkZHJlc3Mgc3BhY2Ugc3Bl Y2lmaWVkIGZvciB0eXBlIHRoYXQgZG9lcyBub3QgbmVlZCBhZGRyZXNzIHNwYWNlIik7Ci0gICAg ICAgIAorCiAgICAgICAgIHJldHVybiB0eXBlOwogICAgIH0KICAgICAKZGlmZiAtLWdpdCBhL1Rv b2xzL1dlYkdQVVNoYWRpbmdMYW5ndWFnZVJJL1Rlc3QuanMgYi9Ub29scy9XZWJHUFVTaGFkaW5n TGFuZ3VhZ2VSSS9UZXN0LmpzCmluZGV4IDAwMGQwNTQwNzExNTg1MGZmMzBlYzIzNjZhZWIxODVh YzU3M2RjZDMuLjRhMTFjMTg1ODU5OTc3OGZmMzkxYjA0ZjI2MzVjNWI3MTAwNWRmN2YgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1dlYkdQVVNoYWRpbmdMYW5ndWFnZVJJL1Rlc3QuanMKKysrIGIvVG9vbHMv V2ViR1BVU2hhZGluZ0xhbmd1YWdlUkkvVGVzdC5qcwpAQCAtNTU1MSw3ICs1NTUxLDcgQEAgdGVz dHMubWF0cml4TXVsdGlwbGljYXRpb24gPSBmdW5jdGlvbigpIHsKICAgICBjaGVja0Zsb2F0KHBy b2dyYW0sIGNhbGxGdW5jdGlvbihwcm9ncmFtLCAiZm9vMTMiLCBbXSksIDI5ICogNyArIDQzICog MTEgKyA2MSAqIDEzKTsKIH0KIAotdGVzdHMuRElTQUJMRURfYXJyYXlJbmRleCA9IGZ1bmN0aW9u KCkgewordGVzdHMuYXJyYXlJbmRleCA9IGZ1bmN0aW9uKCkgewogICAgIGxldCBwcm9ncmFtID0g ZG9QcmVwKGAKICAgICAgICAgdWludCBpbm5lckFycmF5TGVuZ3RoKCkgewogICAgICAgICAgICAg aW50WzJdWzNdIGFycmF5Owo=