117170 2013-06-03 14:49:54 -0700 fourthTier: all cached put_by_id transitions, even ones that weren't inlined by the DFG, should be propagated by the GC 2013-06-03 17:11:40 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 fpizlo fpizlo barraclough ggaren mark.lam mhahnenberg msaboff oliver sam oldest_to_newest 896626 0 fpizlo 2013-06-03 14:49:54 -0700 This should keep more structures alive. 896627 1 203630 fpizlo 2013-06-03 14:50:46 -0700 Created attachment 203630 the patch 896633 2 203630 mhahnenberg 2013-06-03 15:00:08 -0700 Comment on attachment 203630 the patch r=me 896658 3 fpizlo 2013-06-03 17:11:40 -0700 Landed in http://trac.webkit.org/changeset/151144 203630 2013-06-03 14:50:46 -0700 2013-06-03 15:00:08 -0700 the patch blah.patch text/plain 11223 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTUxMTMwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBA CisyMDEzLTA2LTAzICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg Zm91cnRoVGllcjogYWxsIGNhY2hlZCBwdXRfYnlfaWQgdHJhbnNpdGlvbnMsIGV2ZW4gb25lcyB0 aGF0IHdlcmVuJ3QgaW5saW5lZCBieSB0aGUgREZHLCBzaG91bGQgYmUgcHJvcGFnYXRlZCBieSB0 aGUgR0MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEx NzE3MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog Ynl0ZWNvZGUvQ29kZUJsb2NrLmNwcDoKKyAgICAgICAgKEpTQzo6Q29kZUJsb2NrOjp2aXNpdEFn Z3JlZ2F0ZSk6CisgICAgICAgIChKU0M6OkNvZGVCbG9jazo6cHJvcGFnYXRlVHJhbnNpdGlvbnMp OgorICAgICAgICAoSlNDKToKKyAgICAgICAgKEpTQzo6Q29kZUJsb2NrOjpkZXRlcm1pbmVMaXZl bmVzcyk6CisgICAgICAgIChKU0M6OkNvZGVCbG9jazo6dmlzaXRXZWFrUmVmZXJlbmNlcyk6Cisg ICAgICAgIChKU0M6OkNvZGVCbG9jazo6ZmluYWxpemVVbmNvbmRpdGlvbmFsbHkpOgorICAgICAg ICAqIGJ5dGVjb2RlL0NvZGVCbG9jay5oOgorICAgICAgICAoQ29kZUJsb2NrKToKKyAgICAgICAg KiBieXRlY29kZS9Qb2x5bW9ycGhpY1B1dEJ5SWRMaXN0Lmg6CisgICAgICAgIChKU0MpOgorICAg ICAgICAoUHV0QnlJZEFjY2Vzcyk6CisgICAgICAgIChQb2x5bW9ycGhpY1B1dEJ5SWRMaXN0KToK KyAgICAgICAgKiBieXRlY29kZS9TdHJ1Y3R1cmVTdHViSW5mby5oOgorICAgICAgICAoU3RydWN0 dXJlU3R1YkluZm8pOgorICAgICAgICAqIGppdC9KSVRDb2RlLmg6CisgICAgICAgIChKU0M6OkpJ VENvZGU6OmNvdWxkQmVJbnRlcnByZXRlZCk6CisgICAgICAgIChKSVRDb2RlKToKKwogMjAxMy0w Ni0wMyAgTWFyayBMYW0gIDxtYXJrLmxhbUBhcHBsZS5jb20+CiAKICAgICAgICAgTWVyZ2VkIGZy b20gaHR0cDovL3N2bi53ZWJraXQub3JnL3JlcG9zaXRvcnkvd2Via2l0L3RydW5rCkluZGV4OiBT b3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcAkocmV2aXNpb24g MTUxMTI1KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTQ4LDYgKzQ4LDcgQEAKICNpbmNsdWRlICJKU05hbWVTY29wZS5o IgogI2luY2x1ZGUgIkxvd0xldmVsSW50ZXJwcmV0ZXIuaCIKICNpbmNsdWRlICJPcGVyYXRpb25z LmgiCisjaW5jbHVkZSAiUG9seW1vcnBoaWNQdXRCeUlkTGlzdC5oIgogI2luY2x1ZGUgIlJlZHVj ZVdoaXRlc3BhY2UuaCIKICNpbmNsdWRlICJSZXBhdGNoQnVmZmVyLmgiCiAjaW5jbHVkZSAiU2xv dFZpc2l0b3JJbmxpbmVzLmgiCkBAIC0yMTA0LDEwICsyMTA1LDE3IEBAIHZvaWQgQ29kZUJsb2Nr Ojp2aXNpdEFnZ3JlZ2F0ZShTbG90VmlzaXQKICAgICAvLyBhbmQgd2hlbiBpdCBydW5zLCBpdCBm aWd1cmVzIG91dCB3aGV0aGVyIGl0IGhhcyBhbnkgd29yayB0byBkby4KICAgICB2aXNpdG9yLmFk ZFVuY29uZGl0aW9uYWxGaW5hbGl6ZXIodGhpcyk7CiAgICAgCisgICAgLy8gVGhlcmUgYXJlIHR3 byB0aGluZ3MgdGhhdCB3ZSB1c2Ugd2VhayByZWZlcmVuY2UgaGFydmVzdGVycyBmb3I6IERGRyBm aXhwb2ludCBmb3IKKyAgICAvLyBqZXR0aXNvbmluZywgYW5kIHRyeWluZyB0byBmaW5kIHN0cnVj dHVyZXMgdGhhdCB3b3VsZCBiZSBsaXZlIGJhc2VkIG9uIHNvbWUKKyAgICAvLyBpbmxpbmUgY2Fj aGUuIFNvIGl0IG1ha2VzIHNlbnNlIHRvIHJlZ2lzdGVyIHRoZW0gcmVnYXJkbGVzcy4KKyAgICB2 aXNpdG9yLmFkZFdlYWtSZWZlcmVuY2VIYXJ2ZXN0ZXIodGhpcyk7CisgICAgbV9hbGxUcmFuc2l0 aW9uc0hhdmVCZWVuTWFya2VkID0gZmFsc2U7CisgICAgCiAgICAgaWYgKHNob3VsZEltbWVkaWF0 ZWx5QXNzdW1lTGl2ZW5lc3NEdXJpbmdTY2FuKCkpIHsKICAgICAgICAgLy8gVGhpcyBjb2RlIGJs b2NrIGlzIGxpdmUsIHNvIHNjYW4gYWxsIHJlZmVyZW5jZXMgc3Ryb25nbHkgYW5kIHJldHVybi4K ICAgICAgICAgc3Ryb25nbHlWaXNpdFN0cm9uZ1JlZmVyZW5jZXModmlzaXRvcik7CiAgICAgICAg IHN0cm9uZ2x5VmlzaXRXZWFrUmVmZXJlbmNlcyh2aXNpdG9yKTsKKyAgICAgICAgcHJvcGFnYXRl VHJhbnNpdGlvbnModmlzaXRvcik7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAgICAgCkBAIC0y MTIyLDMwICsyMTMwLDkyIEBAIHZvaWQgQ29kZUJsb2NrOjp2aXNpdEFnZ3JlZ2F0ZShTbG90Vmlz aXQKICAgICAvLyBkZWNpc2lvbiBieSBjYWxsaW5nIGhhcnZlc3RXZWFrUmVmZXJlbmNlcygpLgog ICAgIAogICAgIG1faml0Q29kZS0+ZGZnQ29tbW9uKCktPmxpdmVuZXNzSGFzQmVlblByb3ZlZCA9 IGZhbHNlOwotICAgIG1faml0Q29kZS0+ZGZnQ29tbW9uKCktPmFsbFRyYW5zaXRpb25zSGF2ZUJl ZW5NYXJrZWQgPSBmYWxzZTsKLSAgICAKLSAgICBwZXJmb3JtVHJhY2luZ0ZpeHBvaW50SXRlcmF0 aW9uKHZpc2l0b3IpOwotCi0gICAgLy8gR0MgZG9lc24ndCBoYXZlIGVub3VnaCBpbmZvcm1hdGlv biB5ZXQgZm9yIHVzIHRvIGRlY2lkZSB3aGV0aGVyIHRvIGtlZXAgb3VyIERGRwotICAgIC8vIGRh dGEsIHNvIHdlIG5lZWQgdG8gcmVnaXN0ZXIgYSBoYW5kbGVyIHRvIHJ1biBhZ2FpbiBhdCB0aGUg ZW5kIG9mIEdDLCB3aGVuIG1vcmUKLSAgICAvLyBpbmZvcm1hdGlvbiBpcyBhdmFpbGFibGUuCi0g ICAgaWYgKCEobV9qaXRDb2RlLT5kZmdDb21tb24oKS0+bGl2ZW5lc3NIYXNCZWVuUHJvdmVkICYm IG1faml0Q29kZS0+ZGZnQ29tbW9uKCktPmFsbFRyYW5zaXRpb25zSGF2ZUJlZW5NYXJrZWQpKQot ICAgICAgICB2aXNpdG9yLmFkZFdlYWtSZWZlcmVuY2VIYXJ2ZXN0ZXIodGhpcyk7CiAgICAgCisg ICAgcHJvcGFnYXRlVHJhbnNpdGlvbnModmlzaXRvcik7CisgICAgZGV0ZXJtaW5lTGl2ZW5lc3Mo dmlzaXRvcik7CiAjZWxzZSAvLyBFTkFCTEUoREZHX0pJVCkKICAgICBSRUxFQVNFX0FTU0VSVF9O T1RfUkVBQ0hFRCgpOwogI2VuZGlmIC8vIEVOQUJMRShERkdfSklUKQogfQogCi12b2lkIENvZGVC bG9jazo6cGVyZm9ybVRyYWNpbmdGaXhwb2ludEl0ZXJhdGlvbihTbG90VmlzaXRvciYgdmlzaXRv cikKK3ZvaWQgQ29kZUJsb2NrOjpwcm9wYWdhdGVUcmFuc2l0aW9ucyhTbG90VmlzaXRvciYgdmlz aXRvcikKIHsKICAgICBVTlVTRURfUEFSQU0odmlzaXRvcik7CisKKyAgICBpZiAobV9hbGxUcmFu c2l0aW9uc0hhdmVCZWVuTWFya2VkKQorICAgICAgICByZXR1cm47CisKKyAgICBib29sIGFsbEFy ZU1hcmtlZFNvRmFyID0gdHJ1ZTsKKyAgICAgICAgCisjaWYgRU5BQkxFKExMSU5UKQorICAgIElu dGVycHJldGVyKiBpbnRlcnByZXRlciA9IG1fdm0tPmludGVycHJldGVyOworICAgIGlmIChqaXRU eXBlKCkgPT0gSklUQ29kZTo6SW50ZXJwcmV0ZXJUaHVuaykgeworICAgICAgICBjb25zdCBWZWN0 b3I8dW5zaWduZWQ+JiBwcm9wZXJ0eUFjY2Vzc0luc3RydWN0aW9ucyA9IG1fdW5saW5rZWRDb2Rl LT5wcm9wZXJ0eUFjY2Vzc0luc3RydWN0aW9ucygpOworICAgICAgICBmb3IgKHNpemVfdCBpID0g cHJvcGVydHlBY2Nlc3NJbnN0cnVjdGlvbnMuc2l6ZSgpOyBpLS07KSB7CisgICAgICAgICAgICBJ bnN0cnVjdGlvbiogaW5zdHJ1Y3Rpb24gPSAmaW5zdHJ1Y3Rpb25zKClbcHJvcGVydHlBY2Nlc3NJ bnN0cnVjdGlvbnNbaV1dOworICAgICAgICAgICAgc3dpdGNoIChpbnRlcnByZXRlci0+Z2V0T3Bj b2RlSUQoaW5zdHJ1Y3Rpb25bMF0udS5vcGNvZGUpKSB7CisgICAgICAgICAgICBjYXNlIG9wX3B1 dF9ieV9pZF90cmFuc2l0aW9uX2RpcmVjdDoKKyAgICAgICAgICAgIGNhc2Ugb3BfcHV0X2J5X2lk X3RyYW5zaXRpb25fbm9ybWFsOgorICAgICAgICAgICAgY2FzZSBvcF9wdXRfYnlfaWRfdHJhbnNp dGlvbl9kaXJlY3Rfb3V0X29mX2xpbmU6CisgICAgICAgICAgICBjYXNlIG9wX3B1dF9ieV9pZF90 cmFuc2l0aW9uX25vcm1hbF9vdXRfb2ZfbGluZTogeworICAgICAgICAgICAgICAgIGlmIChIZWFw Ojppc01hcmtlZChpbnN0cnVjdGlvbls0XS51LnN0cnVjdHVyZS5nZXQoKSkpCisgICAgICAgICAg ICAgICAgICAgIHZpc2l0b3IuYXBwZW5kKCZpbnN0cnVjdGlvbls2XS51LnN0cnVjdHVyZSk7Cisg ICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICBhbGxBcmVNYXJrZWRTb0Zh ciA9IGZhbHNlOworICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgfQorICAgICAg ICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIH0KKyAg ICAgICAgfQorICAgIH0KKyNlbmRpZiAvLyBFTkFCTEUoTExJTlQpCisKKyNpZiBFTkFCTEUoSklU KQorICAgIGlmIChKSVRDb2RlOjppc0pJVChqaXRUeXBlKCkpKSB7CisgICAgICAgIGZvciAodW5z aWduZWQgaSA9IG1fc3RydWN0dXJlU3R1YkluZm9zLnNpemUoKTsgaS0tOykgeworICAgICAgICAg ICAgU3RydWN0dXJlU3R1YkluZm8mIHN0dWJJbmZvID0gbV9zdHJ1Y3R1cmVTdHViSW5mb3NbaV07 CisgICAgICAgICAgICBzd2l0Y2ggKHN0dWJJbmZvLmFjY2Vzc1R5cGUpIHsKKyAgICAgICAgICAg IGNhc2UgYWNjZXNzX3B1dF9ieV9pZF90cmFuc2l0aW9uX25vcm1hbDoKKyAgICAgICAgICAgIGNh c2UgYWNjZXNzX3B1dF9ieV9pZF90cmFuc2l0aW9uX2RpcmVjdDogeworICAgICAgICAgICAgICAg IEpTQ2VsbCogb3JpZ2luID0gc3R1YkluZm8uY29kZU9yaWdpbi5jb2RlT3JpZ2luT3duZXIoKTsK KyAgICAgICAgICAgICAgICBpZiAoKCFvcmlnaW4gfHwgSGVhcDo6aXNNYXJrZWQob3JpZ2luKSkK KyAgICAgICAgICAgICAgICAgICAgJiYgSGVhcDo6aXNNYXJrZWQoc3R1YkluZm8udS5wdXRCeUlk VHJhbnNpdGlvbi5wcmV2aW91c1N0cnVjdHVyZS5nZXQoKSkpCisgICAgICAgICAgICAgICAgICAg IHZpc2l0b3IuYXBwZW5kKCZzdHViSW5mby51LnB1dEJ5SWRUcmFuc2l0aW9uLnN0cnVjdHVyZSk7 CisgICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICBhbGxBcmVNYXJrZWRT b0ZhciA9IGZhbHNlOworICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgfQorCisg ICAgICAgICAgICBjYXNlIGFjY2Vzc19wdXRfYnlfaWRfbGlzdDogeworICAgICAgICAgICAgICAg IFBvbHltb3JwaGljUHV0QnlJZExpc3QqIGxpc3QgPSBzdHViSW5mby51LnB1dEJ5SWRMaXN0Lmxp c3Q7CisgICAgICAgICAgICAgICAgSlNDZWxsKiBvcmlnaW4gPSBzdHViSW5mby5jb2RlT3JpZ2lu LmNvZGVPcmlnaW5Pd25lcigpOworICAgICAgICAgICAgICAgIGlmIChvcmlnaW4gJiYgIUhlYXA6 OmlzTWFya2VkKG9yaWdpbikpIHsKKyAgICAgICAgICAgICAgICAgICAgYWxsQXJlTWFya2VkU29G YXIgPSBmYWxzZTsKKyAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAg fQorICAgICAgICAgICAgICAgIGZvciAodW5zaWduZWQgaiA9IGxpc3QtPnNpemUoKTsgai0tOykg eworICAgICAgICAgICAgICAgICAgICBQdXRCeUlkQWNjZXNzJiBhY2Nlc3MgPSBsaXN0LT5tX2xp c3Rbal07CisgICAgICAgICAgICAgICAgICAgIGlmICghYWNjZXNzLmlzVHJhbnNpdGlvbigpKQor ICAgICAgICAgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICAgICAgICAgIGlm IChIZWFwOjppc01hcmtlZChhY2Nlc3Mub2xkU3RydWN0dXJlKCkpKQorICAgICAgICAgICAgICAg ICAgICAgICAgdmlzaXRvci5hcHBlbmQoJmFjY2Vzcy5tX25ld1N0cnVjdHVyZSk7CisgICAgICAg ICAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICAgICAgICAgIGFsbEFyZU1hcmtlZFNv RmFyID0gZmFsc2U7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIGJyZWFrOwor ICAgICAgICAgICAgfQorICAgICAgICAgICAgCisgICAgICAgICAgICBkZWZhdWx0OgorICAgICAg ICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgfQorI2VuZGlm IC8vIEVOQUJMRShKSVQpCiAgICAgCiAjaWYgRU5BQkxFKERGR19KSVQpCi0gICAgLy8gRXZhbHVh dGUgb3VyIHdlYWsgcmVmZXJlbmNlIHRyYW5zaXRpb25zLCBpZiB0aGVyZSBhcmUgc3RpbGwgc29t ZSB0byBldmFsdWF0ZS4KLSAgICBERkc6OkNvbW1vbkRhdGEqIGRmZ0NvbW1vbiA9IG1faml0Q29k ZS0+ZGZnQ29tbW9uKCk7Ci0gICAgaWYgKCFkZmdDb21tb24tPmFsbFRyYW5zaXRpb25zSGF2ZUJl ZW5NYXJrZWQpIHsKLSAgICAgICAgYm9vbCBhbGxBcmVNYXJrZWRTb0ZhciA9IHRydWU7CisgICAg aWYgKEpJVENvZGU6OmlzT3B0aW1pemluZ0pJVChqaXRUeXBlKCkpKSB7CisgICAgICAgIERGRzo6 Q29tbW9uRGF0YSogZGZnQ29tbW9uID0gbV9qaXRDb2RlLT5kZmdDb21tb24oKTsKICAgICAgICAg Zm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGRmZ0NvbW1vbi0+dHJhbnNpdGlvbnMuc2l6ZSgpOyAr K2kpIHsKICAgICAgICAgICAgIGlmICgoIWRmZ0NvbW1vbi0+dHJhbnNpdGlvbnNbaV0ubV9jb2Rl T3JpZ2luCiAgICAgICAgICAgICAgICAgIHx8IEhlYXA6OmlzTWFya2VkKGRmZ0NvbW1vbi0+dHJh bnNpdGlvbnNbaV0ubV9jb2RlT3JpZ2luLmdldCgpKSkKQEAgLTIxNjUsMTIgKzIyMzUsMjMgQEAg dm9pZCBDb2RlQmxvY2s6OnBlcmZvcm1UcmFjaW5nRml4cG9pbnRJdAogICAgICAgICAgICAgfSBl bHNlCiAgICAgICAgICAgICAgICAgYWxsQXJlTWFya2VkU29GYXIgPSBmYWxzZTsKICAgICAgICAg fQotICAgICAgICAKLSAgICAgICAgaWYgKGFsbEFyZU1hcmtlZFNvRmFyKQotICAgICAgICAgICAg ZGZnQ29tbW9uLT5hbGxUcmFuc2l0aW9uc0hhdmVCZWVuTWFya2VkID0gdHJ1ZTsKICAgICB9Cisj ZW5kaWYgLy8gRU5BQkxFKERGR19KSVQpCiAgICAgCisgICAgaWYgKGFsbEFyZU1hcmtlZFNvRmFy KQorICAgICAgICBtX2FsbFRyYW5zaXRpb25zSGF2ZUJlZW5NYXJrZWQgPSB0cnVlOworfQorCit2 b2lkIENvZGVCbG9jazo6ZGV0ZXJtaW5lTGl2ZW5lc3MoU2xvdFZpc2l0b3ImIHZpc2l0b3IpCit7 CisgICAgVU5VU0VEX1BBUkFNKHZpc2l0b3IpOworICAgIAorICAgIGlmIChzaG91bGRJbW1lZGlh dGVseUFzc3VtZUxpdmVuZXNzRHVyaW5nU2NhbigpKQorICAgICAgICByZXR1cm47CisgICAgCisj aWYgRU5BQkxFKERGR19KSVQpCiAgICAgLy8gQ2hlY2sgaWYgd2UgaGF2ZSBhbnkgcmVtYWluaW5n IHdvcmsgdG8gZG8uCisgICAgREZHOjpDb21tb25EYXRhKiBkZmdDb21tb24gPSBtX2ppdENvZGUt PmRmZ0NvbW1vbigpOwogICAgIGlmIChkZmdDb21tb24tPmxpdmVuZXNzSGFzQmVlblByb3ZlZCkK ICAgICAgICAgcmV0dXJuOwogICAgIApAQCAtMjE5OSwxNCArMjI4MCwxNSBAQCB2b2lkIENvZGVC bG9jazo6cGVyZm9ybVRyYWNpbmdGaXhwb2ludEl0CiAKIHZvaWQgQ29kZUJsb2NrOjp2aXNpdFdl YWtSZWZlcmVuY2VzKFNsb3RWaXNpdG9yJiB2aXNpdG9yKQogewotICAgIHBlcmZvcm1UcmFjaW5n Rml4cG9pbnRJdGVyYXRpb24odmlzaXRvcik7CisgICAgcHJvcGFnYXRlVHJhbnNpdGlvbnModmlz aXRvcik7CisgICAgZGV0ZXJtaW5lTGl2ZW5lc3ModmlzaXRvcik7CiB9CiAKIHZvaWQgQ29kZUJs b2NrOjpmaW5hbGl6ZVVuY29uZGl0aW9uYWxseSgpCiB7CiAjaWYgRU5BQkxFKExMSU5UKQogICAg IEludGVycHJldGVyKiBpbnRlcnByZXRlciA9IG1fdm0tPmludGVycHJldGVyOwotICAgIGlmICgh IW51bWJlck9mSW5zdHJ1Y3Rpb25zKCkpIHsKKyAgICBpZiAoSklUQ29kZTo6Y291bGRCZUludGVy cHJldGVkKGppdFR5cGUoKSkpIHsKICAgICAgICAgY29uc3QgVmVjdG9yPHVuc2lnbmVkPiYgcHJv cGVydHlBY2Nlc3NJbnN0cnVjdGlvbnMgPSBtX3VubGlua2VkQ29kZS0+cHJvcGVydHlBY2Nlc3NJ bnN0cnVjdGlvbnMoKTsKICAgICAgICAgZm9yIChzaXplX3Qgc2l6ZSA9IHByb3BlcnR5QWNjZXNz SW5zdHJ1Y3Rpb25zLnNpemUoKSwgaSA9IDA7IGkgPCBzaXplOyArK2kpIHsKICAgICAgICAgICAg IEluc3RydWN0aW9uKiBjdXJJbnN0cnVjdGlvbiA9ICZpbnN0cnVjdGlvbnMoKVtwcm9wZXJ0eUFj Y2Vzc0luc3RydWN0aW9uc1tpXV07CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNv ZGUvQ29kZUJsb2NrLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVj b2RlL0NvZGVCbG9jay5oCShyZXZpc2lvbiAxNTExMjUpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvYnl0ZWNvZGUvQ29kZUJsb2NrLmgJKHdvcmtpbmcgY29weSkKQEAgLTg5OSw2ICs4OTksNyBA QCBwdWJsaWM6CiAgICAgQ29uY3VycmVudEpJVExvY2sgbV9sb2NrOwogICAgIAogICAgIGJvb2wg bV9zaG91bGRBbHdheXNCZUlubGluZWQ7CisgICAgYm9vbCBtX2FsbFRyYW5zaXRpb25zSGF2ZUJl ZW5NYXJrZWQ7IC8vIEluaXRpYWxpemVkIGFuZCB1c2VkIG9uIGV2ZXJ5IEdDLgogICAgIAogcHJv dGVjdGVkOgogI2lmIEVOQUJMRShKSVQpCkBAIC05ODcsOCArOTg4LDkgQEAgcHJpdmF0ZToKICNl bHNlCiAgICAgYm9vbCBzaG91bGRJbW1lZGlhdGVseUFzc3VtZUxpdmVuZXNzRHVyaW5nU2Nhbigp IHsgcmV0dXJuIHRydWU7IH0KICNlbmRpZgotICAgICAgICAKLSAgICB2b2lkIHBlcmZvcm1UcmFj aW5nRml4cG9pbnRJdGVyYXRpb24oU2xvdFZpc2l0b3ImKTsKKyAgICAKKyAgICB2b2lkIHByb3Bh Z2F0ZVRyYW5zaXRpb25zKFNsb3RWaXNpdG9yJik7CisgICAgdm9pZCBkZXRlcm1pbmVMaXZlbmVz cyhTbG90VmlzaXRvciYpOwogICAgICAgICAKICAgICB2b2lkIHN0cm9uZ2x5VmlzaXRTdHJvbmdS ZWZlcmVuY2VzKFNsb3RWaXNpdG9yJik7CiAgICAgdm9pZCBzdHJvbmdseVZpc2l0V2Vha1JlZmVy ZW5jZXMoU2xvdFZpc2l0b3ImKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29k ZS9Qb2x5bW9ycGhpY1B1dEJ5SWRMaXN0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3Jp cHRDb3JlL2J5dGVjb2RlL1BvbHltb3JwaGljUHV0QnlJZExpc3QuaAkocmV2aXNpb24gMTUxMTI1 KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1BvbHltb3JwaGljUHV0QnlJZExp c3QuaAkod29ya2luZyBjb3B5KQpAQCAtMzksNiArMzksNyBAQAogCiBuYW1lc3BhY2UgSlNDIHsK IAorY2xhc3MgQ29kZUJsb2NrOwogc3RydWN0IFN0cnVjdHVyZVN0dWJJbmZvOwogCiBjbGFzcyBQ dXRCeUlkQWNjZXNzIHsKQEAgLTEzMiw2ICsxMzMsOCBAQCBwdWJsaWM6CiAgICAgYm9vbCB2aXNp dFdlYWsoKSBjb25zdDsKICAgICAKIHByaXZhdGU6CisgICAgZnJpZW5kIGNsYXNzIENvZGVCbG9j azsKKyAgICAKICAgICBBY2Nlc3NUeXBlIG1fdHlwZTsKICAgICBXcml0ZUJhcnJpZXI8U3RydWN0 dXJlPiBtX29sZFN0cnVjdHVyZTsKICAgICBXcml0ZUJhcnJpZXI8U3RydWN0dXJlPiBtX25ld1N0 cnVjdHVyZTsKQEAgLTE3OCw2ICsxODEsOCBAQCBwdWJsaWM6CiAgICAgYm9vbCB2aXNpdFdlYWso KSBjb25zdDsKICAgICAKIHByaXZhdGU6CisgICAgZnJpZW5kIGNsYXNzIENvZGVCbG9jazsKKyAg ICAKICAgICBWZWN0b3I8UHV0QnlJZEFjY2VzcywgMj4gbV9saXN0OwogICAgIFB1dEtpbmQgbV9r aW5kOwogfTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9TdHJ1Y3R1cmVT dHViSW5mby5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9T dHJ1Y3R1cmVTdHViSW5mby5oCShyZXZpc2lvbiAxNTExMjUpCisrKyBTb3VyY2UvSmF2YVNjcmlw dENvcmUvYnl0ZWNvZGUvU3RydWN0dXJlU3R1YkluZm8uaAkod29ya2luZyBjb3B5KQpAQCAtMTk3 LDcgKzE5Nyw3IEBAIHN0cnVjdCBTdHJ1Y3R1cmVTdHViSW5mbyB7CiAgICAgICAgIHJldHVybiBX YXRjaHBvaW50c09uU3RydWN0dXJlU3R1YkluZm86OmVuc3VyZVJlZmVyZW5jZUFuZEFkZFdhdGNo cG9pbnQoCiAgICAgICAgICAgICB3YXRjaHBvaW50cywgY29kZUJsb2NrLCB0aGlzKTsKICAgICB9 Ci0gICAgICAgIAorICAgIAogICAgIGludDhfdCBhY2Nlc3NUeXBlOwogICAgIGJvb2wgc2VlbiA6 IDE7CiAgICAgYm9vbCByZXNldEJ5R0MgOiAxOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3Jl L2ppdC9KSVRDb2RlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9K SVRDb2RlLmgJKHJldmlzaW9uIDE1MTEyNSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQv SklUQ29kZS5oCSh3b3JraW5nIGNvcHkpCkBAIC03OSw2ICs3OSwxNyBAQCBwdWJsaWM6CiAgICAg ICAgIH0KICAgICB9CiAgICAgCisgICAgc3RhdGljIGJvb2wgY291bGRCZUludGVycHJldGVkKEpJ VFR5cGUgaml0VHlwZSkKKyAgICB7CisgICAgICAgIHN3aXRjaCAoaml0VHlwZSkgeworICAgICAg ICBjYXNlIEludGVycHJldGVyVGh1bms6CisgICAgICAgIGNhc2UgQmFzZWxpbmVKSVQ6CisgICAg ICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgIHJldHVy biBmYWxzZTsKKyAgICAgICAgfQorICAgIH0KKyAgICAKICAgICBzdGF0aWMgYm9vbCBpc0pJVChK SVRUeXBlIGppdFR5cGUpCiAgICAgewogICAgICAgICBzd2l0Y2ggKGppdFR5cGUpIHsK