74350 2011-12-12 14:57:29 -0800 De-virtualize destructors part 6 2011-12-18 12:23:08 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 74349 74331 74353 1 mhahnenberg mhahnenberg oldest_to_newest 519529 0 mhahnenberg 2011-12-12 14:57:29 -0800 Same as bug 74341, just moving the static destroy functions down another level in the hierarchy and leaving behind any necessary destroy functions. 519544 1 118870 mhahnenberg 2011-12-12 15:04:24 -0800 Created attachment 118870 De-virtualize destructors part 6 No changelog (see bug 74331). 519591 2 118870 ggaren 2011-12-12 15:32:54 -0800 Comment on attachment 118870 De-virtualize destructors part 6 r=me 118870 2011-12-12 15:04:24 -0800 2011-12-12 15:32:54 -0800 De-virtualize destructors part 6 0012-Finished-level-6.patch text/plain 10491 mhahnenberg RnJvbSBkZmNlZmQ5MzJlOWZhNWE4OGYxMzhiMGZmZGQzYmNkNDdiZDQyZWE5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJrIEhhaG5lbmJlcmcgPG1oYWhuZW5iZXJnQGFwcGxlLmNv bT4KRGF0ZTogV2VkLCA3IERlYyAyMDExIDE3OjA5OjI4IC0wODAwClN1YmplY3Q6IFtQQVRDSCAx Mi8xOF0gRmluaXNoZWQgbGV2ZWwgNgoKLS0tCiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9K U0RPTUJpbmRpbmcuY3BwICAgICAgICB8ICAgMTIgKystLS0tLS0tLS0tCiBTb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy9qcy9KU0RPTUJpbmRpbmcuaCAgICAgICAgICB8ICAgIDUgLS0tLS0KIFNvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NR2xvYmFsT2JqZWN0LmNwcCAgIHwgICAgNiArKyst LS0KIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NR2xvYmFsT2JqZWN0LmggICAgIHwg ICAgMyArKy0KIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NV2luZG93QmFzZS5jcHAg ICAgIHwgICAgNiArLS0tLS0KIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NV2luZG93 QmFzZS5oICAgICAgIHwgICAgMSAtCiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0ltYWdl Q29uc3RydWN0b3IuY3BwICB8ICAgIDMgKystCiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9K U0ltYWdlQ29uc3RydWN0b3IuaCAgICB8ICAgIDUgKysrKysKIFNvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL2pzL0pTV29ya2VyQ29udGV4dEJhc2UuY3BwIHwgICAgNiArLS0tLS0KIFNvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL2pzL0pTV29ya2VyQ29udGV4dEJhc2UuaCAgIHwgICAgMSAtCiBTb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbSB8ICAgIDQgKystLQog MTEgZmlsZXMgY2hhbmdlZCwgMTggaW5zZXJ0aW9ucygrKSwgMzQgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01CaW5kaW5nLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NQmluZGluZy5jcHAKaW5kZXggYjViNjQyMS4u MmY0OTk5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01CaW5k aW5nLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTUJpbmRpbmcuY3Bw CkBAIC0zOCwxNiArMzgsOCBAQCB1c2luZyBuYW1lc3BhY2UgSlNDOwogCiBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAKLWNvbnN0IENsYXNzSW5mbyBET01Db25zdHJ1Y3RvcldpdGhEb2N1bWVudDo6c19p bmZvID0geyAiRE9NQ29uc3RydWN0b3IiLCAmQmFzZTo6c19pbmZvLCAwLCAwLCBDUkVBVEVfTUVU SE9EX1RBQkxFKERPTUNvbnN0cnVjdG9yV2l0aERvY3VtZW50KSB9OwotCi1ET01Db25zdHJ1Y3Rv cldpdGhEb2N1bWVudDo6fkRPTUNvbnN0cnVjdG9yV2l0aERvY3VtZW50KCkKLXsKLX0KLQotdm9p ZCBET01Db25zdHJ1Y3RvcldpdGhEb2N1bWVudDo6ZGVzdHJveShKU0NlbGwqIGNlbGwpCi17Ci0g ICAganNDYXN0PERPTUNvbnN0cnVjdG9yV2l0aERvY3VtZW50Kj4oY2VsbCktPn5ET01Db25zdHJ1 Y3RvcldpdGhEb2N1bWVudCgpOwotfQorQVNTRVJUX0hBU19UUklWSUFMX0RFU1RSVUNUT1IoRE9N Q29uc3RydWN0b3JPYmplY3QpOworQVNTRVJUX0hBU19UUklWSUFMX0RFU1RSVUNUT1IoRE9NQ29u c3RydWN0b3JXaXRoRG9jdW1lbnQpOwogCiBjb25zdCBKU0M6Okhhc2hUYWJsZSogZ2V0SGFzaFRh YmxlRm9yR2xvYmFsRGF0YShKU0dsb2JhbERhdGEmIGdsb2JhbERhdGEsIGNvbnN0IEpTQzo6SGFz aFRhYmxlKiBzdGF0aWNUYWJsZSkKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL2pzL0pTRE9NQmluZGluZy5oIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01C aW5kaW5nLmgKaW5kZXggYjA4ZTg2YS4uOWI2Y2I0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvanMvSlNET01CaW5kaW5nLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGlu Z3MvanMvSlNET01CaW5kaW5nLmgKQEAgLTg4LDggKzg4LDYgQEAgZW51bSBQYXJhbWV0ZXJNaXNz aW5nUG9saWN5IHsKICAgICAgICAgICAgIHJldHVybiBzdGF0aWNfY2FzdDxEb2N1bWVudCo+KHNj cmlwdEV4ZWN1dGlvbkNvbnRleHQoKSk7CiAgICAgICAgIH0KIAotICAgICAgICBzdGF0aWMgY29u c3QgSlNDOjpDbGFzc0luZm8gc19pbmZvOwotCiAgICAgcHJvdGVjdGVkOgogICAgICAgICBET01D b25zdHJ1Y3RvcldpdGhEb2N1bWVudChKU0M6OlN0cnVjdHVyZSogc3RydWN0dXJlLCBKU0RPTUds b2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0KQogICAgICAgICAgICAgOiBET01Db25zdHJ1Y3Rvck9i amVjdChzdHJ1Y3R1cmUsIGdsb2JhbE9iamVjdCkKQEAgLTEwMSw5ICs5OSw2IEBAIGVudW0gUGFy YW1ldGVyTWlzc2luZ1BvbGljeSB7CiAgICAgICAgICAgICBCYXNlOjpmaW5pc2hDcmVhdGlvbihn bG9iYWxPYmplY3QtPmdsb2JhbERhdGEoKSk7CiAgICAgICAgICAgICBBU1NFUlQoZ2xvYmFsT2Jq ZWN0LT5zY3JpcHRFeGVjdXRpb25Db250ZXh0KCktPmlzRG9jdW1lbnQoKSk7CiAgICAgICAgIH0K LQotICAgICAgICB2aXJ0dWFsIH5ET01Db25zdHJ1Y3RvcldpdGhEb2N1bWVudCgpOwotICAgICAg ICBzdGF0aWMgdm9pZCBkZXN0cm95KEpTQ2VsbCopOwogICAgIH07CiAgICAgCiAjcHJhZ21hIGNs YW5nIGRpYWdub3N0aWMgcG9wCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9q cy9KU0RPTUdsb2JhbE9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RP TUdsb2JhbE9iamVjdC5jcHAKaW5kZXggMWFiOTAzNC4uNGEzYTZhMCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01HbG9iYWxPYmplY3QuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NR2xvYmFsT2JqZWN0LmNwcApAQCAtNDksMTMgKzQ5 LDEzIEBAIEpTRE9NR2xvYmFsT2JqZWN0OjpKU0RPTUdsb2JhbE9iamVjdChKU0dsb2JhbERhdGEm IGdsb2JhbERhdGEsIFN0cnVjdHVyZSogc3RydWN0CiB7CiB9CiAKLUpTRE9NR2xvYmFsT2JqZWN0 Ojp+SlNET01HbG9iYWxPYmplY3QoKQordm9pZCBKU0RPTUdsb2JhbE9iamVjdDo6ZGVzdHJveShK U0NlbGwqIGNlbGwpCiB7CisgICAganNDYXN0PEpTRE9NR2xvYmFsT2JqZWN0Kj4oY2VsbCktPkpT RE9NR2xvYmFsT2JqZWN0Ojp+SlNET01HbG9iYWxPYmplY3QoKTsKIH0KIAotdm9pZCBKU0RPTUds b2JhbE9iamVjdDo6ZGVzdHJveShKU0NlbGwqIGNlbGwpCit2b2lkIEpTRE9NR2xvYmFsT2JqZWN0 Ojp2dGFibGVBbmNob3IoKQogewotICAgIGpzQ2FzdDxKU0RPTUdsb2JhbE9iamVjdCo+KGNlbGwp LT5+SlNET01HbG9iYWxPYmplY3QoKTsKIH0KIAogdm9pZCBKU0RPTUdsb2JhbE9iamVjdDo6Zmlu aXNoQ3JlYXRpb24oSlNHbG9iYWxEYXRhJiBnbG9iYWxEYXRhKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01HbG9iYWxPYmplY3QuaCBiL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL2pzL0pTRE9NR2xvYmFsT2JqZWN0LmgKaW5kZXggOTJhODE5OS4uZmQ0NzQzNiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01HbG9iYWxPYmplY3Qu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTUdsb2JhbE9iamVjdC5oCkBA IC00OCwxMSArNDgsMTIgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBzdHJ1Y3QgSlNE T01HbG9iYWxPYmplY3REYXRhOwogCiAgICAgICAgIEpTRE9NR2xvYmFsT2JqZWN0KEpTQzo6SlNH bG9iYWxEYXRhJiwgSlNDOjpTdHJ1Y3R1cmUqLCBQYXNzUmVmUHRyPERPTVdyYXBwZXJXb3JsZD4s IGNvbnN0IEpTQzo6R2xvYmFsT2JqZWN0TWV0aG9kVGFibGUqID0gMCk7Ci0gICAgICAgIHZpcnR1 YWwgfkpTRE9NR2xvYmFsT2JqZWN0KCk7CiAgICAgICAgIHN0YXRpYyB2b2lkIGRlc3Ryb3koSlND OjpKU0NlbGwqKTsKICAgICAgICAgdm9pZCBmaW5pc2hDcmVhdGlvbihKU0M6OkpTR2xvYmFsRGF0 YSYpOwogICAgICAgICB2b2lkIGZpbmlzaENyZWF0aW9uKEpTQzo6SlNHbG9iYWxEYXRhJiwgSlND OjpKU0dsb2JhbFRoaXMqKTsKIAorICAgICAgICB2aXJ0dWFsIHZvaWQgdnRhYmxlQW5jaG9yKCk7 CisKICAgICBwdWJsaWM6CiAgICAgICAgIEpTRE9NU3RydWN0dXJlTWFwJiBzdHJ1Y3R1cmVzKCkg eyByZXR1cm4gbV9zdHJ1Y3R1cmVzOyB9CiAgICAgICAgIEpTRE9NQ29uc3RydWN0b3JNYXAmIGNv bnN0cnVjdG9ycygpIHsgcmV0dXJuIG1fY29uc3RydWN0b3JzOyB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTVdpbmRvd0Jhc2UuY3BwIGIvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvanMvSlNET01XaW5kb3dCYXNlLmNwcAppbmRleCBhODZhODhkLi44ZGU0MzJl IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTVdpbmRvd0Jhc2Uu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NV2luZG93QmFzZS5jcHAK QEAgLTY1LDEzICs2NSw5IEBAIHZvaWQgSlNET01XaW5kb3dCYXNlOjpmaW5pc2hDcmVhdGlvbihK U0dsb2JhbERhdGEmIGdsb2JhbERhdGEsIEpTRE9NV2luZG93U2hlbGwqCiAgICAgYWRkU3RhdGlj R2xvYmFscyhzdGF0aWNHbG9iYWxzLCBXVEZfQVJSQVlfTEVOR1RIKHN0YXRpY0dsb2JhbHMpKTsK IH0KIAotSlNET01XaW5kb3dCYXNlOjp+SlNET01XaW5kb3dCYXNlKCkKLXsKLX0KLQogdm9pZCBK U0RPTVdpbmRvd0Jhc2U6OmRlc3Ryb3koSlNDZWxsKiBjZWxsKQogewotICAgIGpzQ2FzdDxKU0RP TVdpbmRvd0Jhc2UqPihjZWxsKS0+fkpTRE9NV2luZG93QmFzZSgpOworICAgIGpzQ2FzdDxKU0RP TVdpbmRvd0Jhc2UqPihjZWxsKS0+SlNET01XaW5kb3dCYXNlOjp+SlNET01XaW5kb3dCYXNlKCk7 CiB9CiAKIHZvaWQgSlNET01XaW5kb3dCYXNlOjp1cGRhdGVEb2N1bWVudCgpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTVdpbmRvd0Jhc2UuaCBiL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NV2luZG93QmFzZS5oCmluZGV4IGQ3ZTJlZDAuLmI1ODBk NDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NV2luZG93QmFz ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NV2luZG93QmFzZS5oCkBA IC00MCw3ICs0MCw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgSlNET01XaW5kb3dC YXNlKEpTQzo6SlNHbG9iYWxEYXRhJiwgSlNDOjpTdHJ1Y3R1cmUqLCBQYXNzUmVmUHRyPERPTVdp bmRvdz4sIEpTRE9NV2luZG93U2hlbGwqKTsKICAgICAgICAgdm9pZCBmaW5pc2hDcmVhdGlvbihK U0M6OkpTR2xvYmFsRGF0YSYsIEpTRE9NV2luZG93U2hlbGwqKTsKIAotICAgICAgICB2aXJ0dWFs IH5KU0RPTVdpbmRvd0Jhc2UoKTsKICAgICAgICAgc3RhdGljIHZvaWQgZGVzdHJveShKU0NlbGwq KTsKIAogICAgIHB1YmxpYzoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pz L0pTSW1hZ2VDb25zdHJ1Y3Rvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0lt YWdlQ29uc3RydWN0b3IuY3BwCmluZGV4IDRhMzk2ZTQuLjk1NmM5NjEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTSW1hZ2VDb25zdHJ1Y3Rvci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNJbWFnZUNvbnN0cnVjdG9yLmNwcApAQCAtMzEsOCAr MzEsOSBAQCB1c2luZyBuYW1lc3BhY2UgSlNDOwogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBBU1NF UlRfQ0xBU1NfRklUU19JTl9DRUxMKEpTSW1hZ2VDb25zdHJ1Y3Rvcik7CitBU1NFUlRfSEFTX1RS SVZJQUxfREVTVFJVQ1RPUihKU0ltYWdlQ29uc3RydWN0b3IpOwogCi1jb25zdCBDbGFzc0luZm8g SlNJbWFnZUNvbnN0cnVjdG9yOjpzX2luZm8gPSB7ICJJbWFnZUNvbnN0cnVjdG9yIiwgJkRPTUNv bnN0cnVjdG9yV2l0aERvY3VtZW50OjpzX2luZm8sIDAsIDAsIENSRUFURV9NRVRIT0RfVEFCTEUo SlNJbWFnZUNvbnN0cnVjdG9yKSB9OworY29uc3QgQ2xhc3NJbmZvIEpTSW1hZ2VDb25zdHJ1Y3Rv cjo6c19pbmZvID0geyAiSW1hZ2VDb25zdHJ1Y3RvciIsICZCYXNlOjpzX2luZm8sIDAsIDAsIENS RUFURV9NRVRIT0RfVEFCTEUoSlNJbWFnZUNvbnN0cnVjdG9yKSB9OwogCiBKU0ltYWdlQ29uc3Ry dWN0b3I6OkpTSW1hZ2VDb25zdHJ1Y3RvcihTdHJ1Y3R1cmUqIHN0cnVjdHVyZSwgSlNET01HbG9i YWxPYmplY3QqIGdsb2JhbE9iamVjdCkKICAgICA6IERPTUNvbnN0cnVjdG9yV2l0aERvY3VtZW50 KHN0cnVjdHVyZSwgZ2xvYmFsT2JqZWN0KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3MvanMvSlNJbWFnZUNvbnN0cnVjdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9q cy9KU0ltYWdlQ29uc3RydWN0b3IuaAppbmRleCA5Y2M0ZmQxLi5iMmRjYjdmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0ltYWdlQ29uc3RydWN0b3IuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0ltYWdlQ29uc3RydWN0b3IuaApAQCAtMjUsNiAr MjUsOSBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKKyNwcmFnbWEgY2xhbmcgZGlhZ25vc3Rp YyBwdXNoCisjcHJhZ21hIGNsYW5nIGRpYWdub3N0aWMgaWdub3JlZCAiLVdub24tdmlydHVhbC1k dG9yIgorCiAgICAgY2xhc3MgSlNJbWFnZUNvbnN0cnVjdG9yIDogcHVibGljIERPTUNvbnN0cnVj dG9yV2l0aERvY3VtZW50IHsKICAgICBwdWJsaWM6CiAgICAgICAgIHR5cGVkZWYgRE9NQ29uc3Ry dWN0b3JXaXRoRG9jdW1lbnQgQmFzZTsKQEAgLTQ5LDYgKzUyLDggQEAgbmFtZXNwYWNlIFdlYkNv cmUgewogICAgICAgICBzdGF0aWMgSlNDOjpDb25zdHJ1Y3RUeXBlIGdldENvbnN0cnVjdERhdGEo SlNDOjpKU0NlbGwqLCBKU0M6OkNvbnN0cnVjdERhdGEmKTsKICAgICB9OwogCisjcHJhZ21hIGNs YW5nIGRpYWdub3N0aWMgcG9wCisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlmIC8v IEpTSW1hZ2VDb25zdHJ1Y3Rvcl9oCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9qcy9KU1dvcmtlckNvbnRleHRCYXNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pz L0pTV29ya2VyQ29udGV4dEJhc2UuY3BwCmluZGV4IGJiNDI2MGUuLmU3OWM2ZTQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTV29ya2VyQ29udGV4dEJhc2UuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTV29ya2VyQ29udGV4dEJhc2UuY3BwCkBA IC02MCwxMyArNjAsOSBAQCB2b2lkIEpTV29ya2VyQ29udGV4dEJhc2U6OmZpbmlzaENyZWF0aW9u KEpTR2xvYmFsRGF0YSYgZ2xvYmFsRGF0YSkKICAgICBBU1NFUlQoaW5oZXJpdHMoJnNfaW5mbykp OwogfQogCi1KU1dvcmtlckNvbnRleHRCYXNlOjp+SlNXb3JrZXJDb250ZXh0QmFzZSgpCi17Ci19 Ci0KIHZvaWQgSlNXb3JrZXJDb250ZXh0QmFzZTo6ZGVzdHJveShKU0NlbGwqIGNlbGwpCiB7Ci0g ICAganNDYXN0PEpTV29ya2VyQ29udGV4dEJhc2UqPihjZWxsKS0+fkpTV29ya2VyQ29udGV4dEJh c2UoKTsKKyAgICBqc0Nhc3Q8SlNXb3JrZXJDb250ZXh0QmFzZSo+KGNlbGwpLT5KU1dvcmtlckNv bnRleHRCYXNlOjp+SlNXb3JrZXJDb250ZXh0QmFzZSgpOwogfQogCiBTY3JpcHRFeGVjdXRpb25D b250ZXh0KiBKU1dvcmtlckNvbnRleHRCYXNlOjpzY3JpcHRFeGVjdXRpb25Db250ZXh0KCkgY29u c3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTV29ya2VyQ29udGV4 dEJhc2UuaCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTV29ya2VyQ29udGV4dEJhc2Uu aAppbmRleCA2NjJmYmZjLi42YTA5MWRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy9qcy9KU1dvcmtlckNvbnRleHRCYXNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGlu Z3MvanMvSlNXb3JrZXJDb250ZXh0QmFzZS5oCkBAIC00MSw3ICs0MSw2IEBAIG5hbWVzcGFjZSBX ZWJDb3JlIHsKICAgICBjbGFzcyBKU1dvcmtlckNvbnRleHRCYXNlIDogcHVibGljIEpTRE9NR2xv YmFsT2JqZWN0IHsKICAgICAgICAgdHlwZWRlZiBKU0RPTUdsb2JhbE9iamVjdCBCYXNlOwogICAg IHB1YmxpYzoKLSAgICAgICAgdmlydHVhbCB+SlNXb3JrZXJDb250ZXh0QmFzZSgpOwogICAgICAg ICBzdGF0aWMgdm9pZCBkZXN0cm95KEpTQzo6SlNDZWxsKik7CiAKICAgICAgICAgc3RhdGljIGNv bnN0IEpTQzo6Q2xhc3NJbmZvIHNfaW5mbzsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBtIGIvU291cmNlL1dlYkNvcmUvYmluZGlu Z3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG0KaW5kZXggMjAwYTU1NC4uN2E3ODU5MCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMu cG0KKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMu cG0KQEAgLTM0MTgsNyArMzQxOCw3IEBAIHN1YiBHZW5lcmF0ZUNvbnN0cnVjdG9yRGVmaW5pdGlv bgogICAgIG15ICRudW1iZXJPZmNvbnN0cnVjdFBhcmFtZXRlcnMgPSAkZGF0YU5vZGUtPmV4dGVu ZGVkQXR0cmlidXRlcy0+eyJDb25zdHJ1Y3RvclBhcmFtZXRlcnMifTsKIAogICAgIGlmICgkZ2Vu ZXJhdGluZ05hbWVkQ29uc3RydWN0b3IpIHsKLSAgICAgICAgcHVzaChAJG91dHB1dEFycmF5LCAi Y29uc3QgQ2xhc3NJbmZvICR7Y29uc3RydWN0b3JDbGFzc05hbWV9OjpzX2luZm8gPSB7IFwiJHt2 aXNpYmxlQ2xhc3NOYW1lfUNvbnN0cnVjdG9yXCIsICZET01Db25zdHJ1Y3RvcldpdGhEb2N1bWVu dDo6c19pbmZvLCAwLCAwLCBDUkVBVEVfTUVUSE9EX1RBQkxFKCRjb25zdHJ1Y3RvckNsYXNzTmFt ZSkgfTtcblxuIik7CisgICAgICAgIHB1c2goQCRvdXRwdXRBcnJheSwgImNvbnN0IENsYXNzSW5m byAke2NvbnN0cnVjdG9yQ2xhc3NOYW1lfTo6c19pbmZvID0geyBcIiR7dmlzaWJsZUNsYXNzTmFt ZX1Db25zdHJ1Y3RvclwiLCAmQmFzZTo6c19pbmZvLCAwLCAwLCBDUkVBVEVfTUVUSE9EX1RBQkxF KCRjb25zdHJ1Y3RvckNsYXNzTmFtZSkgfTtcblxuIik7CiAgICAgICAgIHB1c2goQCRvdXRwdXRB cnJheSwgIiR7Y29uc3RydWN0b3JDbGFzc05hbWV9Ojoke2NvbnN0cnVjdG9yQ2xhc3NOYW1lfShT dHJ1Y3R1cmUqIHN0cnVjdHVyZSwgSlNET01HbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdClcbiIp OwogICAgICAgICBwdXNoKEAkb3V0cHV0QXJyYXksICIgICAgOiBET01Db25zdHJ1Y3RvcldpdGhE b2N1bWVudChzdHJ1Y3R1cmUsIGdsb2JhbE9iamVjdClcbiIpOwogICAgICAgICBwdXNoKEAkb3V0 cHV0QXJyYXksICJ7XG4iKTsKQEAgLTM0MjYsNyArMzQyNiw3IEBAIHN1YiBHZW5lcmF0ZUNvbnN0 cnVjdG9yRGVmaW5pdGlvbgogICAgIH0gZWxzZSB7CiAgICAgICAgIHB1c2goQCRvdXRwdXRBcnJh eSwgIkFTU0VSVF9IQVNfVFJJVklBTF9ERVNUUlVDVE9SKCR7Y29uc3RydWN0b3JDbGFzc05hbWV9 KTtcblxuIik7CiAKLSAgICAgICAgcHVzaChAJG91dHB1dEFycmF5LCAiY29uc3QgQ2xhc3NJbmZv ICR7Y29uc3RydWN0b3JDbGFzc05hbWV9OjpzX2luZm8gPSB7IFwiJHt2aXNpYmxlQ2xhc3NOYW1l fUNvbnN0cnVjdG9yXCIsICZET01Db25zdHJ1Y3Rvck9iamVjdDo6c19pbmZvLCAmJHtjb25zdHJ1 Y3RvckNsYXNzTmFtZX1UYWJsZSwgMCwgQ1JFQVRFX01FVEhPRF9UQUJMRSgkY29uc3RydWN0b3JD bGFzc05hbWUpIH07XG5cbiIpOworICAgICAgICBwdXNoKEAkb3V0cHV0QXJyYXksICJjb25zdCBD bGFzc0luZm8gJHtjb25zdHJ1Y3RvckNsYXNzTmFtZX06OnNfaW5mbyA9IHsgXCIke3Zpc2libGVD bGFzc05hbWV9Q29uc3RydWN0b3JcIiwgJkJhc2U6OnNfaW5mbywgJiR7Y29uc3RydWN0b3JDbGFz c05hbWV9VGFibGUsIDAsIENSRUFURV9NRVRIT0RfVEFCTEUoJGNvbnN0cnVjdG9yQ2xhc3NOYW1l KSB9O1xuXG4iKTsKICAgICAgICAgcHVzaChAJG91dHB1dEFycmF5LCAiJHtjb25zdHJ1Y3RvckNs YXNzTmFtZX06OiR7Y29uc3RydWN0b3JDbGFzc05hbWV9KFN0cnVjdHVyZSogc3RydWN0dXJlLCBK U0RPTUdsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0KVxuIik7CiAgICAgICAgIHB1c2goQCRvdXRw dXRBcnJheSwgIiAgICA6IERPTUNvbnN0cnVjdG9yT2JqZWN0KHN0cnVjdHVyZSwgZ2xvYmFsT2Jq ZWN0KVxuIik7CiAgICAgICAgIHB1c2goQCRvdXRwdXRBcnJheSwgIntcbiIpOwotLSAKMS43LjQu NAoK