121766 2013-09-22 09:54:20 -0700 Get rid of CodeBlock::RareData::callReturnIndexVector and most of the evil that it introduced 2013-09-22 11:48:40 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 121734 1 fpizlo fpizlo barraclough ggaren mark.lam mhahnenberg msaboff oliver sam oldest_to_newest 931914 0 fpizlo 2013-09-22 09:54:20 -0700 Patch forthcoming. 931915 1 212304 fpizlo 2013-09-22 09:55:15 -0700 Created attachment 212304 the patch 931916 2 fpizlo 2013-09-22 10:03:42 -0700 Landed in http://trac.webkit.org/changeset/156247 931919 3 212304 ggaren 2013-09-22 11:48:40 -0700 Comment on attachment 212304 the patch Nice! 212304 2013-09-22 09:55:15 -0700 2013-09-22 11:48:40 -0700 the patch blah.patch text/plain 10591 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTU2MjQ2KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBA CisyMDEzLTA5LTIyICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg R2V0IHJpZCBvZiBDb2RlQmxvY2s6OlJhcmVEYXRhOjpjYWxsUmV0dXJuSW5kZXhWZWN0b3IgYW5k IG1vc3Qgb2YgdGhlIGV2aWwgdGhhdCBpdCBpbnRyb2R1Y2VkCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjE3NjYKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGJ5dGVjb2RlL0NvZGVCbG9jay5jcHA6Cisg ICAgICAgIChKU0M6OkNvZGVCbG9jazo6c2hyaW5rVG9GaXQpOgorICAgICAgICAqIGJ5dGVjb2Rl L0NvZGVCbG9jay5oOgorICAgICAgICAqIGRmZy9ERkdKSVRDb21waWxlci5jcHA6CisgICAgICAg IChKU0M6OkRGRzo6SklUQ29tcGlsZXI6OmNvbXBpbGVFeGNlcHRpb25IYW5kbGVycyk6CisgICAg ICAgIChKU0M6OkRGRzo6SklUQ29tcGlsZXI6OmxpbmspOgorICAgICAgICAqIGppdC9KSVQuY3Bw OgorICAgICAgICAoSlNDOjpKSVQ6OnByaXZhdGVDb21waWxlKToKKwogMjAxMy0wOS0yMSAgRmls aXAgUGl6bG8gIDxmcGl6bG9AYXBwbGUuY29tPgogCiAgICAgICAgIEludGVycHJldGVyOjp1bndp bmQoKSBoYXMgbm8gbmVlZCBmb3IgdGhlIGJ5dGVjb2RlT2Zmc2V0CkluZGV4OiBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcAkocmV2aXNpb24gMTU2MjQxKQor KysgU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTI1NDcsOSArMjU0Nyw2IEBAIHZvaWQgQ29kZUJsb2NrOjpzaHJpbmtUb0ZpdChT aHJpbmtNb2RlIHMKIAogICAgIGlmIChtX3JhcmVEYXRhKSB7CiAgICAgICAgIG1fcmFyZURhdGEt Pm1fZXhjZXB0aW9uSGFuZGxlcnMuc2hyaW5rVG9GaXQoKTsKLSNpZiBFTkFCTEUoSklUKQotICAg ICAgICBtX3JhcmVEYXRhLT5tX2NhbGxSZXR1cm5JbmRleFZlY3Rvci5zaHJpbmtUb0ZpdCgpOwot I2VuZGlmCiAjaWYgRU5BQkxFKERGR19KSVQpCiAgICAgICAgIG1fcmFyZURhdGEtPm1faW5saW5l Q2FsbEZyYW1lcy5zaHJpbmtUb0ZpdCgpOwogICAgICAgICBtX3JhcmVEYXRhLT5tX2NvZGVPcmln aW5zLnNocmlua1RvRml0KCk7CkBAIC0yNjQxLDEwMiArMjYzOCw2IEBAIHZvaWQgQ29kZUJsb2Nr OjpsaW5rSW5jb21pbmdDYWxsKEV4ZWNTdGEKIH0KICNlbmRpZiAvLyBFTkFCTEUoTExJTlQpCiAK LSNpZiBFTkFCTEUoSklUKQotQ2xvc3VyZUNhbGxTdHViUm91dGluZSogQ29kZUJsb2NrOjpmaW5k Q2xvc3VyZUNhbGxGb3JSZXR1cm5QQyhSZXR1cm5BZGRyZXNzUHRyIHJldHVybkFkZHJlc3MpCi17 Ci0gICAgZm9yICh1bnNpZ25lZCBpID0gbV9jYWxsTGlua0luZm9zLnNpemUoKTsgaS0tOykgewot ICAgICAgICBDYWxsTGlua0luZm8mIGluZm8gPSBtX2NhbGxMaW5rSW5mb3NbaV07Ci0gICAgICAg IGlmICghaW5mby5zdHViKQotICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgIGlmICghaW5m by5zdHViLT5jb2RlKCkuZXhlY3V0YWJsZU1lbW9yeSgpLT5jb250YWlucyhyZXR1cm5BZGRyZXNz LnZhbHVlKCkpKQotICAgICAgICAgICAgY29udGludWU7Ci0KLSAgICAgICAgUkVMRUFTRV9BU1NF UlQoaW5mby5zdHViLT5jb2RlT3JpZ2luKCkuYnl0ZWNvZGVJbmRleCAhPSBDb2RlT3JpZ2luOjpp bnZhbGlkQnl0ZWNvZGVJbmRleCk7Ci0gICAgICAgIHJldHVybiBpbmZvLnN0dWIuZ2V0KCk7Ci0g ICAgfQotICAgIAotICAgIC8vIFRoZSBzdHViIHJvdXRpbmUgbWF5IGhhdmUgYmVlbiBqZXR0aXNv bmVkLiBUaGlzIGlzIHJhcmUsIGJ1dCB3ZSBoYXZlIHRvIGhhbmRsZSBpdC4KLSAgICBjb25zdCBK SVRTdHViUm91dGluZVNldCYgc2V0ID0gbV92bS0+aGVhcC5qaXRTdHViUm91dGluZXMoKTsKLSAg ICBmb3IgKHVuc2lnbmVkIGkgPSBzZXQuc2l6ZSgpOyBpLS07KSB7Ci0gICAgICAgIEdDQXdhcmVK SVRTdHViUm91dGluZSogZ2VuZXJpY1N0dWIgPSBzZXQuYXQoaSk7Ci0gICAgICAgIGlmICghZ2Vu ZXJpY1N0dWItPmlzQ2xvc3VyZUNhbGwoKSkKLSAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAg ICBDbG9zdXJlQ2FsbFN0dWJSb3V0aW5lKiBzdHViID0gc3RhdGljX2Nhc3Q8Q2xvc3VyZUNhbGxT dHViUm91dGluZSo+KGdlbmVyaWNTdHViKTsKLSAgICAgICAgaWYgKCFzdHViLT5jb2RlKCkuZXhl Y3V0YWJsZU1lbW9yeSgpLT5jb250YWlucyhyZXR1cm5BZGRyZXNzLnZhbHVlKCkpKQotICAgICAg ICAgICAgY29udGludWU7Ci0gICAgICAgIFJFTEVBU0VfQVNTRVJUKHN0dWItPmNvZGVPcmlnaW4o KS5ieXRlY29kZUluZGV4ICE9IENvZGVPcmlnaW46OmludmFsaWRCeXRlY29kZUluZGV4KTsKLSAg ICAgICAgcmV0dXJuIHN0dWI7Ci0gICAgfQotICAgIAotICAgIHJldHVybiAwOwotfQotI2VuZGlm Ci0KLXVuc2lnbmVkIENvZGVCbG9jazo6Ynl0ZWNvZGVPZmZzZXQoRXhlY1N0YXRlKiBleGVjLCBS ZXR1cm5BZGRyZXNzUHRyIHJldHVybkFkZHJlc3MpCi17Ci0gICAgVU5VU0VEX1BBUkFNKGV4ZWMp OwotICAgIFVOVVNFRF9QQVJBTShyZXR1cm5BZGRyZXNzKTsKLSNpZiBFTkFCTEUoTExJTlQpCi0j aWYgIUVOQUJMRShMTElOVF9DX0xPT1ApCi0gICAgLy8gV2hlbiB1c2luZyB0aGUgSklULCB3ZSBj b3VsZCBoYXZlIGFkZHJlc3NlcyB0aGF0IGFyZSBub3QgYnl0ZWNvZGUKLSAgICAvLyBhZGRyZXNz ZXMuIFdlIGNoZWNrIGlmIHRoZSByZXR1cm4gYWRkcmVzcyBpcyBpbiB0aGUgTExpbnQgZ2x1ZSBh bmQKLSAgICAvLyBvcGNvZGUgaGFuZGxlcnMgcmFuZ2UgaGVyZSB0byBlbnN1cmUgdGhhdCB3ZSBh cmUgbG9va2luZyBhdCBieXRlY29kZQotICAgIC8vIGJlZm9yZSBhdHRlbXB0aW5nIHRvIGNvbnZl cnQgdGhlIHJldHVybiBhZGRyZXNzIGludG8gYSBieXRlY29kZSBvZmZzZXQuCi0gICAgLy8KLSAg ICAvLyBJbiB0aGUgY2FzZSBvZiB0aGUgQyBMb29wIExMSW50LCB0aGUgSklUIGlzIGRpc2FibGVk LCBhbmQgdGhlIG9ubHkKLSAgICAvLyB2YWxpZCByZXR1cm4gYWRkcmVzc2VzIHNob3VsZCBiZSBi eXRlY29kZSBQQ3MuIFNvLCB3ZSBjYW4gYW5kIG5lZWQgdG8KLSAgICAvLyBmb3JlZ28gdGhpcyBj aGVjayBiZWNhdXNlIHdoZW4gd2UgZG8gbm90IEVOQUJMRShDT01QVVRFRF9HT1RPX09QQ09ERVMp LAotICAgIC8vIHRoZW4gdGhlIGJ5dGVjb2RlICJQQyJzIGFyZSBhY3R1YWxseSB0aGUgb3Bjb2Rl SURzIGFuZCBhcmUgbm90IGJvdW5kZWQKLSAgICAvLyBieSBsbGludF9iZWdpbiBhbmQgbGxpbnRf ZW5kLgotICAgIGlmIChyZXR1cm5BZGRyZXNzLnZhbHVlKCkgPj0gTExJbnQ6OmdldENvZGVQdHIo bGxpbnRfYmVnaW4pCi0gICAgICAgICYmIHJldHVybkFkZHJlc3MudmFsdWUoKSA8PSBMTEludDo6 Z2V0Q29kZVB0cihsbGludF9lbmQpKQotI2VuZGlmCi0gICAgewotICAgICAgICBSRUxFQVNFX0FT U0VSVChleGVjLT5jb2RlQmxvY2soKSk7Ci0gICAgICAgIFJFTEVBU0VfQVNTRVJUKGV4ZWMtPmNv ZGVCbG9jaygpID09IHRoaXMpOwotICAgICAgICBSRUxFQVNFX0FTU0VSVChKSVRDb2RlOjppc0Jh c2VsaW5lQ29kZShqaXRUeXBlKCkpKTsKLSAgICAgICAgSW5zdHJ1Y3Rpb24qIGluc3RydWN0aW9u ID0gZXhlYy0+Y3VycmVudFZQQygpOwotICAgICAgICBSRUxFQVNFX0FTU0VSVChpbnN0cnVjdGlv bik7Ci0KLSAgICAgICAgcmV0dXJuIGJ5dGVjb2RlT2Zmc2V0KGluc3RydWN0aW9uKTsKLSAgICB9 Ci0jZW5kaWYgLy8gIUVOQUJMRShMTElOVCkKLQotI2lmIEVOQUJMRShKSVQpCi0gICAgaWYgKCFt X3JhcmVEYXRhKQotICAgICAgICByZXR1cm4gMTsKLSAgICBWZWN0b3I8Q2FsbFJldHVybk9mZnNl dFRvQnl0ZWNvZGVPZmZzZXQsIDAsIFVuc2FmZVZlY3Rvck92ZXJmbG93PiYgY2FsbEluZGljZXMg PSBtX3JhcmVEYXRhLT5tX2NhbGxSZXR1cm5JbmRleFZlY3RvcjsKLSAgICBpZiAoIWNhbGxJbmRp Y2VzLnNpemUoKSkKLSAgICAgICAgcmV0dXJuIDE7Ci0gICAgCi0gICAgaWYgKGppdENvZGUoKS0+ Y29udGFpbnMocmV0dXJuQWRkcmVzcy52YWx1ZSgpKSkgewotICAgICAgICB1bnNpZ25lZCBjYWxs UmV0dXJuT2Zmc2V0ID0gaml0Q29kZSgpLT5vZmZzZXRPZihyZXR1cm5BZGRyZXNzLnZhbHVlKCkp OwotICAgICAgICBDYWxsUmV0dXJuT2Zmc2V0VG9CeXRlY29kZU9mZnNldCogcmVzdWx0ID0KLSAg ICAgICAgICAgIGJpbmFyeVNlYXJjaDxDYWxsUmV0dXJuT2Zmc2V0VG9CeXRlY29kZU9mZnNldCwg dW5zaWduZWQ+KAotICAgICAgICAgICAgICAgIGNhbGxJbmRpY2VzLCBjYWxsSW5kaWNlcy5zaXpl KCksIGNhbGxSZXR1cm5PZmZzZXQsIGdldENhbGxSZXR1cm5PZmZzZXQpOwotICAgICAgICBSRUxF QVNFX0FTU0VSVChyZXN1bHQtPmNhbGxSZXR1cm5PZmZzZXQgPT0gY2FsbFJldHVybk9mZnNldCk7 Ci0gICAgICAgIFJFTEVBU0VfQVNTRVJUKHJlc3VsdC0+Ynl0ZWNvZGVPZmZzZXQgPCBpbnN0cnVj dGlvbkNvdW50KCkpOwotICAgICAgICByZXR1cm4gcmVzdWx0LT5ieXRlY29kZU9mZnNldDsKLSAg ICB9Ci0gICAgQ2xvc3VyZUNhbGxTdHViUm91dGluZSogY2xvc3VyZUluZm8gPSBmaW5kQ2xvc3Vy ZUNhbGxGb3JSZXR1cm5QQyhyZXR1cm5BZGRyZXNzKTsKLSAgICBDb2RlT3JpZ2luIG9yaWdpbiA9 IGNsb3N1cmVJbmZvLT5jb2RlT3JpZ2luKCk7Ci0gICAgd2hpbGUgKElubGluZUNhbGxGcmFtZSog aW5saW5lQ2FsbEZyYW1lID0gb3JpZ2luLmlubGluZUNhbGxGcmFtZSkgewotICAgICAgICBpZiAo aW5saW5lQ2FsbEZyYW1lLT5iYXNlbGluZUNvZGVCbG9jaygpID09IHRoaXMpCi0gICAgICAgICAg ICBicmVhazsKLSAgICAgICAgb3JpZ2luID0gaW5saW5lQ2FsbEZyYW1lLT5jYWxsZXI7Ci0gICAg ICAgIFJFTEVBU0VfQVNTRVJUKG9yaWdpbi5ieXRlY29kZUluZGV4ICE9IENvZGVPcmlnaW46Omlu dmFsaWRCeXRlY29kZUluZGV4KTsKLSAgICB9Ci0gICAgUkVMRUFTRV9BU1NFUlQob3JpZ2luLmJ5 dGVjb2RlSW5kZXggIT0gQ29kZU9yaWdpbjo6aW52YWxpZEJ5dGVjb2RlSW5kZXgpOwotICAgIHVu c2lnbmVkIGJ5dGVjb2RlSW5kZXggPSBvcmlnaW4uYnl0ZWNvZGVJbmRleDsKLSAgICBSRUxFQVNF X0FTU0VSVChieXRlY29kZUluZGV4IDwgaW5zdHJ1Y3Rpb25Db3VudCgpKTsKLSAgICByZXR1cm4g Ynl0ZWNvZGVJbmRleDsKLSNlbmRpZiAvLyBFTkFCTEUoSklUKQotCi0jaWYgIUVOQUJMRShMTElO VCkgJiYgIUVOQUJMRShKSVQpCi0gICAgcmV0dXJuIDE7Ci0jZW5kaWYKLX0KLQogdm9pZCBDb2Rl QmxvY2s6OmNsZWFyRXZhbENhY2hlKCkKIHsKICAgICBpZiAoISFtX2FsdGVybmF0aXZlKQpJbmRl eDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suaAkocmV2aXNpb24g MTU2MjQxKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5oCSh3 b3JraW5nIGNvcHkpCkBAIC0xOTksMjUgKzE5OSw5IEBAIHB1YmxpYzoKICAgICB9CiAjZW5kaWYg Ly8gRU5BQkxFKEpJVCkKIAotICAgIHVuc2lnbmVkIGJ5dGVjb2RlT2Zmc2V0KEV4ZWNTdGF0ZSos IFJldHVybkFkZHJlc3NQdHIpOwotCiAgICAgdm9pZCB1bmxpbmtJbmNvbWluZ0NhbGxzKCk7CiAK ICNpZiBFTkFCTEUoSklUKQotICAgIHVuc2lnbmVkIGJ5dGVjb2RlT2Zmc2V0Rm9yQ2FsbEF0SW5k ZXgodW5zaWduZWQgaW5kZXgpCi0gICAgewotICAgICAgICBpZiAoIW1fcmFyZURhdGEpCi0gICAg ICAgICAgICByZXR1cm4gMTsKLSAgICAgICAgVmVjdG9yPENhbGxSZXR1cm5PZmZzZXRUb0J5dGVj b2RlT2Zmc2V0LCAwLCBVbnNhZmVWZWN0b3JPdmVyZmxvdz4mIGNhbGxJbmRpY2VzID0gbV9yYXJl RGF0YS0+bV9jYWxsUmV0dXJuSW5kZXhWZWN0b3I7Ci0gICAgICAgIGlmICghY2FsbEluZGljZXMu c2l6ZSgpKQotICAgICAgICAgICAgcmV0dXJuIDE7Ci0gICAgICAgIC8vIEZJWE1FOiBGaXggcGxh Y2VzIGluIERGRyB0aGF0IGNhbGwgb3V0IHRvIEMgdGhhdCBkb24ndCBzZXQgdGhlIENvZGVPcmln aW4uIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTgzMTUKLSAgICAg ICAgQVNTRVJUKGluZGV4IDwgbV9yYXJlRGF0YS0+bV9jYWxsUmV0dXJuSW5kZXhWZWN0b3Iuc2l6 ZSgpKTsKLSAgICAgICAgaWYgKGluZGV4ID49IG1fcmFyZURhdGEtPm1fY2FsbFJldHVybkluZGV4 VmVjdG9yLnNpemUoKSkKLSAgICAgICAgICAgIHJldHVybiAxOwotICAgICAgICByZXR1cm4gbV9y YXJlRGF0YS0+bV9jYWxsUmV0dXJuSW5kZXhWZWN0b3JbaW5kZXhdLmJ5dGVjb2RlT2Zmc2V0Owot ICAgIH0KLQogICAgIHZvaWQgdW5saW5rQ2FsbHMoKTsKICAgICAgICAgCiAgICAgdm9pZCBsaW5r SW5jb21pbmdDYWxsKEV4ZWNTdGF0ZSogY2FsbGVyRnJhbWUsIENhbGxMaW5rSW5mbyopOwpAQCAt NTgxLDE0ICs1NjUsNiBAQCBwdWJsaWM6CiAKICAgICBib29sIGhhc0V4cHJlc3Npb25JbmZvKCkg eyByZXR1cm4gbV91bmxpbmtlZENvZGUtPmhhc0V4cHJlc3Npb25JbmZvKCk7IH0KIAotI2lmIEVO QUJMRShKSVQpCi0gICAgVmVjdG9yPENhbGxSZXR1cm5PZmZzZXRUb0J5dGVjb2RlT2Zmc2V0LCAw LCBVbnNhZmVWZWN0b3JPdmVyZmxvdz4mIGNhbGxSZXR1cm5JbmRleFZlY3RvcigpCi0gICAgewot ICAgICAgICBjcmVhdGVSYXJlRGF0YUlmTmVjZXNzYXJ5KCk7Ci0gICAgICAgIHJldHVybiBtX3Jh cmVEYXRhLT5tX2NhbGxSZXR1cm5JbmRleFZlY3RvcjsKLSAgICB9Ci0jZW5kaWYKLQogI2lmIEVO QUJMRShERkdfSklUKQogICAgIFNlZ21lbnRlZFZlY3RvcjxJbmxpbmVDYWxsRnJhbWUsIDQ+JiBp bmxpbmVDYWxsRnJhbWVzKCkKICAgICB7CkBAIC0xMTQ1LDkgKzExMjEsNiBAQCBwcml2YXRlOgog CiAgICAgICAgIEV2YWxDb2RlQ2FjaGUgbV9ldmFsQ29kZUNhY2hlOwogCi0jaWYgRU5BQkxFKEpJ VCkKLSAgICAgICAgVmVjdG9yPENhbGxSZXR1cm5PZmZzZXRUb0J5dGVjb2RlT2Zmc2V0LCAwLCBV bnNhZmVWZWN0b3JPdmVyZmxvdz4gbV9jYWxsUmV0dXJuSW5kZXhWZWN0b3I7Ci0jZW5kaWYKICNp ZiBFTkFCTEUoREZHX0pJVCkKICAgICAgICAgU2VnbWVudGVkVmVjdG9yPElubGluZUNhbGxGcmFt ZSwgND4gbV9pbmxpbmVDYWxsRnJhbWVzOwogICAgICAgICBWZWN0b3I8Q29kZU9yaWdpbiwgMCwg VW5zYWZlVmVjdG9yT3ZlcmZsb3c+IG1fY29kZU9yaWdpbnM7CkluZGV4OiBTb3VyY2UvSmF2YVNj cmlwdENvcmUvZGZnL0RGR0pJVENvbXBpbGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvZGZnL0RGR0pJVENvbXBpbGVyLmNwcAkocmV2aXNpb24gMTU2MjQxKQorKysg U291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdKSVRDb21waWxlci5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTEzMyw5ICsxMzMsOCBAQCB2b2lkIEpJVENvbXBpbGVyOjpjb21waWxlRXhjZXB0aW9u SGFuZGxlCiAgICAgLy8gSWYgYW55IGV4Y2VwdGlvbiBjaGVja3Mgd2VyZSBsaW5rZWQsIGdlbmVy YXRlIGNvZGUgdG8gbG9va3VwIGEgaGFuZGxlci4KICAgICBpZiAoZGlkTGlua0V4Y2VwdGlvbkNo ZWNrKSB7CiAgICAgICAgIC8vIGxvb2t1cEV4Y2VwdGlvbkhhbmRsZXIgaXMgcGFzc2VkIHR3byBh cmd1bWVudHMsIGV4ZWMgKHRoZSBDYWxsRnJhbWUqKSwgYW5kCi0gICAgICAgIC8vIHRoZSBpbmRl eCBpbnRvIHRoZSBDb2RlQmxvY2sncyBjYWxsUmV0dXJuSW5kZXhWZWN0b3IgY29ycmVzcG9uZGlu ZyB0byB0aGUKLSAgICAgICAgLy8gY2FsbCB0aGF0IHRocmV3IHRoZSBleGNlcHRpb24gKHRoaXMg d2FzIHNldCBpbiBub25QcmVzZXJ2ZWROb25SZXR1cm5HUFIsIHdoZW4KLSAgICAgICAgLy8gdGhl IGV4Y2VwdGlvbiBjaGVjayB3YXMgcGxhbnRlZCkuCisgICAgICAgIC8vIHRoZSBpbmRleCBvZiB0 aGUgQ29kZU9yaWdpbi4gVGhlIGxhdHRlciBpcyB1bnVzZWQsIHNlZQorICAgICAgICAvLyBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIxNzM0LgogICAgICAgICBtb3Zl KEdQUkluZm86Om5vblByZXNlcnZlZE5vblJldHVybkdQUiwgR1BSSW5mbzo6YXJndW1lbnRHUFIx KTsKICAgICAgICAgbW92ZShHUFJJbmZvOjpjYWxsRnJhbWVSZWdpc3RlciwgR1BSSW5mbzo6YXJn dW1lbnRHUFIwKTsKICNpZiBDUFUoWDg2KQpAQCAtMjE3LDE2ICsyMTYsNiBAQCB2b2lkIEpJVENv bXBpbGVyOjpsaW5rKExpbmtCdWZmZXImIGxpbmtCCiAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsg aSA8IG1fY2FsbHMuc2l6ZSgpOyArK2kpCiAgICAgICAgIGxpbmtCdWZmZXIubGluayhtX2NhbGxz W2ldLm1fY2FsbCwgbV9jYWxsc1tpXS5tX2Z1bmN0aW9uKTsKIAotICAgIG1fY29kZUJsb2NrLT5j YWxsUmV0dXJuSW5kZXhWZWN0b3IoKS5yZXNlcnZlQ2FwYWNpdHkobV9leGNlcHRpb25DaGVja3Mu c2l6ZSgpKTsKLSAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbV9leGNlcHRpb25DaGVja3Mu c2l6ZSgpOyArK2kpIHsKLSAgICAgICAgdW5zaWduZWQgcmV0dXJuQWRkcmVzc09mZnNldCA9IGxp bmtCdWZmZXIucmV0dXJuQWRkcmVzc09mZnNldChtX2V4Y2VwdGlvbkNoZWNrc1tpXS5tX2NhbGwp OwotICAgICAgICBDb2RlT3JpZ2luIGNvZGVPcmlnaW4gPSBtX2V4Y2VwdGlvbkNoZWNrc1tpXS5t X2NvZGVPcmlnaW47Ci0gICAgICAgIHdoaWxlIChjb2RlT3JpZ2luLmlubGluZUNhbGxGcmFtZSkK LSAgICAgICAgICAgIGNvZGVPcmlnaW4gPSBjb2RlT3JpZ2luLmlubGluZUNhbGxGcmFtZS0+Y2Fs bGVyOwotICAgICAgICB1bnNpZ25lZCBleGNlcHRpb25JbmZvID0gY29kZU9yaWdpbi5ieXRlY29k ZUluZGV4OwotICAgICAgICBtX2NvZGVCbG9jay0+Y2FsbFJldHVybkluZGV4VmVjdG9yKCkuYXBw ZW5kKENhbGxSZXR1cm5PZmZzZXRUb0J5dGVjb2RlT2Zmc2V0KHJldHVybkFkZHJlc3NPZmZzZXQs IGV4Y2VwdGlvbkluZm8pKTsKLSAgICB9Ci0KICAgICBWZWN0b3I8Q29kZU9yaWdpbiwgMCwgVW5z YWZlVmVjdG9yT3ZlcmZsb3c+JiBjb2RlT3JpZ2lucyA9IG1fY29kZUJsb2NrLT5jb2RlT3JpZ2lu cygpOwogICAgIGNvZGVPcmlnaW5zLnJlc2l6ZShtX2V4Y2VwdGlvbkNoZWNrcy5zaXplKCkpOwog ICAgIApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVQuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklULmNwcAkocmV2aXNpb24gMTU2MjQxKQor KysgU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03 MDcsMTAgKzcwNyw2IEBAIENvbXBpbGF0aW9uUmVzdWx0IEpJVDo6cHJpdmF0ZUNvbXBpbGUoSkkK ICAgICAgICAgICAgIHBhdGNoQnVmZmVyLmxpbmsoaXRlci0+ZnJvbSwgRnVuY3Rpb25QdHIoaXRl ci0+dG8pKTsKICAgICB9CiAKLSAgICBtX2NvZGVCbG9jay0+Y2FsbFJldHVybkluZGV4VmVjdG9y KCkucmVzZXJ2ZUNhcGFjaXR5KG1fY2FsbHMuc2l6ZSgpKTsKLSAgICBmb3IgKFZlY3RvcjxDYWxs UmVjb3JkPjo6aXRlcmF0b3IgaXRlciA9IG1fY2FsbHMuYmVnaW4oKTsgaXRlciAhPSBtX2NhbGxz LmVuZCgpOyArK2l0ZXIpCi0gICAgICAgIG1fY29kZUJsb2NrLT5jYWxsUmV0dXJuSW5kZXhWZWN0 b3IoKS5hcHBlbmQoQ2FsbFJldHVybk9mZnNldFRvQnl0ZWNvZGVPZmZzZXQocGF0Y2hCdWZmZXIu cmV0dXJuQWRkcmVzc09mZnNldChpdGVyLT5mcm9tKSwgaXRlci0+Ynl0ZWNvZGVPZmZzZXQpKTsK LQogICAgIG1fY29kZUJsb2NrLT5zZXROdW1iZXJPZlN0cnVjdHVyZVN0dWJJbmZvcyhtX3Byb3Bl cnR5QWNjZXNzQ29tcGlsYXRpb25JbmZvLnNpemUoKSk7CiAgICAgZm9yICh1bnNpZ25lZCBpID0g MDsgaSA8IG1fcHJvcGVydHlBY2Nlc3NDb21waWxhdGlvbkluZm8uc2l6ZSgpOyArK2kpCiAgICAg ICAgIG1fcHJvcGVydHlBY2Nlc3NDb21waWxhdGlvbkluZm9baV0uY29weVRvU3R1YkluZm8obV9j b2RlQmxvY2stPnN0cnVjdHVyZVN0dWJJbmZvKGkpLCBwYXRjaEJ1ZmZlcik7Cg==