173228 2017-06-10 11:19:47 -0700 [JSC] Avoid code bloating for iteration if block does not have "break" 2017-08-17 05:16:57 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ysuzuki ysuzuki buildbot commit-queue fpizlo keith_miller mark.lam msaboff saam webkit-bug-importer oldest_to_newest 1317912 0 ysuzuki 2017-06-10 11:19:47 -0700 for-of iteration emits code path for break. But we can easily ensure that the given for-of does not have "break". If we ensure that the given block does not have "break" we should not emit this code path. 1339116 1 318245 ysuzuki 2017-08-16 02:39:39 -0700 Created attachment 318245 Patch 1339263 2 318245 keith_miller 2017-08-16 13:16:43 -0700 Comment on attachment 318245 Patch r=me. 1339502 3 318245 ysuzuki 2017-08-17 04:45:48 -0700 Comment on attachment 318245 Patch Thanks! 1339510 4 318245 commit-queue 2017-08-17 05:15:52 -0700 Comment on attachment 318245 Patch Clearing flags on attachment: 318245 Committed r220852: <http://trac.webkit.org/changeset/220852> 1339511 5 commit-queue 2017-08-17 05:15:53 -0700 All reviewed patches have been landed. Closing bug. 1339513 6 webkit-bug-importer 2017-08-17 05:16:57 -0700 <rdar://problem/33938501> 318245 2017-08-16 02:39:39 -0700 2017-08-17 05:15:52 -0700 Patch bug-173228-20170816183938.patch text/plain 10760 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjIwNzQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA2 NGEwMWY5NGQyMWI5NDBkY2IwNmI4Njg4Zjg3ODMxOTAxMTlkMGY2Li40ZThlNTBjMzM2N2UzZjMw MGQ3MDMwZmNmYzQzY2QzNTYzMTJmYmEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw0MCBAQAorMjAxNy0wOC0xNiAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KKworICAgICAgICBbSlNDXSBBdm9pZCBjb2RlIGJsb2F0aW5nIGZvciBpdGVyYXRpb24g aWYgYmxvY2sgZG9lcyBub3QgaGF2ZSAiYnJlYWsiCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzMyMjgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBDdXJyZW50bHksIHdlIGFsd2F5cyBlbWl0IGNvZGUgZm9y IGJyZWFrZWQgcGF0aCB3aGVuIGVtaXR0aW5nIGZvci1vZiBpdGVyYXRpb24uCisgICAgICAgIEJ1 dCB3ZSBjYW4ga25vdyB0aGF0IHRoaXMgYnJlYWtlZCBwYXRoIGNhbiBiZSB1c2VkIHdoZW4gZW1p dHRpbmcgdGhlIGJ5dGVjb2RlLgorCisgICAgICAgIFRoaXMgcGF0Y2ggYWRkcyBMYWJlbFNjb3Bl OjpicmVha1RhcmdldE1heUJlQm91bmQoKSwgd2hpY2ggcmV0dXJucyB0cnVlIGlmCisgICAgICAg IHRoZSBicmVhayBsYWJlbCBtYXkgYmUgYm91bmQuIFdlIGVtaXQgYSBicmVha2VkIHBhdGggb25s eSB3aGVuIGl0IHJldHVybnMKKyAgICAgICAgdHJ1ZS4gVGhpcyByZWR1Y2VzIGJ5dGVjb2RlIGJs b2F0aW5nIHdoZW4gdXNpbmcgZm9yLW9mIGl0ZXJhdGlvbi4KKworICAgICAgICAqIGJ5dGVjb21w aWxlci9CeXRlY29kZUdlbmVyYXRvci5jcHA6CisgICAgICAgIChKU0M6OkxhYmVsOjpzZXRMb2Nh dGlvbik6CisgICAgICAgIChKU0M6OkJ5dGVjb2RlR2VuZXJhdG9yOjpuZXdMYWJlbCk6CisgICAg ICAgIChKU0M6OkJ5dGVjb2RlR2VuZXJhdG9yOjplbWl0TGFiZWwpOgorICAgICAgICAoSlNDOjpC eXRlY29kZUdlbmVyYXRvcjo6cHVzaEZpbmFsbHlDb250cm9sRmxvd1Njb3BlKToKKyAgICAgICAg KEpTQzo6Qnl0ZWNvZGVHZW5lcmF0b3I6OmJyZWFrVGFyZ2V0KToKKyAgICAgICAgKEpTQzo6Qnl0 ZWNvZGVHZW5lcmF0b3I6OmNvbnRpbnVlVGFyZ2V0KToKKyAgICAgICAgKEpTQzo6Qnl0ZWNvZGVH ZW5lcmF0b3I6OmVtaXRFbnVtZXJhdGlvbik6CisgICAgICAgICogYnl0ZWNvbXBpbGVyL0J5dGVj b2RlR2VuZXJhdG9yLmg6CisgICAgICAgICogYnl0ZWNvbXBpbGVyL0xhYmVsLmg6CisgICAgICAg IChKU0M6OkxhYmVsOjpiaW5kIGNvbnN0KToKKyAgICAgICAgKEpTQzo6TGFiZWw6Omhhc09uZVJl ZiBjb25zdCk6CisgICAgICAgIChKU0M6OkxhYmVsOjppc0JvdW5kIGNvbnN0KToKKyAgICAgICAg KEpTQzo6TGFiZWw6OkxhYmVsKTogRGVsZXRlZC4KKyAgICAgICAgKiBieXRlY29tcGlsZXIvTGFi ZWxTY29wZS5oOgorICAgICAgICAoSlNDOjpMYWJlbFNjb3BlOjpoYXNPbmVSZWYgY29uc3QpOgor ICAgICAgICAoSlNDOjpMYWJlbFNjb3BlOjpicmVha1RhcmdldE1heUJlQm91bmQgY29uc3QpOgor ICAgICAgICAqIGJ5dGVjb21waWxlci9Ob2Rlc0NvZGVnZW4uY3BwOgorICAgICAgICAoSlNDOjpD b250aW51ZU5vZGU6OnRyaXZpYWxUYXJnZXQpOgorICAgICAgICAoSlNDOjpDb250aW51ZU5vZGU6 OmVtaXRCeXRlY29kZSk6CisgICAgICAgIChKU0M6OkJyZWFrTm9kZTo6dHJpdmlhbFRhcmdldCk6 CisgICAgICAgIChKU0M6OkJyZWFrTm9kZTo6ZW1pdEJ5dGVjb2RlKToKKwogMjAxNy0wOC0xNCAg S2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgdGVz dGluZyB0b29sIHRvIGxpZSB0byB0aGUgREZHIGFib3V0IHByb2ZpbGVzCmRpZmYgLS1naXQgYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVyL0J5dGVjb2RlR2VuZXJhdG9yLmNwcCBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuY3Bw CmluZGV4IGNjNjVkZDUyOWMzMTZhZGYwYTFkOGMwMTFmYzkxY2QxNjVhZWU3MWEuLjk4OTllM2Y1 OWU3OTBiZGJmMGE4OGI3YTRkNDRjYzljYTgxYzNmZTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuY3BwCisrKyBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuY3BwCkBAIC03 MCwxMyArNzAsMTMgQEAgc3RhdGljIGlubGluZSB2b2lkIHNocmlua1RvRml0KFQmIHNlZ21lbnRl ZFZlY3RvcikKICAgICAgICAgc2VnbWVudGVkVmVjdG9yLnJlbW92ZUxhc3QoKTsKIH0KIAotdm9p ZCBMYWJlbDo6c2V0TG9jYXRpb24odW5zaWduZWQgbG9jYXRpb24pCit2b2lkIExhYmVsOjpzZXRM b2NhdGlvbihCeXRlY29kZUdlbmVyYXRvciYgZ2VuZXJhdG9yLCB1bnNpZ25lZCBsb2NhdGlvbikK IHsKICAgICBtX2xvY2F0aW9uID0gbG9jYXRpb247CiAgICAgCiAgICAgdW5zaWduZWQgc2l6ZSA9 IG1fdW5yZXNvbHZlZEp1bXBzLnNpemUoKTsKICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwg c2l6ZTsgKytpKQotICAgICAgICBtX2dlbmVyYXRvci5pbnN0cnVjdGlvbnMoKVttX3VucmVzb2x2 ZWRKdW1wc1tpXS5zZWNvbmRdLnUub3BlcmFuZCA9IG1fbG9jYXRpb24gLSBtX3VucmVzb2x2ZWRK dW1wc1tpXS5maXJzdDsKKyAgICAgICAgZ2VuZXJhdG9yLmluc3RydWN0aW9ucygpW21fdW5yZXNv bHZlZEp1bXBzW2ldLnNlY29uZF0udS5vcGVyYW5kID0gbV9sb2NhdGlvbiAtIG1fdW5yZXNvbHZl ZEp1bXBzW2ldLmZpcnN0OwogfQogCiB2b2lkIFZhcmlhYmxlOjpkdW1wKFByaW50U3RyZWFtJiBv dXQpIGNvbnN0CkBAIC0xMjI4LDcgKzEyMjgsNyBAQCBSZWY8TGFiZWw+IEJ5dGVjb2RlR2VuZXJh dG9yOjpuZXdMYWJlbCgpCiAgICAgc2hyaW5rVG9GaXQobV9sYWJlbHMpOwogCiAgICAgLy8gQWxs b2NhdGUgbmV3IGxhYmVsIElELgotICAgIG1fbGFiZWxzLmFwcGVuZCgqdGhpcyk7CisgICAgbV9s YWJlbHMuYXBwZW5kKCk7CiAgICAgcmV0dXJuIG1fbGFiZWxzLmxhc3QoKTsKIH0KIApAQCAtMTI0 Miw3ICsxMjQyLDcgQEAgUmVmPExhYmVsPiBCeXRlY29kZUdlbmVyYXRvcjo6bmV3RW1pdHRlZExh YmVsKCkKIHZvaWQgQnl0ZWNvZGVHZW5lcmF0b3I6OmVtaXRMYWJlbChMYWJlbCYgbDApCiB7CiAg ICAgdW5zaWduZWQgbmV3TGFiZWxJbmRleCA9IGluc3RydWN0aW9ucygpLnNpemUoKTsKLSAgICBs MC5zZXRMb2NhdGlvbihuZXdMYWJlbEluZGV4KTsKKyAgICBsMC5zZXRMb2NhdGlvbigqdGhpcywg bmV3TGFiZWxJbmRleCk7CiAKICAgICBpZiAobV9jb2RlQmxvY2stPm51bWJlck9mSnVtcFRhcmdl dHMoKSkgewogICAgICAgICB1bnNpZ25lZCBsYXN0TGFiZWxJbmRleCA9IG1fY29kZUJsb2NrLT5s YXN0SnVtcFRhcmdldCgpOwpAQCAtMzgzNiw4ICszODM2LDYgQEAgdm9pZCBCeXRlY29kZUdlbmVy YXRvcjo6ZW1pdFdpbGxMZWF2ZUNhbGxGcmFtZURlYnVnSG9vaygpCiAKIEZpbmFsbHlDb250ZXh0 KiBCeXRlY29kZUdlbmVyYXRvcjo6cHVzaEZpbmFsbHlDb250cm9sRmxvd1Njb3BlKExhYmVsJiBm aW5hbGx5TGFiZWwpCiB7Ci0gICAgc2hyaW5rVG9GaXQobV9sYWJlbFNjb3Blcyk7Ci0KICAgICBD b250cm9sRmxvd1Njb3BlIHNjb3BlKENvbnRyb2xGbG93U2NvcGU6OkZpbmFsbHksIGN1cnJlbnRM ZXhpY2FsU2NvcGVJbmRleCgpLCBGaW5hbGx5Q29udGV4dChtX2N1cnJlbnRGaW5hbGx5Q29udGV4 dCwgZmluYWxseUxhYmVsKSk7CiAgICAgbV9jb250cm9sRmxvd1Njb3BlU3RhY2suYXBwZW5kKFdU Rk1vdmUoc2NvcGUpKTsKIApAQCAtMzg1Nyw3ICszODU1LDcgQEAgRmluYWxseUNvbnRleHQgQnl0 ZWNvZGVHZW5lcmF0b3I6OnBvcEZpbmFsbHlDb250cm9sRmxvd1Njb3BlKCkKICAgICByZXR1cm4g bV9jb250cm9sRmxvd1Njb3BlU3RhY2sudGFrZUxhc3QoKS5maW5hbGx5Q29udGV4dDsKIH0KIAot UmVmUHRyPExhYmVsU2NvcGU+IEJ5dGVjb2RlR2VuZXJhdG9yOjpicmVha1RhcmdldChjb25zdCBJ ZGVudGlmaWVyJiBuYW1lKQorTGFiZWxTY29wZSogQnl0ZWNvZGVHZW5lcmF0b3I6OmJyZWFrVGFy Z2V0KGNvbnN0IElkZW50aWZpZXImIG5hbWUpCiB7CiAgICAgc2hyaW5rVG9GaXQobV9sYWJlbFNj b3Blcyk7CiAKQEAgLTM4ODQsNyArMzg4Miw3IEBAIFJlZlB0cjxMYWJlbFNjb3BlPiBCeXRlY29k ZUdlbmVyYXRvcjo6YnJlYWtUYXJnZXQoY29uc3QgSWRlbnRpZmllciYgbmFtZSkKICAgICByZXR1 cm4gbnVsbHB0cjsKIH0KIAotUmVmUHRyPExhYmVsU2NvcGU+IEJ5dGVjb2RlR2VuZXJhdG9yOjpj b250aW51ZVRhcmdldChjb25zdCBJZGVudGlmaWVyJiBuYW1lKQorTGFiZWxTY29wZSogQnl0ZWNv ZGVHZW5lcmF0b3I6OmNvbnRpbnVlVGFyZ2V0KGNvbnN0IElkZW50aWZpZXImIG5hbWUpCiB7CiAg ICAgc2hyaW5rVG9GaXQobV9sYWJlbFNjb3Blcyk7CiAKQEAgLTQzNzEsMTIgKzQzNjksMTUgQEAg dm9pZCBCeXRlY29kZUdlbmVyYXRvcjo6ZW1pdEVudW1lcmF0aW9uKFRocm93YWJsZUV4cHJlc3Np b25EYXRhKiBub2RlLCBFeHByZXNzaW8KICAgICAgICAgICAgIGVtaXRKdW1wKGxvb3BTdGFydC5n ZXQoKSk7CiAgICAgICAgIH0KIAotICAgICAgICBlbWl0TGFiZWwoc2NvcGUtPmJyZWFrVGFyZ2V0 KCkpOworICAgICAgICBib29sIGJyZWFrTGFiZWxJc0JvdW5kID0gc2NvcGUtPmJyZWFrVGFyZ2V0 TWF5QmVCb3VuZCgpOworICAgICAgICBpZiAoYnJlYWtMYWJlbElzQm91bmQpCisgICAgICAgICAg ICBlbWl0TGFiZWwoc2NvcGUtPmJyZWFrVGFyZ2V0KCkpOworICAgICAgICBwb3BGaW5hbGx5Q29u dHJvbEZsb3dTY29wZSgpOworICAgICAgICBpZiAoYnJlYWtMYWJlbElzQm91bmQpIHsKKyAgICAg ICAgICAgIC8vIEl0ZXJhdG9yQ2xvc2Ugc2VxdWVuY2UgZm9yIGJyZWFrLWVkIGNvbnRyb2wgZmxv dy4KKyAgICAgICAgICAgIGVtaXRJdGVyYXRvckNsb3NlKGl0ZXJhdG9yLmdldCgpLCBub2RlKTsK KyAgICAgICAgfQogICAgIH0KLQotICAgIC8vIEl0ZXJhdG9yQ2xvc2Ugc2VxdWVuY2UgZm9yIGJy ZWFrLWVkIGNvbnRyb2wgZmxvdy4KLSAgICBwb3BGaW5hbGx5Q29udHJvbEZsb3dTY29wZSgpOwot ICAgIGVtaXRJdGVyYXRvckNsb3NlKGl0ZXJhdG9yLmdldCgpLCBub2RlKTsKICAgICBlbWl0TGFi ZWwobG9vcERvbmUuZ2V0KCkpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvYnl0ZWNvbXBpbGVyL0J5dGVjb2RlR2VuZXJhdG9yLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvYnl0ZWNvbXBpbGVyL0J5dGVjb2RlR2VuZXJhdG9yLmgKaW5kZXggNTBmYTc2ODVjNGY5NDZl NTA3ZjE0NmI1ZmU5MDY3YjJlMTM3NTM4YS4uNzFjMzU2OTI2MmJmMjQ1MmZiNDhhY2NiMTIwYWFj YjFiNzIwMjIxNSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb21waWxl ci9CeXRlY29kZUdlbmVyYXRvci5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29t cGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuaApAQCAtODk4LDggKzg5OCw4IEBAIG5hbWVzcGFjZSBK U0MgewogICAgICAgICB2b2lkIHBvcFN0cnVjdHVyZUZvckluU2NvcGUoUmVnaXN0ZXJJRCogbG9j YWwpOwogICAgICAgICB2b2lkIGludmFsaWRhdGVGb3JJbkNvbnRleHRGb3JMb2NhbChSZWdpc3Rl cklEKiBsb2NhbCk7CiAKLSAgICAgICAgUmVmUHRyPExhYmVsU2NvcGU+IGJyZWFrVGFyZ2V0KGNv bnN0IElkZW50aWZpZXImKTsKLSAgICAgICAgUmVmUHRyPExhYmVsU2NvcGU+IGNvbnRpbnVlVGFy Z2V0KGNvbnN0IElkZW50aWZpZXImKTsKKyAgICAgICAgTGFiZWxTY29wZSogYnJlYWtUYXJnZXQo Y29uc3QgSWRlbnRpZmllciYpOworICAgICAgICBMYWJlbFNjb3BlKiBjb250aW51ZVRhcmdldChj b25zdCBJZGVudGlmaWVyJik7CiAKICAgICAgICAgdm9pZCBiZWdpblN3aXRjaChSZWdpc3RlcklE KiwgU3dpdGNoSW5mbzo6U3dpdGNoVHlwZSk7CiAgICAgICAgIHZvaWQgZW5kU3dpdGNoKHVpbnQz Ml90IGNsYXVzZUNvdW50LCBjb25zdCBWZWN0b3I8UmVmPExhYmVsPiwgOD4mLCBFeHByZXNzaW9u Tm9kZSoqLCBMYWJlbCYgZGVmYXVsdExhYmVsLCBpbnQzMl90IG1pbiwgaW50MzJfdCByYW5nZSk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVyL0xhYmVsLmgg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVyL0xhYmVsLmgKaW5kZXggM2U4YTQ4 MGJiYWMwMDE5Njg3NDc2Y2JhNTAxYmI0MTk1MTNhNGQ5Ni4uM2UyZDI5N2YyM2QxMDVjMTU5ODQw MTFhMGY1NWEzMzU3NGRmMDUzYSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5 dGVjb21waWxlci9MYWJlbC5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGls ZXIvTGFiZWwuaApAQCAtNDAsMTcgKzQwLDEzIEBAIG5hbWVzcGFjZSBKU0MgewogICAgIGNsYXNz IExhYmVsIHsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShMYWJlbCk7CiAgICAgcHVibGljOgot ICAgICAgICBleHBsaWNpdCBMYWJlbChCeXRlY29kZUdlbmVyYXRvciYgZ2VuZXJhdG9yKQotICAg ICAgICAgICAgOiBtX3JlZkNvdW50KDApCi0gICAgICAgICAgICAsIG1fbG9jYXRpb24oaW52YWxp ZExvY2F0aW9uKQotICAgICAgICAgICAgLCBtX2dlbmVyYXRvcihnZW5lcmF0b3IpCi0gICAgICAg IHsKLSAgICAgICAgfQorICAgICAgICBMYWJlbCgpID0gZGVmYXVsdDsKIAotICAgICAgICB2b2lk IHNldExvY2F0aW9uKHVuc2lnbmVkKTsKKyAgICAgICAgdm9pZCBzZXRMb2NhdGlvbihCeXRlY29k ZUdlbmVyYXRvciYsIHVuc2lnbmVkKTsKIAogICAgICAgICBpbnQgYmluZChpbnQgb3Bjb2RlLCBp bnQgb2Zmc2V0KSBjb25zdAogICAgICAgICB7CisgICAgICAgICAgICBtX2JvdW5kID0gdHJ1ZTsK ICAgICAgICAgICAgIGlmIChtX2xvY2F0aW9uID09IGludmFsaWRMb2NhdGlvbikgewogICAgICAg ICAgICAgICAgIG1fdW5yZXNvbHZlZEp1bXBzLmFwcGVuZChzdGQ6Om1ha2VfcGFpcihvcGNvZGUs IG9mZnNldCkpOwogICAgICAgICAgICAgICAgIHJldHVybiAwOwpAQCAtNjUsNiArNjEsNyBAQCBu YW1lc3BhY2UgSlNDIHsKICAgICAgICAgICAgIEFTU0VSVChtX3JlZkNvdW50ID49IDApOwogICAg ICAgICB9CiAgICAgICAgIGludCByZWZDb3VudCgpIGNvbnN0IHsgcmV0dXJuIG1fcmVmQ291bnQ7 IH0KKyAgICAgICAgYm9vbCBoYXNPbmVSZWYoKSBjb25zdCB7IHJldHVybiBtX3JlZkNvdW50ID09 IDE7IH0KIAogICAgICAgICBib29sIGlzRm9yd2FyZCgpIGNvbnN0IHsgcmV0dXJuIG1fbG9jYXRp b24gPT0gaW52YWxpZExvY2F0aW9uOyB9CiAgICAgICAgIApAQCAtNzQsMTQgKzcxLDE2IEBAIG5h bWVzcGFjZSBKU0MgewogICAgICAgICAgICAgcmV0dXJuIGJpbmQoMCwgMCk7CiAgICAgICAgIH0K IAorICAgICAgICBib29sIGlzQm91bmQoKSBjb25zdCB7IHJldHVybiBtX2JvdW5kOyB9CisKICAg ICBwcml2YXRlOgogICAgICAgICB0eXBlZGVmIFZlY3RvcjxzdGQ6OnBhaXI8aW50LCBpbnQ+LCA4 PiBKdW1wVmVjdG9yOwogCiAgICAgICAgIHN0YXRpYyBjb25zdCB1bnNpZ25lZCBpbnZhbGlkTG9j YXRpb24gPSBVSU5UX01BWDsKIAotICAgICAgICBpbnQgbV9yZWZDb3VudDsKLSAgICAgICAgdW5z aWduZWQgbV9sb2NhdGlvbjsKLSAgICAgICAgQnl0ZWNvZGVHZW5lcmF0b3ImIG1fZ2VuZXJhdG9y OworICAgICAgICBpbnQgbV9yZWZDb3VudCB7IDAgfTsKKyAgICAgICAgdW5zaWduZWQgbV9sb2Nh dGlvbiB7IGludmFsaWRMb2NhdGlvbiB9OworICAgICAgICBtdXRhYmxlIGJvb2wgbV9ib3VuZCB7 IGZhbHNlIH07CiAgICAgICAgIG11dGFibGUgSnVtcFZlY3RvciBtX3VucmVzb2x2ZWRKdW1wczsK ICAgICB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVy L0xhYmVsU2NvcGUuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvTGFiZWxT Y29wZS5oCmluZGV4IDAwYTMwN2NlMDdhOGNiMzIyODkzYmE2MTU4NDQyNjcxM2Y4Zjc3YjYuLmE5 NGJmMDVhZGE0Njg4YWEwZDJhOGFkYjhmMmQ4NjA3ZWYzNGNjYmQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvTGFiZWxTY29wZS5oCisrKyBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvTGFiZWxTY29wZS5oCkBAIC02Myw2ICs2MywxNiBA QCBXVEZfTUFLRV9OT05DT1BZQUJMRShMYWJlbFNjb3BlKTsKICAgICAgICAgQVNTRVJUKG1fcmVm Q291bnQgPj0gMCk7CiAgICAgfQogICAgIGludCByZWZDb3VudCgpIGNvbnN0IHsgcmV0dXJuIG1f cmVmQ291bnQ7IH0KKyAgICBib29sIGhhc09uZVJlZigpIGNvbnN0IHsgcmV0dXJuIG1fcmVmQ291 bnQgPT0gMTsgfQorCisgICAgYm9vbCBicmVha1RhcmdldE1heUJlQm91bmQoKSBjb25zdAorICAg IHsKKyAgICAgICAgaWYgKCFoYXNPbmVSZWYoKSkKKyAgICAgICAgICAgIHJldHVybiB0cnVlOwor ICAgICAgICBpZiAoIW1fYnJlYWtUYXJnZXQtPmhhc09uZVJlZigpKQorICAgICAgICAgICAgcmV0 dXJuIHRydWU7CisgICAgICAgIHJldHVybiBtX2JyZWFrVGFyZ2V0LT5pc0JvdW5kKCk7CisgICAg fQogCiBwcml2YXRlOgogICAgIGludCBtX3JlZkNvdW50OwpkaWZmIC0tZ2l0IGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL2J5dGVjb21waWxlci9Ob2Rlc0NvZGVnZW4uY3BwIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL2J5dGVjb21waWxlci9Ob2Rlc0NvZGVnZW4uY3BwCmluZGV4IDhmNGMzZDBhYjRj ODgwYjU4NTUxYjAzMzNhY2JmMTYzZDU3YmVhM2YuLjliNDRjODgxZTg0ZWNhNWEyNDU0MTAzNzY2 MjA2OGZhN2RiOTJiNjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29t cGlsZXIvTm9kZXNDb2RlZ2VuLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNv bXBpbGVyL05vZGVzQ29kZWdlbi5jcHAKQEAgLTMwNzYsNyArMzA3Niw3IEBAIExhYmVsKiBDb250 aW51ZU5vZGU6OnRyaXZpYWxUYXJnZXQoQnl0ZWNvZGVHZW5lcmF0b3ImIGdlbmVyYXRvcikKICAg ICBpZiAoZ2VuZXJhdG9yLnNob3VsZEVtaXREZWJ1Z0hvb2tzKCkpCiAgICAgICAgIHJldHVybiBu dWxscHRyOwogCi0gICAgUmVmUHRyPExhYmVsU2NvcGU+IHNjb3BlID0gZ2VuZXJhdG9yLmNvbnRp bnVlVGFyZ2V0KG1faWRlbnQpOworICAgIExhYmVsU2NvcGUqIHNjb3BlID0gZ2VuZXJhdG9yLmNv bnRpbnVlVGFyZ2V0KG1faWRlbnQpOwogICAgIEFTU0VSVChzY29wZSk7CiAKICAgICBpZiAoZ2Vu ZXJhdG9yLmxhYmVsU2NvcGVEZXB0aCgpICE9IHNjb3BlLT5zY29wZURlcHRoKCkpCkBAIC0zMDg3 LDcgKzMwODcsNyBAQCBMYWJlbCogQ29udGludWVOb2RlOjp0cml2aWFsVGFyZ2V0KEJ5dGVjb2Rl R2VuZXJhdG9yJiBnZW5lcmF0b3IpCiAKIHZvaWQgQ29udGludWVOb2RlOjplbWl0Qnl0ZWNvZGUo Qnl0ZWNvZGVHZW5lcmF0b3ImIGdlbmVyYXRvciwgUmVnaXN0ZXJJRCopCiB7Ci0gICAgUmVmUHRy PExhYmVsU2NvcGU+IHNjb3BlID0gZ2VuZXJhdG9yLmNvbnRpbnVlVGFyZ2V0KG1faWRlbnQpOwor ICAgIExhYmVsU2NvcGUqIHNjb3BlID0gZ2VuZXJhdG9yLmNvbnRpbnVlVGFyZ2V0KG1faWRlbnQp OwogICAgIEFTU0VSVChzY29wZSk7CiAKICAgICBib29sIGhhc0ZpbmFsbHkgPSBnZW5lcmF0b3Iu ZW1pdEp1bXBWaWFGaW5hbGx5SWZOZWVkZWQoc2NvcGUtPnNjb3BlRGVwdGgoKSwgKnNjb3BlLT5j b250aW51ZVRhcmdldCgpKTsKQEAgLTMxMDcsNyArMzEwNyw3IEBAIExhYmVsKiBCcmVha05vZGU6 OnRyaXZpYWxUYXJnZXQoQnl0ZWNvZGVHZW5lcmF0b3ImIGdlbmVyYXRvcikKICAgICBpZiAoZ2Vu ZXJhdG9yLnNob3VsZEVtaXREZWJ1Z0hvb2tzKCkpCiAgICAgICAgIHJldHVybiBudWxscHRyOwog Ci0gICAgUmVmUHRyPExhYmVsU2NvcGU+IHNjb3BlID0gZ2VuZXJhdG9yLmJyZWFrVGFyZ2V0KG1f aWRlbnQpOworICAgIExhYmVsU2NvcGUqIHNjb3BlID0gZ2VuZXJhdG9yLmJyZWFrVGFyZ2V0KG1f aWRlbnQpOwogICAgIEFTU0VSVChzY29wZSk7CiAKICAgICBpZiAoZ2VuZXJhdG9yLmxhYmVsU2Nv cGVEZXB0aCgpICE9IHNjb3BlLT5zY29wZURlcHRoKCkpCkBAIC0zMTE4LDcgKzMxMTgsNyBAQCBM YWJlbCogQnJlYWtOb2RlOjp0cml2aWFsVGFyZ2V0KEJ5dGVjb2RlR2VuZXJhdG9yJiBnZW5lcmF0 b3IpCiAKIHZvaWQgQnJlYWtOb2RlOjplbWl0Qnl0ZWNvZGUoQnl0ZWNvZGVHZW5lcmF0b3ImIGdl bmVyYXRvciwgUmVnaXN0ZXJJRCopCiB7Ci0gICAgUmVmUHRyPExhYmVsU2NvcGU+IHNjb3BlID0g Z2VuZXJhdG9yLmJyZWFrVGFyZ2V0KG1faWRlbnQpOworICAgIExhYmVsU2NvcGUqIHNjb3BlID0g Z2VuZXJhdG9yLmJyZWFrVGFyZ2V0KG1faWRlbnQpOwogICAgIEFTU0VSVChzY29wZSk7CiAKICAg ICBib29sIGhhc0ZpbmFsbHkgPSBnZW5lcmF0b3IuZW1pdEp1bXBWaWFGaW5hbGx5SWZOZWVkZWQo c2NvcGUtPnNjb3BlRGVwdGgoKSwgc2NvcGUtPmJyZWFrVGFyZ2V0KCkpOwo=