36043 2010-03-11 18:00:25 -0800 [v8] Remove obsolete code for delayed dereferencing of DOM objects for single-heap, multithread v8 usage. 2010-03-11 23:07:15 -0800 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 dimich dimich abarth antonm jianli oldest_to_newest 198875 0 dimich 2010-03-11 18:00:25 -0800 It was experimental implementation, since then the v8 is used in a single heap - single thread mode and the code in DOMData that was delaying removal of the objects if GC happens not on their native thread is not needed. 198878 1 50566 dimich 2010-03-11 18:03:49 -0800 Created attachment 50566 Patch. I've run this through Chromium try bots, all green. 198913 2 dimich 2010-03-11 19:53:26 -0800 landed: http://trac.webkit.org/changeset/55882 198943 3 antonm 2010-03-11 23:07:15 -0800 It's always nice to see that many lines killed---thanks a lot, Dmitry. 50566 2010-03-11 18:03:49 -0800 2010-03-11 18:11:25 -0800 Patch. patch.txt text/plain 14160 dimich ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YWVhZDVlZi4uYmY3MGY5ZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMCBAQAorMjAxMC0wMy0xMSAgRG1pdHJ5IFRpdG92 ICA8ZGltaWNoQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBbdjhdIFJlbW92ZSBvYnNvbGV0ZSBjb2RlIGZvciBkZWxheWVkIGRl cmVmZXJlbmNpbmcgb2YgRE9NIG9iamVjdHMgZm9yIHNpbmdsZS1oZWFwLCBtdWx0aXRocmVhZCB2 OCB1c2FnZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTM2MDQzCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBubyBjaGFuZ2VzIGluIGZ1bmN0aW9uYWxp dHkuCisKKyAgICAgICAgKiBiaW5kaW5ncy92OC9ET01EYXRhLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkRPTURhdGE6OkRPTURhdGEpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L0RPTURhdGEuaDoK KyAgICAgICAgKFdlYkNvcmU6OkRPTURhdGE6OmhhbmRsZVdlYWtPYmplY3QpOgorICAgICAgICAq IGJpbmRpbmdzL3Y4L0RPTURhdGFTdG9yZS5jcHA6CisgICAgICAgICogYmluZGluZ3MvdjgvRE9N RGF0YVN0b3JlLmg6CisgICAgICAgIChXZWJDb3JlOjpET01EYXRhU3RvcmU6OmRvbU9iamVjdE1h cCk6CisgICAgICAgIChXZWJDb3JlOjpET01EYXRhU3RvcmU6OmFjdGl2ZURvbU9iamVjdE1hcCk6 CisgICAgICAgIChXZWJDb3JlOjpET01EYXRhU3RvcmU6OmRvbVN2Z0VsZW1lbnRJbnN0YW5jZU1h cCk6CisgICAgICAgIChXZWJDb3JlOjpET01EYXRhU3RvcmU6OmRvbVN2Z09iamVjdFdpdGhDb250 ZXh0TWFwKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9TY29wZWRET01EYXRhU3RvcmUuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6U2NvcGVkRE9NRGF0YVN0b3JlOjpTY29wZWRET01EYXRhU3RvcmUp OgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1N0YXRpY0RPTURhdGFTdG9yZS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpTdGF0aWNET01EYXRhU3RvcmU6OlN0YXRpY0RPTURhdGFTdG9yZSk6CisgICAg ICAgICogYmluZGluZ3MvdjgvU3RhdGljRE9NRGF0YVN0b3JlLmg6CisgICAgICAgICogYmluZGlu Z3MvdjgvVjhET01NYXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6cmVtb3ZlQWxsRE9NT2JqZWN0 c0luQ3VycmVudFRocmVhZCk6CisKIDIwMTAtMDMtMTEgIExlYW5kcm8gUGVyZWlyYSAgPGxlYW5k cm9AcHJvZnVzaW9uLm1vYmk+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgSG9sZ2VyIEZyZXl0aGVy LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9iaW5kaW5ncy92OC9ET01EYXRhLmNwcCBiL1dlYkNvcmUv YmluZGluZ3MvdjgvRE9NRGF0YS5jcHAKaW5kZXggNjY2MzI2Yi4uNTY4ZmMyYyAxMDA2NDQKLS0t IGEvV2ViQ29yZS9iaW5kaW5ncy92OC9ET01EYXRhLmNwcAorKysgYi9XZWJDb3JlL2JpbmRpbmdz L3Y4L0RPTURhdGEuY3BwCkBAIC0zOSw5ICszOSw3IEBACiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK IERPTURhdGE6OkRPTURhdGEoKQotICAgIDogbV9kZWxheWVkUHJvY2Vzc2luZ1NjaGVkdWxlZChm YWxzZSkKLSAgICAsIG1faXNNYWluVGhyZWFkKFdURjo6aXNNYWluVGhyZWFkKCkpCi0gICAgLCBt X293bmluZ1RocmVhZChXVEY6OmN1cnJlbnRUaHJlYWQoKSkKKyAgICA6IG1fb3duaW5nVGhyZWFk KFdURjo6Y3VycmVudFRocmVhZCgpKQogewogfQogCkBAIC01OCw0NiArNTYsOSBAQCBET01EYXRh KiBET01EYXRhOjpnZXRDdXJyZW50KCkKICAgICByZXR1cm4gY2hpbGRUaHJlYWRET01EYXRhOwog fQogCi12b2lkIERPTURhdGE6OmVuc3VyZURlcmVmKFdyYXBwZXJUeXBlSW5mbyogdHlwZSwgdm9p ZCogZG9tT2JqZWN0KQotewotICAgIGlmIChtX293bmluZ1RocmVhZCA9PSBXVEY6OmN1cnJlbnRU aHJlYWQoKSkgewotICAgICAgICAvLyBObyBuZWVkIHRvIGRlbGF5IHRoZSB3b3JrLiBXZSBjYW4g ZGVyZWYgcmlnaHQgbm93LgotICAgICAgICBkZXJlZk9iamVjdCh0eXBlLCBkb21PYmplY3QpOwot ICAgICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgLy8gV2UgbmVlZCB0byBkbyB0aGUgZGVyZWYg b24gdGhlIGNvcnJlY3QgdGhyZWFkLgotICAgIG1fZGVsYXllZE9iamVjdE1hcC5zZXQoZG9tT2Jq ZWN0LCB0eXBlKTsKLQotICAgIC8vIFBvc3QgYSB0YXNrIHRvIHRoZSBvd25pbmcgdGhyZWFkIGlu IG9yZGVyIHRvIHByb2Nlc3MgdGhlIGRlbGF5ZWQgcXVldWUuCi0gICAgLy8gRklYTUU6IEZvciBu b3csIHdlIGNhbiBvbmx5IHBvc3QgdG8gbWFpbiB0aHJlYWQgZHVlIHRvIFdURiB0YXNrIHBvc3Rp bmcgbGltaXRhdGlvbi4gV2Ugd2lsbCBmaXggdGhpcyB3aGVuIHdlIHdvcmsgb24gbmVzdGVkIHdv cmtlci4KLSAgICBpZiAoIW1fZGVsYXllZFByb2Nlc3NpbmdTY2hlZHVsZWQpIHsKLSAgICAgICAg bV9kZWxheWVkUHJvY2Vzc2luZ1NjaGVkdWxlZCA9IHRydWU7Ci0gICAgICAgIGlmIChpc01haW5U aHJlYWQoKSkKLSAgICAgICAgICAgIFdURjo6Y2FsbE9uTWFpblRocmVhZCgmZGVyZWZEZWxheWVk T2JqZWN0c0luQ3VycmVudFRocmVhZCwgMCk7Ci0gICAgfQotfQotCiB2b2lkIERPTURhdGE6OmRl cmVmT2JqZWN0KFdyYXBwZXJUeXBlSW5mbyogdHlwZSwgdm9pZCogZG9tT2JqZWN0KQogewogICAg IHR5cGUtPmRlcmVmT2JqZWN0KGRvbU9iamVjdCk7CiB9CiAKLXZvaWQgRE9NRGF0YTo6ZGVyZWZE ZWxheWVkT2JqZWN0cygpCi17Ci0gICAgV1RGOjpNdXRleExvY2tlciBsb2NrZXIoRE9NRGF0YVN0 b3JlOjphbGxTdG9yZXNNdXRleCgpKTsKLQotICAgIG1fZGVsYXllZFByb2Nlc3NpbmdTY2hlZHVs ZWQgPSBmYWxzZTsKLQotICAgIGZvciAoRGVsYXllZE9iamVjdE1hcDo6aXRlcmF0b3IgaXRlciht X2RlbGF5ZWRPYmplY3RNYXAuYmVnaW4oKSk7IGl0ZXIgIT0gbV9kZWxheWVkT2JqZWN0TWFwLmVu ZCgpOyArK2l0ZXIpCi0gICAgICAgIGRlcmVmT2JqZWN0KGl0ZXItPnNlY29uZCwgaXRlci0+Zmly c3QpOwotCi0gICAgbV9kZWxheWVkT2JqZWN0TWFwLmNsZWFyKCk7Ci19Ci0KLXZvaWQgRE9NRGF0 YTo6ZGVyZWZEZWxheWVkT2JqZWN0c0luQ3VycmVudFRocmVhZCh2b2lkKikKLXsKLSAgICBnZXRD dXJyZW50KCktPmRlcmVmRGVsYXllZE9iamVjdHMoKTsKLX0KLQogfSAvLyBuYW1lc3BhY2UgV2Vi Q29yZQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9iaW5kaW5ncy92OC9ET01EYXRhLmggYi9XZWJDb3Jl L2JpbmRpbmdzL3Y4L0RPTURhdGEuaAppbmRleCA3MGUxNzQ5Li40ZDczMzFiIDEwMDY0NAotLS0g YS9XZWJDb3JlL2JpbmRpbmdzL3Y4L0RPTURhdGEuaAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4 L0RPTURhdGEuaApAQCAtNTQsMjMgKzU0LDEyIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAg ICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4KICAgICAgICAgc3RhdGljIHZvaWQgaGFuZGxlV2Vha09i amVjdChET01EYXRhU3RvcmU6OkRPTVdyYXBwZXJNYXBUeXBlLCB2ODo6UGVyc2lzdGVudDx2ODo6 T2JqZWN0PiwgVCogZG9tT2JqZWN0KTsKIAotICAgICAgICB2b2lkIGZvcmdldERlbGF5ZWRPYmpl Y3Qodm9pZCogb2JqZWN0KSB7IG1fZGVsYXllZE9iamVjdE1hcC50YWtlKG9iamVjdCk7IH0KLQot ICAgICAgICAvLyBUaGlzIGlzIHRvIGVuc3VyZSB0aGF0IHdlIHdpbGwgZGVyZWYgRE9NIG9iamVj dHMgZnJvbSB0aGUgb3duaW5nIHRocmVhZCwKLSAgICAgICAgLy8gbm90IHRoZSBHQyB0aHJlYWQu IFRoZSBoZWxwZXIgZnVuY3Rpb24gd2lsbCBiZSBzY2hlZHVsZWQgYnkgdGhlIEdDCi0gICAgICAg IC8vIHRocmVhZCB0byBnZXQgY2FsbGVkIGZyb20gdGhlIG93bmluZyB0aHJlYWQuCi0gICAgICAg IHN0YXRpYyB2b2lkIGRlcmVmRGVsYXllZE9iamVjdHNJbkN1cnJlbnRUaHJlYWQodm9pZCopOwot ICAgICAgICB2b2lkIGRlcmVmRGVsYXllZE9iamVjdHMoKTsKLQogICAgICAgICB0ZW1wbGF0ZTx0 eXBlbmFtZSBUPgogICAgICAgICBzdGF0aWMgdm9pZCByZW1vdmVPYmplY3RzRnJvbVdyYXBwZXJN YXAoQWJzdHJhY3RXZWFrUmVmZXJlbmNlTWFwPFQsIHY4OjpPYmplY3Q+JiBkb21NYXApOwogCiAg ICAgICAgIFRocmVhZElkZW50aWZpZXIgb3duaW5nVGhyZWFkKCkgY29uc3QgeyByZXR1cm4gbV9v d25pbmdUaHJlYWQ7IH0KIAogICAgIHByaXZhdGU6Ci0gICAgICAgIHR5cGVkZWYgV1RGOjpIYXNo TWFwPHZvaWQqLCBXcmFwcGVyVHlwZUluZm8qPiBEZWxheWVkT2JqZWN0TWFwOwotCi0gICAgICAg IHZvaWQgZW5zdXJlRGVyZWYoV3JhcHBlclR5cGVJbmZvKiB0eXBlLCB2b2lkKiBkb21PYmplY3Qp OwogICAgICAgICBzdGF0aWMgdm9pZCBkZXJlZk9iamVjdChXcmFwcGVyVHlwZUluZm8qIHR5cGUs IHZvaWQqIGRvbU9iamVjdCk7CiAKICAgICAgICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4KQEAgLTg0 LDE1ICs3Myw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgICAgIH0KICAgICAgICAg fTsKIAotICAgICAgICAvLyBTdG9yZXMgYWxsIHRoZSBET00gb2JqZWN0cyB0aGF0IGFyZSBkZWxh eWVkIHRvIGJlIHByb2Nlc3NlZCB3aGVuIHRoZQotICAgICAgICAvLyBvd25pbmcgdGhyZWFkIGdh aW5zIGNvbnRyb2wuCi0gICAgICAgIERlbGF5ZWRPYmplY3RNYXAgbV9kZWxheWVkT2JqZWN0TWFw OwotCi0gICAgICAgIC8vIFRoZSBmbGFnIHRvIGluZGljYXRlIGlmIHRoZSB0YXNrIHRvIGRvIHRo ZSBkZWxheWVkIHByb2Nlc3MgaGFzCi0gICAgICAgIC8vIGFscmVhZHkgYmVlbiBwb3N0ZWQuCi0g ICAgICAgIGJvb2wgbV9kZWxheWVkUHJvY2Vzc2luZ1NjaGVkdWxlZDsKLQotICAgICAgICBib29s IG1faXNNYWluVGhyZWFkOwogICAgICAgICBUaHJlYWRJZGVudGlmaWVyIG1fb3duaW5nVGhyZWFk OwogICAgIH07CiAKQEAgLTEwNCw3ICs4NCw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAg ICAgICAgIERPTURhdGFTdG9yZSogc3RvcmUgPSBsaXN0W2ldOwogICAgICAgICAgICAgQVNTRVJU KHN0b3JlLT5kb21EYXRhKCktPm93bmluZ1RocmVhZCgpID09IFdURjo6Y3VycmVudFRocmVhZCgp KTsKIAotICAgICAgICAgICAgRE9NRGF0YVN0b3JlOjpJbnRlcm5hbERPTVdyYXBwZXJNYXA8VD4q IGRvbU1hcCA9IHN0YXRpY19jYXN0PERPTURhdGFTdG9yZTo6SW50ZXJuYWxET01XcmFwcGVyTWFw PFQ+Kj4oc3RvcmUtPmdldERPTVdyYXBwZXJNYXAobWFwVHlwZSkpOworICAgICAgICAgICAgRE9N V3JhcHBlck1hcDxUPiogZG9tTWFwID0gc3RhdGljX2Nhc3Q8RE9NV3JhcHBlck1hcDxUPio+KHN0 b3JlLT5nZXRET01XcmFwcGVyTWFwKG1hcFR5cGUpKTsKICAgICAgICAgICAgIGlmIChkb21NYXAt PnJlbW92ZUlmUHJlc2VudChkb21PYmplY3QsIHY4T2JqZWN0KSkKICAgICAgICAgICAgICAgICBz dG9yZS0+ZG9tRGF0YSgpLT5kZXJlZk9iamVjdChWOERPTVdyYXBwZXI6OmRvbVdyYXBwZXJUeXBl KHY4T2JqZWN0KSwgZG9tT2JqZWN0KTsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9i aW5kaW5ncy92OC9ET01EYXRhU3RvcmUuY3BwIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9ET01EYXRh U3RvcmUuY3BwCmluZGV4IGUxODFlYmMuLjVkNjA5ZDggMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmlu ZGluZ3MvdjgvRE9NRGF0YVN0b3JlLmNwcAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L0RPTURh dGFTdG9yZS5jcHAKQEAgLTExNCwxMSArMTE0LDYgQEAgV1RGOjpNdXRleCYgRE9NRGF0YVN0b3Jl OjphbGxTdG9yZXNNdXRleCgpCiAgICAgcmV0dXJuIHN0YXRpY0RPTURhdGFMaXN0TXV0ZXg7CiB9 CiAKLXZvaWQgRE9NRGF0YVN0b3JlOjpmb3JnZXREZWxheWVkT2JqZWN0KERPTURhdGEqIGRvbURh dGEsIHZvaWQqIG9iamVjdCkKLXsKLSAgICBkb21EYXRhLT5mb3JnZXREZWxheWVkT2JqZWN0KG9i amVjdCk7Ci19Ci0KIHZvaWQqIERPTURhdGFTdG9yZTo6Z2V0RE9NV3JhcHBlck1hcChET01XcmFw cGVyTWFwVHlwZSB0eXBlKQogewogICAgIHN3aXRjaCAodHlwZSkgewpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9iaW5kaW5ncy92OC9ET01EYXRhU3RvcmUuaCBiL1dlYkNvcmUvYmluZGluZ3MvdjgvRE9N RGF0YVN0b3JlLmgKaW5kZXggMjMzM2E0OC4uYzM5YTBlZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9i aW5kaW5ncy92OC9ET01EYXRhU3RvcmUuaAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L0RPTURh dGFTdG9yZS5oCkBAIC0xNjEsMjIgKzE2MSw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICNlbmRp ZgogICAgICAgICB9OwogCi0gICAgICAgIHRlbXBsYXRlIDxjbGFzcyBLZXlUeXBlPgotICAgICAg ICBjbGFzcyBJbnRlcm5hbERPTVdyYXBwZXJNYXAgOiBwdWJsaWMgRE9NV3JhcHBlck1hcDxLZXlU eXBlPiB7Ci0gICAgICAgIHB1YmxpYzoKLSAgICAgICAgICAgIEludGVybmFsRE9NV3JhcHBlck1h cChET01EYXRhKiBkb21EYXRhLCB2ODo6V2Vha1JlZmVyZW5jZUNhbGxiYWNrIGNhbGxiYWNrKQot ICAgICAgICAgICAgICAgIDogRE9NV3JhcHBlck1hcDxLZXlUeXBlPihjYWxsYmFjayksIG1fZG9t RGF0YShkb21EYXRhKSB7IH0KLQotICAgICAgICAgICAgdmlydHVhbCB2b2lkIGZvcmdldChLZXlU eXBlKiBvYmplY3QpCi0gICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgRE9NV3JhcHBlck1h cDxLZXlUeXBlPjo6Zm9yZ2V0KG9iamVjdCk7Ci0gICAgICAgICAgICAgICAgZm9yZ2V0RGVsYXll ZE9iamVjdChtX2RvbURhdGEsIG9iamVjdCk7Ci0gICAgICAgICAgICB9Ci0KLSAgICAgICAgcHJp dmF0ZToKLSAgICAgICAgICAgIERPTURhdGEqIG1fZG9tRGF0YTsKLSAgICAgICAgfTsKLQogICAg ICAgICBjbGFzcyBJbnRydXNpdmVET01XcmFwcGVyTWFwIDogcHVibGljIEFic3RyYWN0V2Vha1Jl ZmVyZW5jZU1hcDxOb2RlLCB2ODo6T2JqZWN0PiB7CiAgICAgICAgIHB1YmxpYzoKICAgICAgICAg ICAgIEludHJ1c2l2ZURPTVdyYXBwZXJNYXAodjg6OldlYWtSZWZlcmVuY2VDYWxsYmFjayBjYWxs YmFjaykKQEAgLTI1MywyNSArMjM3LDIxIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAg RE9NRGF0YVN0b3JlKERPTURhdGEqKTsKICAgICAgICAgdmlydHVhbCB+RE9NRGF0YVN0b3JlKCk7 CiAKLSAgICAgICAgLy8gQSBsaXN0IG9mIGFsbCBET01EYXRhU3RvcmUgb2JqZWN0cy4gIFRyYXZl cnNlZCBkdXJpbmcgR0MgdG8gZmluZCBhIHRocmVhZC1zcGVjaWZpYyBtYXAgdGhhdAotICAgICAg ICAvLyBjb250YWlucyB0aGUgb2JqZWN0IC0gc28gd2UgY2FuIHNjaGVkdWxlIHRoZSBvYmplY3Qg dG8gYmUgZGVsZXRlZCBvbiB0aGUgdGhyZWFkIHdoaWNoIGNyZWF0ZWQgaXQuCisgICAgICAgIC8v IEEgbGlzdCBvZiBhbGwgRE9NRGF0YVN0b3JlIG9iamVjdHMgaW4gdGhlIGN1cnJlbnQgVjggaW5z dGFuY2UgKHRocmVhZCkuIE5vcm1hbGx5LCBlYWNoIFdvcmxkIGhhcyBhIERPTURhdGFTdG9yZS4K ICAgICAgICAgc3RhdGljIERPTURhdGFMaXN0JiBhbGxTdG9yZXMoKTsKICAgICAgICAgLy8gTXV0 ZXggdG8gcHJvdGVjdCBhZ2FpbnN0IGNvbmN1cnJlbnQgYWNjZXNzIG9mIERPTURhdGFMaXN0Lgog ICAgICAgICBzdGF0aWMgV1RGOjpNdXRleCYgYWxsU3RvcmVzTXV0ZXgoKTsKIAotICAgICAgICAv LyBIZWxwZXIgZnVuY3Rpb24gdG8gYXZvaWQgY2lyY3VsYXIgaW5jbHVkZXMuCi0gICAgICAgIHN0 YXRpYyB2b2lkIGZvcmdldERlbGF5ZWRPYmplY3QoRE9NRGF0YSosIHZvaWQqIG9iamVjdCk7Ci0K ICAgICAgICAgRE9NRGF0YSogZG9tRGF0YSgpIGNvbnN0IHsgcmV0dXJuIG1fZG9tRGF0YTsgfQog CiAgICAgICAgIHZvaWQqIGdldERPTVdyYXBwZXJNYXAoRE9NV3JhcHBlck1hcFR5cGUpOwogCiAg ICAgICAgIERPTU5vZGVNYXBwaW5nJiBkb21Ob2RlTWFwKCkgeyByZXR1cm4gKm1fZG9tTm9kZU1h cDsgfQotICAgICAgICBJbnRlcm5hbERPTVdyYXBwZXJNYXA8dm9pZD4mIGRvbU9iamVjdE1hcCgp IHsgcmV0dXJuICptX2RvbU9iamVjdE1hcDsgfQotICAgICAgICBJbnRlcm5hbERPTVdyYXBwZXJN YXA8dm9pZD4mIGFjdGl2ZURvbU9iamVjdE1hcCgpIHsgcmV0dXJuICptX2FjdGl2ZURvbU9iamVj dE1hcDsgfQorICAgICAgICBET01XcmFwcGVyTWFwPHZvaWQ+JiBkb21PYmplY3RNYXAoKSB7IHJl dHVybiAqbV9kb21PYmplY3RNYXA7IH0KKyAgICAgICAgRE9NV3JhcHBlck1hcDx2b2lkPiYgYWN0 aXZlRG9tT2JqZWN0TWFwKCkgeyByZXR1cm4gKm1fYWN0aXZlRG9tT2JqZWN0TWFwOyB9CiAjaWYg RU5BQkxFKFNWRykKLSAgICAgICAgSW50ZXJuYWxET01XcmFwcGVyTWFwPFNWR0VsZW1lbnRJbnN0 YW5jZT4mIGRvbVN2Z0VsZW1lbnRJbnN0YW5jZU1hcCgpIHsgcmV0dXJuICptX2RvbVN2Z0VsZW1l bnRJbnN0YW5jZU1hcDsgfQotICAgICAgICBJbnRlcm5hbERPTVdyYXBwZXJNYXA8dm9pZD4mIGRv bVN2Z09iamVjdFdpdGhDb250ZXh0TWFwKCkgeyByZXR1cm4gKm1fZG9tU3ZnT2JqZWN0V2l0aENv bnRleHRNYXA7IH0KKyAgICAgICAgRE9NV3JhcHBlck1hcDxTVkdFbGVtZW50SW5zdGFuY2U+JiBk b21TdmdFbGVtZW50SW5zdGFuY2VNYXAoKSB7IHJldHVybiAqbV9kb21TdmdFbGVtZW50SW5zdGFu Y2VNYXA7IH0KKyAgICAgICAgRE9NV3JhcHBlck1hcDx2b2lkPiYgZG9tU3ZnT2JqZWN0V2l0aENv bnRleHRNYXAoKSB7IHJldHVybiAqbV9kb21TdmdPYmplY3RXaXRoQ29udGV4dE1hcDsgfQogI2Vu ZGlmCiAKICAgICAgICAgLy8gTmVlZCBieSBWOEdDQ29udHJvbGxlci4KQEAgLTI4NywxMSArMjY3 LDExIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICNlbmRpZgogICAgICAgICAKICAgICAgICAgRE9N Tm9kZU1hcHBpbmcqIG1fZG9tTm9kZU1hcDsKLSAgICAgICAgSW50ZXJuYWxET01XcmFwcGVyTWFw PHZvaWQ+KiBtX2RvbU9iamVjdE1hcDsKLSAgICAgICAgSW50ZXJuYWxET01XcmFwcGVyTWFwPHZv aWQ+KiBtX2FjdGl2ZURvbU9iamVjdE1hcDsKKyAgICAgICAgRE9NV3JhcHBlck1hcDx2b2lkPiog bV9kb21PYmplY3RNYXA7CisgICAgICAgIERPTVdyYXBwZXJNYXA8dm9pZD4qIG1fYWN0aXZlRG9t T2JqZWN0TWFwOwogI2lmIEVOQUJMRShTVkcpCi0gICAgICAgIEludGVybmFsRE9NV3JhcHBlck1h cDxTVkdFbGVtZW50SW5zdGFuY2U+KiBtX2RvbVN2Z0VsZW1lbnRJbnN0YW5jZU1hcDsKLSAgICAg ICAgSW50ZXJuYWxET01XcmFwcGVyTWFwPHZvaWQ+KiBtX2RvbVN2Z09iamVjdFdpdGhDb250ZXh0 TWFwOworICAgICAgICBET01XcmFwcGVyTWFwPFNWR0VsZW1lbnRJbnN0YW5jZT4qIG1fZG9tU3Zn RWxlbWVudEluc3RhbmNlTWFwOworICAgICAgICBET01XcmFwcGVyTWFwPHZvaWQ+KiBtX2RvbVN2 Z09iamVjdFdpdGhDb250ZXh0TWFwOwogI2VuZGlmCiAKICAgICBwcml2YXRlOgpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9iaW5kaW5ncy92OC9TY29wZWRET01EYXRhU3RvcmUuY3BwIGIvV2ViQ29yZS9i aW5kaW5ncy92OC9TY29wZWRET01EYXRhU3RvcmUuY3BwCmluZGV4IDE5Y2Q1NDUuLmRmNGE2M2Eg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NvcGVkRE9NRGF0YVN0b3JlLmNwcAor KysgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Njb3BlZERPTURhdGFTdG9yZS5jcHAKQEAgLTM2LDEy ICszNiwxMiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiBTY29wZWRET01EYXRhU3RvcmU6OlNjb3Bl ZERPTURhdGFTdG9yZShET01EYXRhKiBkb21EYXRhKQogICAgIDogRE9NRGF0YVN0b3JlKGRvbURh dGEpCiB7Ci0gICAgbV9kb21Ob2RlTWFwID0gbmV3IEludGVybmFsRE9NV3JhcHBlck1hcDxOb2Rl Pihkb21EYXRhLCAmRE9NRGF0YVN0b3JlOjp3ZWFrTm9kZUNhbGxiYWNrKTsKLSAgICBtX2RvbU9i amVjdE1hcCA9IG5ldyBJbnRlcm5hbERPTVdyYXBwZXJNYXA8dm9pZD4oZG9tRGF0YSwgJkRPTURh dGFTdG9yZTo6d2Vha0RPTU9iamVjdENhbGxiYWNrKTsKLSAgICBtX2FjdGl2ZURvbU9iamVjdE1h cCA9IG5ldyBJbnRlcm5hbERPTVdyYXBwZXJNYXA8dm9pZD4oZG9tRGF0YSwgJkRPTURhdGFTdG9y ZTo6d2Vha0FjdGl2ZURPTU9iamVjdENhbGxiYWNrKTsKKyAgICBtX2RvbU5vZGVNYXAgPSBuZXcg RE9NV3JhcHBlck1hcDxOb2RlPigmRE9NRGF0YVN0b3JlOjp3ZWFrTm9kZUNhbGxiYWNrKTsKKyAg ICBtX2RvbU9iamVjdE1hcCA9IG5ldyBET01XcmFwcGVyTWFwPHZvaWQ+KCZET01EYXRhU3RvcmU6 OndlYWtET01PYmplY3RDYWxsYmFjayk7CisgICAgbV9hY3RpdmVEb21PYmplY3RNYXAgPSBuZXcg RE9NV3JhcHBlck1hcDx2b2lkPigmRE9NRGF0YVN0b3JlOjp3ZWFrQWN0aXZlRE9NT2JqZWN0Q2Fs bGJhY2spOwogI2lmIEVOQUJMRShTVkcpCi0gICAgbV9kb21TdmdFbGVtZW50SW5zdGFuY2VNYXAg PSBuZXcgSW50ZXJuYWxET01XcmFwcGVyTWFwPFNWR0VsZW1lbnRJbnN0YW5jZT4oZG9tRGF0YSwg JkRPTURhdGFTdG9yZTo6d2Vha1NWR0VsZW1lbnRJbnN0YW5jZUNhbGxiYWNrKTsKLSAgICBtX2Rv bVN2Z09iamVjdFdpdGhDb250ZXh0TWFwID0gbmV3IEludGVybmFsRE9NV3JhcHBlck1hcDx2b2lk Pihkb21EYXRhLCAmRE9NRGF0YVN0b3JlOjp3ZWFrU1ZHT2JqZWN0V2l0aENvbnRleHRDYWxsYmFj ayk7CisgICAgbV9kb21TdmdFbGVtZW50SW5zdGFuY2VNYXAgPSBuZXcgRE9NV3JhcHBlck1hcDxT VkdFbGVtZW50SW5zdGFuY2U+KCZET01EYXRhU3RvcmU6OndlYWtTVkdFbGVtZW50SW5zdGFuY2VD YWxsYmFjayk7CisgICAgbV9kb21TdmdPYmplY3RXaXRoQ29udGV4dE1hcCA9IG5ldyBET01XcmFw cGVyTWFwPHZvaWQ+KCZET01EYXRhU3RvcmU6OndlYWtTVkdPYmplY3RXaXRoQ29udGV4dENhbGxi YWNrKTsKICNlbmRpZgogfQogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1N0YXRp Y0RPTURhdGFTdG9yZS5jcHAgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L1N0YXRpY0RPTURhdGFTdG9y ZS5jcHAKaW5kZXggNzIyMDUxYi4uMGIwZDUzMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5n cy92OC9TdGF0aWNET01EYXRhU3RvcmUuY3BwCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvdjgvU3Rh dGljRE9NRGF0YVN0b3JlLmNwcApAQCAtMzYsMTEgKzM2LDExIEBAIG5hbWVzcGFjZSBXZWJDb3Jl IHsKIFN0YXRpY0RPTURhdGFTdG9yZTo6U3RhdGljRE9NRGF0YVN0b3JlKERPTURhdGEqIGRvbURh dGEpCiAgICAgOiBET01EYXRhU3RvcmUoZG9tRGF0YSkKICAgICAsIG1fc3RhdGljRG9tTm9kZU1h cCgmRE9NRGF0YVN0b3JlOjp3ZWFrTm9kZUNhbGxiYWNrKQotICAgICwgbV9zdGF0aWNEb21PYmpl Y3RNYXAoZG9tRGF0YSwgJkRPTURhdGFTdG9yZTo6d2Vha0RPTU9iamVjdENhbGxiYWNrKQotICAg ICwgbV9zdGF0aWNBY3RpdmVEb21PYmplY3RNYXAoZG9tRGF0YSwgJkRPTURhdGFTdG9yZTo6d2Vh a0FjdGl2ZURPTU9iamVjdENhbGxiYWNrKQorICAgICwgbV9zdGF0aWNEb21PYmplY3RNYXAoJkRP TURhdGFTdG9yZTo6d2Vha0RPTU9iamVjdENhbGxiYWNrKQorICAgICwgbV9zdGF0aWNBY3RpdmVE b21PYmplY3RNYXAoJkRPTURhdGFTdG9yZTo6d2Vha0FjdGl2ZURPTU9iamVjdENhbGxiYWNrKQog I2lmIEVOQUJMRShTVkcpCi0gICAgLCBtX3N0YXRpY0RvbVN2Z0VsZW1lbnRJbnN0YW5jZU1hcChk b21EYXRhLCAmRE9NRGF0YVN0b3JlOjp3ZWFrU1ZHRWxlbWVudEluc3RhbmNlQ2FsbGJhY2spCi0g ICAgLCBtX3N0YXRpY0RvbVN2Z09iamVjdFdpdGhDb250ZXh0TWFwKGRvbURhdGEsICZET01EYXRh U3RvcmU6OndlYWtTVkdPYmplY3RXaXRoQ29udGV4dENhbGxiYWNrKQorICAgICwgbV9zdGF0aWNE b21TdmdFbGVtZW50SW5zdGFuY2VNYXAoJkRPTURhdGFTdG9yZTo6d2Vha1NWR0VsZW1lbnRJbnN0 YW5jZUNhbGxiYWNrKQorICAgICwgbV9zdGF0aWNEb21TdmdPYmplY3RXaXRoQ29udGV4dE1hcCgm RE9NRGF0YVN0b3JlOjp3ZWFrU1ZHT2JqZWN0V2l0aENvbnRleHRDYWxsYmFjaykKICNlbmRpZgog ewogICAgIG1fZG9tTm9kZU1hcCA9ICZtX3N0YXRpY0RvbU5vZGVNYXA7CmRpZmYgLS1naXQgYS9X ZWJDb3JlL2JpbmRpbmdzL3Y4L1N0YXRpY0RPTURhdGFTdG9yZS5oIGIvV2ViQ29yZS9iaW5kaW5n cy92OC9TdGF0aWNET01EYXRhU3RvcmUuaAppbmRleCA2NGE5MGUwLi5kMWU1YTMwIDEwMDY0NAot LS0gYS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1N0YXRpY0RPTURhdGFTdG9yZS5oCisrKyBiL1dlYkNv cmUvYmluZGluZ3MvdjgvU3RhdGljRE9NRGF0YVN0b3JlLmgKQEAgLTQ5LDExICs0OSwxMSBAQCBw dWJsaWM6CiAKIHByaXZhdGU6CiAgICAgSW50cnVzaXZlRE9NV3JhcHBlck1hcCBtX3N0YXRpY0Rv bU5vZGVNYXA7Ci0gICAgSW50ZXJuYWxET01XcmFwcGVyTWFwPHZvaWQ+IG1fc3RhdGljRG9tT2Jq ZWN0TWFwOwotICAgIEludGVybmFsRE9NV3JhcHBlck1hcDx2b2lkPiBtX3N0YXRpY0FjdGl2ZURv bU9iamVjdE1hcDsKKyAgICBET01XcmFwcGVyTWFwPHZvaWQ+IG1fc3RhdGljRG9tT2JqZWN0TWFw OworICAgIERPTVdyYXBwZXJNYXA8dm9pZD4gbV9zdGF0aWNBY3RpdmVEb21PYmplY3RNYXA7CiAj aWYgRU5BQkxFKFNWRykKLSAgICBJbnRlcm5hbERPTVdyYXBwZXJNYXA8U1ZHRWxlbWVudEluc3Rh bmNlPiBtX3N0YXRpY0RvbVN2Z0VsZW1lbnRJbnN0YW5jZU1hcDsKLSAgICBJbnRlcm5hbERPTVdy YXBwZXJNYXA8dm9pZD4gbV9zdGF0aWNEb21TdmdPYmplY3RXaXRoQ29udGV4dE1hcDsKKyAgICBE T01XcmFwcGVyTWFwPFNWR0VsZW1lbnRJbnN0YW5jZT4gbV9zdGF0aWNEb21TdmdFbGVtZW50SW5z dGFuY2VNYXA7CisgICAgRE9NV3JhcHBlck1hcDx2b2lkPiBtX3N0YXRpY0RvbVN2Z09iamVjdFdp dGhDb250ZXh0TWFwOwogI2VuZGlmCiB9OwogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdz L3Y4L1Y4RE9NTWFwLmNwcCBiL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01NYXAuY3BwCmluZGV4 IDNjNWU5MmMuLmI0NzhkMDYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01N YXAuY3BwCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01NYXAuY3BwCkBAIC05NCwxMyAr OTQsMTAgQEAgRE9NV3JhcHBlck1hcDx2b2lkPiYgZ2V0RE9NU1ZHT2JqZWN0V2l0aENvbnRleHRN YXAoKQogCiAjZW5kaWYgLy8gRU5BQkxFKFNWRykKIAotc3RhdGljIHZvaWQgcmVtb3ZlQWxsRE9N T2JqZWN0c0luQ3VycmVudFRocmVhZEhlbHBlcigpCit2b2lkIHJlbW92ZUFsbERPTU9iamVjdHNJ bkN1cnJlbnRUaHJlYWQoKQogewogICAgIHY4OjpIYW5kbGVTY29wZSBzY29wZTsKIAotICAgIC8v IERlcmVmIGFsbCBvYmplY3RzIGluIHRoZSBkZWxheWVkIHF1ZXVlLgotICAgIERPTURhdGE6Omdl dEN1cnJlbnQoKS0+ZGVyZWZEZWxheWVkT2JqZWN0cygpOwotCiAgICAgLy8gVGhlIERPTSBvYmpl Y3RzIHdpdGggdGhlIGZvbGxvd2luZyB0eXBlcyBvbmx5IGV4aXN0IG9uIHRoZSBtYWluIHRocmVh ZC4KICAgICBpZiAoV1RGOjppc01haW5UaHJlYWQoKSkgewogICAgICAgICAvLyBSZW1vdmUgYWxs IERPTSBub2Rlcy4KQEAgLTEyMiwxNyArMTE5LDYgQEAgc3RhdGljIHZvaWQgcmVtb3ZlQWxsRE9N T2JqZWN0c0luQ3VycmVudFRocmVhZEhlbHBlcigpCiAgICAgRE9NRGF0YTo6cmVtb3ZlT2JqZWN0 c0Zyb21XcmFwcGVyTWFwPHZvaWQ+KGdldEFjdGl2ZURPTU9iamVjdE1hcCgpKTsKIH0KIAotdm9p ZCByZW1vdmVBbGxET01PYmplY3RzSW5DdXJyZW50VGhyZWFkKCkKLXsKLSAgICAvLyBVc2UgdGhl IGxvY2tlciBvbmx5IGlmIGl0IGhhcyBhbHJlYWR5IGJlZW4gaW52b2tlZCBiZWZvcmUsIGFzIGJ5 IHdvcmtlciB0aHJlYWQuCi0gICAgaWYgKHY4OjpMb2NrZXI6OklzQWN0aXZlKCkpIHsKLSAgICAg ICAgdjg6OkxvY2tlciBsb2NrZXI7Ci0gICAgICAgIHJlbW92ZUFsbERPTU9iamVjdHNJbkN1cnJl bnRUaHJlYWRIZWxwZXIoKTsKLSAgICB9IGVsc2UKLSAgICAgICAgcmVtb3ZlQWxsRE9NT2JqZWN0 c0luQ3VycmVudFRocmVhZEhlbHBlcigpOwotfQotCi0KIHZvaWQgdmlzaXRET01Ob2Rlc0luQ3Vy cmVudFRocmVhZChET01XcmFwcGVyTWFwPE5vZGU+OjpWaXNpdG9yKiB2aXNpdG9yKQogewogICAg IHY4OjpIYW5kbGVTY29wZSBzY29wZTsK