63554 2011-06-28 12:58:04 -0700 Make constant array optimisation less strict about what constitutes a constant 2011-06-28 13:22:04 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 oliver oliver oldest_to_newest 429086 0 oliver 2011-06-28 12:58:04 -0700 Make constant array optimisation less strict about what constitutes a constant 429087 1 98959 oliver 2011-06-28 12:59:22 -0700 Created attachment 98959 Patch 429104 2 oliver 2011-06-28 13:22:04 -0700 Committed r89954: <http://trac.webkit.org/changeset/89954> 98959 2011-06-28 12:59:22 -0700 2011-06-28 13:08:44 -0700 Patch bug-63554-20110628125921.patch text/plain 9157 oliver U3VidmVyc2lvbiBSZXZpc2lvbjogODk5NDYKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IGRh OWMyMTNlNzhmM2ZhNGNjZDVjNDQ1M2UyMGQwMzBhMWM0ZTg3NGQuLjBiYjQ4OTUxMGIyNWYzOTlk NjJjMzk1NDliZGMwYmY5OTEzNjM5NTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDI2IEBACisyMDExLTA2LTI4ICBPbGl2ZXIgSHVudCAgPG9saXZlckBhcHBsZS5jb20+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSBjb25z dGFudCBhcnJheSBvcHRpbWlzYXRpb24gbGVzcyBzdHJpY3QgYWJvdXQgd2hhdCBjb25zdGl0dXRl cyBhIGNvbnN0YW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD02MzU1NAorCisgICAgICAgIE5vdyBhbGxvdyBzdHJpbmcgY29uc3RhbnRzIGluIGFycmF5 IGxpdGVyYWxzIHRvIGFjdHVhbGx5IGJlIGNvbnNpZGVyZWQgY29uc3RhbnQsCisgICAgICAgIGFu ZCBzbyBhdm9pZCBjb2RlZ2VuIGluIGFycmF5IGxpdGVyYWxzIHdpdGggc3RyaW5ncyBpbiB0aGVt LgorCisgICAgICAgICogYnl0ZWNvZGUvQ29kZUJsb2NrLmg6CisgICAgICAgIChKU0M6OkNvZGVC bG9jazo6YWRkQ29uc3RhbnRCdWZmZXIpOgorICAgICAgICAoSlNDOjpDb2RlQmxvY2s6OmNvbnN0 YW50QnVmZmVyKToKKyAgICAgICAgKiBieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuY3Bw OgorICAgICAgICAoSlNDOjpCeXRlY29kZUdlbmVyYXRvcjo6YWRkQ29uc3RhbnRCdWZmZXIpOgor ICAgICAgICAoSlNDOjpCeXRlY29kZUdlbmVyYXRvcjo6YWRkU3RyaW5nQ29uc3RhbnQpOgorICAg ICAgICAoSlNDOjpCeXRlY29kZUdlbmVyYXRvcjo6ZW1pdE5ld0FycmF5KToKKyAgICAgICAgKiBi eXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuaDoKKyAgICAgICAgKiBpbnRlcnByZXRlci9J bnRlcnByZXRlci5jcHA6CisgICAgICAgIChKU0M6OkludGVycHJldGVyOjpwcml2YXRlRXhlY3V0 ZSk6CisgICAgICAgICogaml0L0pJVFN0dWJzLmNwcDoKKyAgICAgICAgKEpTQzo6REVGSU5FX1NU VUJfRlVOQ1RJT04pOgorCiAyMDExLTA2LTI4ICBHYXZpbiBCYXJyYWNsb3VnaCAgPGJhcnJhY2xv dWdoQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBPbGl2ZXIgSHVudC4KZGlmZiAt LWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suaCBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suaAppbmRleCBkM2IyZmY3MDc1MDg1 NDljYTEyOTRjZTNlNTE0MWY3ZWEyYjc0NzU0Li4yMWIxZWFkZWM0MzdkY2U5MGVlMThmOWNlZWZi ZmQ2ZmMxZWMwNzNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUv Q29kZUJsb2NrLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9j ay5oCkBAIC00NzcsMTggKzQ3NywxOCBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAgfQogICAg ICAgICBSZWdFeHAqIHJlZ2V4cChpbnQgaW5kZXgpIGNvbnN0IHsgQVNTRVJUKG1fcmFyZURhdGEp OyByZXR1cm4gbV9yYXJlRGF0YS0+bV9yZWdleHBzW2luZGV4XS5nZXQoKTsgfQogCi0gICAgICAg IHVuc2lnbmVkIGFkZEltbWVkaWF0ZUJ1ZmZlcih1bnNpZ25lZCBsZW5ndGgpCisgICAgICAgIHVu c2lnbmVkIGFkZENvbnN0YW50QnVmZmVyKHVuc2lnbmVkIGxlbmd0aCkKICAgICAgICAgewogICAg ICAgICAgICAgY3JlYXRlUmFyZURhdGFJZk5lY2Vzc2FyeSgpOwotICAgICAgICAgICAgdW5zaWdu ZWQgc2l6ZSA9IG1fcmFyZURhdGEtPm1faW1tZWRpYXRlQnVmZmVycy5zaXplKCk7Ci0gICAgICAg ICAgICBtX3JhcmVEYXRhLT5tX2ltbWVkaWF0ZUJ1ZmZlcnMuYXBwZW5kKFZlY3RvcjxKU1ZhbHVl PihsZW5ndGgpKTsKKyAgICAgICAgICAgIHVuc2lnbmVkIHNpemUgPSBtX3JhcmVEYXRhLT5tX2Nv bnN0YW50QnVmZmVycy5zaXplKCk7CisgICAgICAgICAgICBtX3JhcmVEYXRhLT5tX2NvbnN0YW50 QnVmZmVycy5hcHBlbmQoVmVjdG9yPEpTVmFsdWU+KGxlbmd0aCkpOwogICAgICAgICAgICAgcmV0 dXJuIHNpemU7CiAgICAgICAgIH0KIAotICAgICAgICBKU1ZhbHVlKiBpbW1lZGlhdGVCdWZmZXIo dW5zaWduZWQgaW5kZXgpCisgICAgICAgIEpTVmFsdWUqIGNvbnN0YW50QnVmZmVyKHVuc2lnbmVk IGluZGV4KQogICAgICAgICB7CiAgICAgICAgICAgICBBU1NFUlQobV9yYXJlRGF0YSk7Ci0gICAg ICAgICAgICByZXR1cm4gbV9yYXJlRGF0YS0+bV9pbW1lZGlhdGVCdWZmZXJzW2luZGV4XS5kYXRh KCk7CisgICAgICAgICAgICByZXR1cm4gbV9yYXJlRGF0YS0+bV9jb25zdGFudEJ1ZmZlcnNbaW5k ZXhdLmRhdGEoKTsKICAgICAgICAgfQogCiAgICAgICAgIEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxP YmplY3QoKSB7IHJldHVybiBtX2dsb2JhbE9iamVjdC5nZXQoKTsgfQpAQCAtNTk1LDcgKzU5NSw3 IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICAgICAgVmVjdG9yPFdyaXRlQmFycmllcjxSZWdF eHA+ID4gbV9yZWdleHBzOwogCiAgICAgICAgICAgICAvLyBCdWZmZXJzIHVzZWQgZm9yIGxhcmdl IGFycmF5IGxpdGVyYWxzCi0gICAgICAgICAgICBWZWN0b3I8VmVjdG9yPEpTVmFsdWU+ID4gbV9p bW1lZGlhdGVCdWZmZXJzOworICAgICAgICAgICAgVmVjdG9yPFZlY3RvcjxKU1ZhbHVlPiA+IG1f Y29uc3RhbnRCdWZmZXJzOwogICAgICAgICAgICAgCiAgICAgICAgICAgICAvLyBKdW1wIFRhYmxl cwogICAgICAgICAgICAgVmVjdG9yPFNpbXBsZUp1bXBUYWJsZT4gbV9pbW1lZGlhdGVTd2l0Y2hK dW1wVGFibGVzOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb21waWxl ci9CeXRlY29kZUdlbmVyYXRvci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBp bGVyL0J5dGVjb2RlR2VuZXJhdG9yLmNwcAppbmRleCA5MTMxMjY1M2UyMGZlNWQyY2VmZjUxN2M3 MzNmMDk5ZWRhYTQ1YTI3Li4yZDMxOTAwNTI0MGExNWU0MTVmMDQ1NDNmNzAxMTUxMjMzYzQ4NjUx IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVyL0J5dGVjb2Rl R2VuZXJhdG9yLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVyL0J5 dGVjb2RlR2VuZXJhdG9yLmNwcApAQCAtMTUwOCw5ICsxNTA4LDE5IEBAIFJlZ2lzdGVySUQqIEJ5 dGVjb2RlR2VuZXJhdG9yOjplbWl0TmV3T2JqZWN0KFJlZ2lzdGVySUQqIGRzdCkKICAgICByZXR1 cm4gZHN0OwogfQogCi11bnNpZ25lZCBCeXRlY29kZUdlbmVyYXRvcjo6YWRkSW1tZWRpYXRlQnVm ZmVyKHVuc2lnbmVkIGxlbmd0aCkKK3Vuc2lnbmVkIEJ5dGVjb2RlR2VuZXJhdG9yOjphZGRDb25z dGFudEJ1ZmZlcih1bnNpZ25lZCBsZW5ndGgpCiB7Ci0gICAgcmV0dXJuIG1fY29kZUJsb2NrLT5h ZGRJbW1lZGlhdGVCdWZmZXIobGVuZ3RoKTsKKyAgICByZXR1cm4gbV9jb2RlQmxvY2stPmFkZENv bnN0YW50QnVmZmVyKGxlbmd0aCk7Cit9CisKK0pTU3RyaW5nKiBCeXRlY29kZUdlbmVyYXRvcjo6 YWRkU3RyaW5nQ29uc3RhbnQoY29uc3QgSWRlbnRpZmllciYgaWRlbnRpZmllcikKK3sKKyAgICBK U1N0cmluZyomIHN0cmluZ0luTWFwID0gbV9zdHJpbmdNYXAuYWRkKGlkZW50aWZpZXIuaW1wbCgp LCAwKS5maXJzdC0+c2Vjb25kOworICAgIGlmICghc3RyaW5nSW5NYXApIHsKKyAgICAgICAgc3Ry aW5nSW5NYXAgPSBqc1N0cmluZyhnbG9iYWxEYXRhKCksIGlkZW50aWZpZXIudXN0cmluZygpKTsK KyAgICAgICAgYWRkQ29uc3RhbnRWYWx1ZShzdHJpbmdJbk1hcCk7CisgICAgfQorICAgIHJldHVy biBzdHJpbmdJbk1hcDsKIH0KIAogUmVnaXN0ZXJJRCogQnl0ZWNvZGVHZW5lcmF0b3I6OmVtaXRO ZXdBcnJheShSZWdpc3RlcklEKiBkc3QsIEVsZW1lbnROb2RlKiBlbGVtZW50cywgdW5zaWduZWQg bGVuZ3RoKQpAQCAtMTUxOCwxMSArMTUyOCwxMSBAQCBSZWdpc3RlcklEKiBCeXRlY29kZUdlbmVy YXRvcjo6ZW1pdE5ld0FycmF5KFJlZ2lzdGVySUQqIGRzdCwgRWxlbWVudE5vZGUqIGVsZW1lbgog I2lmICFBU1NFUlRfRElTQUJMRUQKICAgICB1bnNpZ25lZCBjaGVja0xlbmd0aCA9IDA7CiAjZW5k aWYKLSAgICBib29sIGhhZE5vbk51bWJlciA9IGZhbHNlOworICAgIGJvb2wgaGFkVmFyaWFibGVF eHByZXNzaW9uID0gZmFsc2U7CiAgICAgaWYgKGxlbmd0aCkgewogICAgICAgICBmb3IgKEVsZW1l bnROb2RlKiBuID0gZWxlbWVudHM7IG47IG4gPSBuLT5uZXh0KCkpIHsKLSAgICAgICAgICAgIGlm ICghbi0+dmFsdWUoKS0+aXNOdW1iZXIoKSkgewotICAgICAgICAgICAgICAgIGhhZE5vbk51bWJl ciA9IHRydWU7CisgICAgICAgICAgICBpZiAoIW4tPnZhbHVlKCktPmlzTnVtYmVyKCkgJiYgIW4t PnZhbHVlKCktPmlzU3RyaW5nKCkpIHsKKyAgICAgICAgICAgICAgICBoYWRWYXJpYWJsZUV4cHJl c3Npb24gPSB0cnVlOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfQogICAg ICAgICAgICAgaWYgKG4tPmVsaXNpb24oKSkKQEAgLTE1MzEsMTYgKzE1NDEsMjIgQEAgUmVnaXN0 ZXJJRCogQnl0ZWNvZGVHZW5lcmF0b3I6OmVtaXROZXdBcnJheShSZWdpc3RlcklEKiBkc3QsIEVs ZW1lbnROb2RlKiBlbGVtZW4KICAgICAgICAgICAgIGNoZWNrTGVuZ3RoKys7CiAjZW5kaWYKICAg ICAgICAgfQotICAgICAgICBpZiAoIWhhZE5vbk51bWJlcikgeworICAgICAgICBpZiAoIWhhZFZh cmlhYmxlRXhwcmVzc2lvbikgewogICAgICAgICAgICAgQVNTRVJUKGxlbmd0aCA9PSBjaGVja0xl bmd0aCk7Ci0gICAgICAgICAgICB1bnNpZ25lZCBpbW1lZGlhdGVCdWZmZXJJbmRleCA9IGFkZElt bWVkaWF0ZUJ1ZmZlcihsZW5ndGgpOwotICAgICAgICAgICAgSlNWYWx1ZSogaW1tZWRpYXRlQnVm ZmVyID0gbV9jb2RlQmxvY2stPmltbWVkaWF0ZUJ1ZmZlcihpbW1lZGlhdGVCdWZmZXJJbmRleCk7 CisgICAgICAgICAgICB1bnNpZ25lZCBjb25zdGFudEJ1ZmZlckluZGV4ID0gYWRkQ29uc3RhbnRC dWZmZXIobGVuZ3RoKTsKKyAgICAgICAgICAgIEpTVmFsdWUqIGNvbnN0YW50QnVmZmVyID0gbV9j b2RlQmxvY2stPmNvbnN0YW50QnVmZmVyKGNvbnN0YW50QnVmZmVySW5kZXgpOwogICAgICAgICAg ICAgdW5zaWduZWQgaW5kZXggPSAwOwotICAgICAgICAgICAgZm9yIChFbGVtZW50Tm9kZSogbiA9 IGVsZW1lbnRzOyBpbmRleCA8IGxlbmd0aDsgbiA9IG4tPm5leHQoKSkKLSAgICAgICAgICAgICAg ICBpbW1lZGlhdGVCdWZmZXJbaW5kZXgrK10gPSBqc051bWJlcihzdGF0aWNfY2FzdDxOdW1iZXJO b2RlKj4obi0+dmFsdWUoKSktPnZhbHVlKCkpOworICAgICAgICAgICAgZm9yIChFbGVtZW50Tm9k ZSogbiA9IGVsZW1lbnRzOyBpbmRleCA8IGxlbmd0aDsgbiA9IG4tPm5leHQoKSkgeworICAgICAg ICAgICAgICAgIGlmIChuLT52YWx1ZSgpLT5pc051bWJlcigpKQorICAgICAgICAgICAgICAgICAg ICBjb25zdGFudEJ1ZmZlcltpbmRleCsrXSA9IGpzTnVtYmVyKHN0YXRpY19jYXN0PE51bWJlck5v ZGUqPihuLT52YWx1ZSgpKS0+dmFsdWUoKSk7CisgICAgICAgICAgICAgICAgZWxzZSB7CisgICAg ICAgICAgICAgICAgICAgIEFTU0VSVChuLT52YWx1ZSgpLT5pc1N0cmluZygpKTsKKyAgICAgICAg ICAgICAgICAgICAgY29uc3RhbnRCdWZmZXJbaW5kZXgrK10gPSBhZGRTdHJpbmdDb25zdGFudChz dGF0aWNfY2FzdDxTdHJpbmdOb2RlKj4obi0+dmFsdWUoKSktPnZhbHVlKCkpOworICAgICAgICAg ICAgICAgIH0KKyAgICAgICAgICAgIH0KICAgICAgICAgICAgIGVtaXRPcGNvZGUob3BfbmV3X2Fy cmF5X2J1ZmZlcik7CiAgICAgICAgICAgICBpbnN0cnVjdGlvbnMoKS5hcHBlbmQoZHN0LT5pbmRl eCgpKTsKLSAgICAgICAgICAgIGluc3RydWN0aW9ucygpLmFwcGVuZChpbW1lZGlhdGVCdWZmZXJJ bmRleCk7CisgICAgICAgICAgICBpbnN0cnVjdGlvbnMoKS5hcHBlbmQoY29uc3RhbnRCdWZmZXJJ bmRleCk7CiAgICAgICAgICAgICBpbnN0cnVjdGlvbnMoKS5hcHBlbmQobGVuZ3RoKTsKICAgICAg ICAgICAgIHJldHVybiBkc3Q7CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuaCBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuaAppbmRleCA1MTUxODM3M2Rl MmJlNDJmNjU3NTVmZDFhMGQ4Yjc3OWZjZGRhNTk1Li43YTRmZDZmYTk3Y2U1ZTQyZTRkZDg5ZGEx M2QyYjExNjRlYzA5NjkwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNv bXBpbGVyL0J5dGVjb2RlR2VuZXJhdG9yLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5 dGVjb21waWxlci9CeXRlY29kZUdlbmVyYXRvci5oCkBAIC00NjksNyArNDY5LDcgQEAgbmFtZXNw YWNlIEpTQyB7CiAgICAgICAgIFJlZ2lzdGVySUQqIGFkZENvbnN0YW50VmFsdWUoSlNWYWx1ZSk7 CiAgICAgICAgIHVuc2lnbmVkIGFkZFJlZ0V4cChSZWdFeHAqKTsKIAotICAgICAgICB1bnNpZ25l ZCBhZGRJbW1lZGlhdGVCdWZmZXIodW5zaWduZWQgbGVuZ3RoKTsKKyAgICAgICAgdW5zaWduZWQg YWRkQ29uc3RhbnRCdWZmZXIodW5zaWduZWQgbGVuZ3RoKTsKICAgICAgICAgCiAgICAgICAgIEZ1 bmN0aW9uRXhlY3V0YWJsZSogbWFrZUZ1bmN0aW9uKEV4ZWNTdGF0ZSogZXhlYywgRnVuY3Rpb25C b2R5Tm9kZSogYm9keSkKICAgICAgICAgewpAQCAtNDgxLDYgKzQ4MSw4IEBAIG5hbWVzcGFjZSBK U0MgewogICAgICAgICAgICAgcmV0dXJuIEZ1bmN0aW9uRXhlY3V0YWJsZTo6Y3JlYXRlKGdsb2Jh bERhdGEsIGJvZHktPmlkZW50KCksIGJvZHktPnNvdXJjZSgpLCBib2R5LT51c2VzQXJndW1lbnRz KCksIGJvZHktPnBhcmFtZXRlcnMoKSwgYm9keS0+aXNTdHJpY3RNb2RlKCksIGJvZHktPmxpbmVO bygpLCBib2R5LT5sYXN0TGluZSgpKTsKICAgICAgICAgfQogCisgICAgICAgIEpTU3RyaW5nKiBh ZGRTdHJpbmdDb25zdGFudChjb25zdCBJZGVudGlmaWVyJik7CisKICAgICAgICAgdm9pZCBhZGRM aW5lSW5mbyh1bnNpZ25lZCBsaW5lTm8pCiAgICAgICAgIHsKICNpZiAhRU5BQkxFKE9QQ09ERV9T QU1QTElORykKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9J bnRlcnByZXRlci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvSW50ZXJw cmV0ZXIuY3BwCmluZGV4IGIwYzIwN2QyNjg2Y2IyMTI1NmRkYmUyYTVkMDRiYmM4YjZkZDI1ZGQu LmVkZTcyMGUyNDE1MTcyNGM2ZThmMTgzYmJlOGMwNDliZTA4M2NlMTcgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9JbnRlcnByZXRlci5jcHAKKysrIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL2ludGVycHJldGVyL0ludGVycHJldGVyLmNwcApAQCAtMTYwNiwx MiArMTYwNiwxMiBAQCBKU1ZhbHVlIEludGVycHJldGVyOjpwcml2YXRlRXhlY3V0ZShFeGVjdXRp b25GbGFnIGZsYWcsIFJlZ2lzdGVyRmlsZSogcmVnaXN0ZXJGaQogICAgICAgICAgCiAgICAgICAg ICBDb25zdHJ1Y3RzIGEgbmV3IEFycmF5IGluc3RhbmNlIHVzaW5nIHRoZSBvcmlnaW5hbAogICAg ICAgICAgY29uc3RydWN0b3IsIGFuZCBwdXRzIHRoZSByZXN1bHQgaW4gcmVnaXN0ZXIgZHN0Lgot ICAgICAgICAgVGhlIGFycmF5IGJlIGluaXRpYWxpemVkIHdpdGggdGhlIHZhbHVlcyBmcm9tIGlt bWVkaWF0ZUJ1ZmZlcltpbmRleF0KKyAgICAgICAgIFRoZSBhcnJheSBiZSBpbml0aWFsaXplZCB3 aXRoIHRoZSB2YWx1ZXMgZnJvbSBjb25zdGFudEJ1ZmZlcltpbmRleF0KICAgICAgICAgICovCiAg ICAgICAgIGludCBkc3QgPSB2UENbMV0udS5vcGVyYW5kOwogICAgICAgICBpbnQgZmlyc3RBcmcg PSB2UENbMl0udS5vcGVyYW5kOwogICAgICAgICBpbnQgYXJnQ291bnQgPSB2UENbM10udS5vcGVy YW5kOwotICAgICAgICBBcmdMaXN0IGFyZ3MoY29kZUJsb2NrLT5pbW1lZGlhdGVCdWZmZXIoZmly c3RBcmcpLCBhcmdDb3VudCk7CisgICAgICAgIEFyZ0xpc3QgYXJncyhjb2RlQmxvY2stPmNvbnN0 YW50QnVmZmVyZmlyc3RBcmcpLCBhcmdDb3VudCk7CiAgICAgICAgIGNhbGxGcmFtZS0+dW5jaGVj a2VkUihkc3QpID0gSlNWYWx1ZShjb25zdHJ1Y3RBcnJheShjYWxsRnJhbWUsIGFyZ3MpKTsKICAg ICAgICAgCiAgICAgICAgIHZQQyArPSBPUENPREVfTEVOR1RIKG9wX25ld19hcnJheSk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVFN0dWJzLmNwcCBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9qaXQvSklUU3R1YnMuY3BwCmluZGV4IDk1ZTRkYTc2YWEzYTI2ZDJhZGFl MjFhMTdkOWQwY2IxYjQ1OWY1NGUuLjY0NDkwZGJmNWYzNjNjNDA0ODQ3NTQ4YWQ1YThhNmFmOTQ2 YmE1OWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUU3R1YnMuY3Bw CisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUU3R1YnMuY3BwCkBAIC0yMjY0LDcg KzIyNjQsNyBAQCBERUZJTkVfU1RVQl9GVU5DVElPTihKU09iamVjdCosIG9wX25ld19hcnJheV9i dWZmZXIpCiB7CiAgICAgU1RVQl9JTklUX1NUQUNLX0ZSQU1FKHN0YWNrRnJhbWUpOwogICAgIAot ICAgIEFyZ0xpc3QgYXJnTGlzdChzdGFja0ZyYW1lLmNhbGxGcmFtZS0+Y29kZUJsb2NrKCktPmlt bWVkaWF0ZUJ1ZmZlcihzdGFja0ZyYW1lLmFyZ3NbMF0uaW50MzIoKSksIHN0YWNrRnJhbWUuYXJn c1sxXS5pbnQzMigpKTsKKyAgICBBcmdMaXN0IGFyZ0xpc3Qoc3RhY2tGcmFtZS5jYWxsRnJhbWUt PmNvZGVCbG9jaygpLT5jb25zdGFudEJ1ZmZlcihzdGFja0ZyYW1lLmFyZ3NbMF0uaW50MzIoKSks IHN0YWNrRnJhbWUuYXJnc1sxXS5pbnQzMigpKTsKICAgICByZXR1cm4gY29uc3RydWN0QXJyYXko c3RhY2tGcmFtZS5jYWxsRnJhbWUsIGFyZ0xpc3QpOwogfQogCg==