113925 2013-04-04 00:17:17 -0700 Simplified bytecode generation by merging prefix and postfix nodes 2013-04-04 11:29:55 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ggaren ggaren oldest_to_newest 869039 0 ggaren 2013-04-04 00:17:17 -0700 Simplified bytecode generation by merging prefix and postfix nodes 869040 1 196447 ggaren 2013-04-04 00:19:26 -0700 Created attachment 196447 Patch 869254 2 ggaren 2013-04-04 11:29:55 -0700 Committed r147658: <http://trac.webkit.org/changeset/147658> 196447 2013-04-04 00:19:26 -0700 2013-04-04 00:27:34 -0700 Patch bug-113925-20130404001916.patch text/plain 9444 ggaren SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTQ3NjEyKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBA CisyMDEzLTA0LTA0ICBHZW9mZnJleSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CisKKyAgICAg ICAgU2ltcGxpZmllZCBieXRlY29kZSBnZW5lcmF0aW9uIGJ5IG1lcmdpbmcgcHJlZml4IGFuZCBw b3N0Zml4IG5vZGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMTM5MjUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBQb3N0Zml4Tm9kZSBub3cgaW5oZXJpdHMgZnJvbSBQcmVmaXhOb2RlLCBzbyB3aGVuIHdl IGRldGVjdCB0aGF0IHdlJ3JlCisgICAgICAgIGluIGEgY29udGV4dCB3aGVyZSBwb3N0aWZ4IGFu ZCBwcmVmaXggYXJlIGVxdWl2YWxlbnQsIFBvc3RGaXhOb2RlIGNhbgorICAgICAgICBqdXN0IGNh bGwgdGhyb3VnaCB0byBQcmVmaXhOb2RlIGNvZGVnZW4sIGluc3RlYWQgb2YgZHVwbGljYXRpbmcg dGhlCisgICAgICAgIGxvZ2ljLgorCisgICAgICAgICogYnl0ZWNvbXBpbGVyL05vZGVzQ29kZWdl bi5jcHA6CisgICAgICAgIChKU0M6OlBvc3RmaXhOb2RlOjplbWl0UmVzb2x2ZSk6CisgICAgICAg IChKU0M6OlBvc3RmaXhOb2RlOjplbWl0QnJhY2tldCk6CisgICAgICAgIChKU0M6OlBvc3RmaXhO b2RlOjplbWl0RG90KToKKyAgICAgICAgKiBwYXJzZXIvTm9kZUNvbnN0cnVjdG9ycy5oOgorICAg ICAgICAoSlNDOjpQb3N0Zml4Tm9kZTo6UG9zdGZpeE5vZGUpOgorICAgICAgICAqIHBhcnNlci9O b2Rlcy5oOgorICAgICAgICAoSlNDKToKKyAgICAgICAgKFByZWZpeE5vZGUpOgorICAgICAgICAo UG9zdGZpeE5vZGUpOgorCiAyMDEzLTA0LTAyICBNYXJrIEhhaG5lbmJlcmcgIDxtaGFobmVuYmVy Z0BhcHBsZS5jb20+CiAKICAgICAgICAgZ2V0X2J5X3BuYW1lIGNhbiBiZWNvbWUgY29uZnVzZWQg d2hlbiBpdGVyYXRpbmcgb3ZlciBvYmplY3RzIHdpdGggc3RhdGljIHByb3BlcnRpZXMKSW5kZXg6 IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvTm9kZXNDb2RlZ2VuLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVyL05vZGVzQ29kZWdl bi5jcHAJKHJldmlzaW9uIDE0NzYxMikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29t cGlsZXIvTm9kZXNDb2RlZ2VuLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjI0LDYgKzYyNCw5IEBA IHN0YXRpYyBSZWdpc3RlcklEKiBlbWl0UG9zdEluY09yRGVjKEJ5dGUKIAogUmVnaXN0ZXJJRCog UG9zdGZpeE5vZGU6OmVtaXRSZXNvbHZlKEJ5dGVjb2RlR2VuZXJhdG9yJiBnZW5lcmF0b3IsIFJl Z2lzdGVySUQqIGRzdCkKIHsKKyAgICBpZiAoZHN0ID09IGdlbmVyYXRvci5pZ25vcmVkUmVzdWx0 KCkpCisgICAgICAgIHJldHVybiBQcmVmaXhOb2RlOjplbWl0UmVzb2x2ZShnZW5lcmF0b3IsIGRz dCk7CisKICAgICBBU1NFUlQobV9leHByLT5pc1Jlc29sdmVOb2RlKCkpOwogICAgIFJlc29sdmVO b2RlKiByZXNvbHZlID0gc3RhdGljX2Nhc3Q8UmVzb2x2ZU5vZGUqPihtX2V4cHIpOwogICAgIGNv bnN0IElkZW50aWZpZXImIGlkZW50ID0gcmVzb2x2ZS0+aWRlbnRpZmllcigpOwpAQCAtNjM1LDM5 ICs2MzgsMzAgQEAgUmVnaXN0ZXJJRCogUG9zdGZpeE5vZGU6OmVtaXRSZXNvbHZlKEJ5dAogICAg ICAgICAgICAgZ2VuZXJhdG9yLmVtaXRSZWFkT25seUV4Y2VwdGlvbklmTmVlZGVkKCk7CiAgICAg ICAgICAgICByZXR1cm4gZ2VuZXJhdG9yLmVtaXRUb0pTTnVtYmVyKGdlbmVyYXRvci5maW5hbERl c3RpbmF0aW9uKGRzdCksIGxvY2FsKTsKICAgICAgICAgfQotICAgICAgICBpZiAoZHN0ID09IGdl bmVyYXRvci5pZ25vcmVkUmVzdWx0KCkpCi0gICAgICAgICAgICByZXR1cm4gZW1pdFByZUluY09y RGVjKGdlbmVyYXRvciwgbG9jYWwsIG1fb3BlcmF0b3IpOwogICAgICAgICByZXR1cm4gZW1pdFBv c3RJbmNPckRlYyhnZW5lcmF0b3IsIGdlbmVyYXRvci5maW5hbERlc3RpbmF0aW9uKGRzdCksIGxv Y2FsLCBtX29wZXJhdG9yKTsKICAgICB9CiAKICAgICBpZiAocmVzb2x2ZVJlc3VsdC5pc1N0YXRp YygpICYmICFyZXNvbHZlUmVzdWx0LmlzUmVhZE9ubHkoKSkgewogICAgICAgICBSZWZQdHI8UmVn aXN0ZXJJRD4gdmFsdWUgPSBnZW5lcmF0b3IuZW1pdEdldFN0YXRpY1ZhcihnZW5lcmF0b3IubmV3 VGVtcG9yYXJ5KCksIHJlc29sdmVSZXN1bHQsIGlkZW50KTsKLSAgICAgICAgUmVnaXN0ZXJJRCog b2xkVmFsdWU7Ci0gICAgICAgIGlmIChkc3QgPT0gZ2VuZXJhdG9yLmlnbm9yZWRSZXN1bHQoKSkg ewotICAgICAgICAgICAgb2xkVmFsdWUgPSAwOwotICAgICAgICAgICAgZW1pdFByZUluY09yRGVj KGdlbmVyYXRvciwgdmFsdWUuZ2V0KCksIG1fb3BlcmF0b3IpOwotICAgICAgICB9IGVsc2UKLSAg ICAgICAgICAgIG9sZFZhbHVlID0gZW1pdFBvc3RJbmNPckRlYyhnZW5lcmF0b3IsIGdlbmVyYXRv ci5maW5hbERlc3RpbmF0aW9uKGRzdCksIHZhbHVlLmdldCgpLCBtX29wZXJhdG9yKTsKKyAgICAg ICAgUmVmUHRyPFJlZ2lzdGVySUQ+IG9sZFZhbHVlID0gZW1pdFBvc3RJbmNPckRlYyhnZW5lcmF0 b3IsIGdlbmVyYXRvci5maW5hbERlc3RpbmF0aW9uKGRzdCksIHZhbHVlLmdldCgpLCBtX29wZXJh dG9yKTsKICAgICAgICAgZ2VuZXJhdG9yLmVtaXRQdXRTdGF0aWNWYXIocmVzb2x2ZVJlc3VsdCwg aWRlbnQsIHZhbHVlLmdldCgpKTsKLSAgICAgICAgcmV0dXJuIG9sZFZhbHVlOworICAgICAgICBy ZXR1cm4gb2xkVmFsdWUuZ2V0KCk7CiAgICAgfQogCiAgICAgZ2VuZXJhdG9yLmVtaXRFeHByZXNz aW9uSW5mbyhkaXZvdCgpLCBzdGFydE9mZnNldCgpLCBlbmRPZmZzZXQoKSk7CiAgICAgUmVmUHRy PFJlZ2lzdGVySUQ+IHZhbHVlID0gZ2VuZXJhdG9yLm5ld1RlbXBvcmFyeSgpOwogICAgIE5vbmxv Y2FsUmVzb2x2ZUluZm8gcmVzb2x2ZUluZm87CiAgICAgUmVmUHRyPFJlZ2lzdGVySUQ+IGJhc2Ug PSBnZW5lcmF0b3IuZW1pdFJlc29sdmVXaXRoQmFzZUZvclB1dChnZW5lcmF0b3IubmV3VGVtcG9y YXJ5KCksIHZhbHVlLmdldCgpLCByZXNvbHZlUmVzdWx0LCBpZGVudCwgcmVzb2x2ZUluZm8pOwot ICAgIFJlZ2lzdGVySUQqIG9sZFZhbHVlOwotICAgIGlmIChkc3QgPT0gZ2VuZXJhdG9yLmlnbm9y ZWRSZXN1bHQoKSkgewotICAgICAgICBvbGRWYWx1ZSA9IDA7Ci0gICAgICAgIGVtaXRQcmVJbmNP ckRlYyhnZW5lcmF0b3IsIHZhbHVlLmdldCgpLCBtX29wZXJhdG9yKTsKLSAgICB9IGVsc2UKLSAg ICAgICAgb2xkVmFsdWUgPSBlbWl0UG9zdEluY09yRGVjKGdlbmVyYXRvciwgZ2VuZXJhdG9yLmZp bmFsRGVzdGluYXRpb24oZHN0KSwgdmFsdWUuZ2V0KCksIG1fb3BlcmF0b3IpOworICAgIFJlZlB0 cjxSZWdpc3RlcklEPiBvbGRWYWx1ZSA9IGVtaXRQb3N0SW5jT3JEZWMoZ2VuZXJhdG9yLCBnZW5l cmF0b3IuZmluYWxEZXN0aW5hdGlvbihkc3QpLCB2YWx1ZS5nZXQoKSwgbV9vcGVyYXRvcik7CiAg ICAgZ2VuZXJhdG9yLmVtaXRQdXRUb0Jhc2UoYmFzZS5nZXQoKSwgaWRlbnQsIHZhbHVlLmdldCgp LCByZXNvbHZlSW5mbyk7Ci0gICAgcmV0dXJuIG9sZFZhbHVlOworICAgIHJldHVybiBvbGRWYWx1 ZS5nZXQoKTsKIH0KIAogUmVnaXN0ZXJJRCogUG9zdGZpeE5vZGU6OmVtaXRCcmFja2V0KEJ5dGVj b2RlR2VuZXJhdG9yJiBnZW5lcmF0b3IsIFJlZ2lzdGVySUQqIGRzdCkKIHsKKyAgICBpZiAoZHN0 ID09IGdlbmVyYXRvci5pZ25vcmVkUmVzdWx0KCkpCisgICAgICAgIHJldHVybiBQcmVmaXhOb2Rl OjplbWl0QnJhY2tldChnZW5lcmF0b3IsIGRzdCk7CisKICAgICBBU1NFUlQobV9leHByLT5pc0Jy YWNrZXRBY2Nlc3Nvck5vZGUoKSk7CiAgICAgQnJhY2tldEFjY2Vzc29yTm9kZSogYnJhY2tldEFj Y2Vzc29yID0gc3RhdGljX2Nhc3Q8QnJhY2tldEFjY2Vzc29yTm9kZSo+KG1fZXhwcik7CiAgICAg RXhwcmVzc2lvbk5vZGUqIGJhc2VOb2RlID0gYnJhY2tldEFjY2Vzc29yLT5iYXNlKCk7CkBAIC02 NzgsMTIgKzY3Miw2IEBAIFJlZ2lzdGVySUQqIFBvc3RmaXhOb2RlOjplbWl0QnJhY2tldChCeXQK IAogICAgIGdlbmVyYXRvci5lbWl0RXhwcmVzc2lvbkluZm8oYnJhY2tldEFjY2Vzc29yLT5kaXZv dCgpLCBicmFja2V0QWNjZXNzb3ItPnN0YXJ0T2Zmc2V0KCksIGJyYWNrZXRBY2Nlc3Nvci0+ZW5k T2Zmc2V0KCkpOwogICAgIFJlZlB0cjxSZWdpc3RlcklEPiB2YWx1ZSA9IGdlbmVyYXRvci5lbWl0 R2V0QnlWYWwoZ2VuZXJhdG9yLm5ld1RlbXBvcmFyeSgpLCBiYXNlLmdldCgpLCBwcm9wZXJ0eS5n ZXQoKSk7Ci0gICAgaWYgKGRzdCA9PSBnZW5lcmF0b3IuaWdub3JlZFJlc3VsdCgpKSB7Ci0gICAg ICAgIGVtaXRQcmVJbmNPckRlYyhnZW5lcmF0b3IsIHZhbHVlLmdldCgpLCBtX29wZXJhdG9yKTsK LSAgICAgICAgZ2VuZXJhdG9yLmVtaXRFeHByZXNzaW9uSW5mbyhkaXZvdCgpLCBzdGFydE9mZnNl dCgpLCBlbmRPZmZzZXQoKSk7Ci0gICAgICAgIGdlbmVyYXRvci5lbWl0UHV0QnlWYWwoYmFzZS5n ZXQoKSwgcHJvcGVydHkuZ2V0KCksIHZhbHVlLmdldCgpKTsKLSAgICAgICAgcmV0dXJuIDA7Ci0g ICAgfQogICAgIFJlZ2lzdGVySUQqIG9sZFZhbHVlID0gZW1pdFBvc3RJbmNPckRlYyhnZW5lcmF0 b3IsIGdlbmVyYXRvci50ZW1wRGVzdGluYXRpb24oZHN0KSwgdmFsdWUuZ2V0KCksIG1fb3BlcmF0 b3IpOwogICAgIGdlbmVyYXRvci5lbWl0RXhwcmVzc2lvbkluZm8oZGl2b3QoKSwgc3RhcnRPZmZz ZXQoKSwgZW5kT2Zmc2V0KCkpOwogICAgIGdlbmVyYXRvci5lbWl0UHV0QnlWYWwoYmFzZS5nZXQo KSwgcHJvcGVydHkuZ2V0KCksIHZhbHVlLmdldCgpKTsKQEAgLTY5Miw2ICs2ODAsOSBAQCBSZWdp c3RlcklEKiBQb3N0Zml4Tm9kZTo6ZW1pdEJyYWNrZXQoQnl0CiAKIFJlZ2lzdGVySUQqIFBvc3Rm aXhOb2RlOjplbWl0RG90KEJ5dGVjb2RlR2VuZXJhdG9yJiBnZW5lcmF0b3IsIFJlZ2lzdGVySUQq IGRzdCkKIHsKKyAgICBpZiAoZHN0ID09IGdlbmVyYXRvci5pZ25vcmVkUmVzdWx0KCkpCisgICAg ICAgIHJldHVybiBQcmVmaXhOb2RlOjplbWl0RG90KGdlbmVyYXRvciwgZHN0KTsKKwogICAgIEFT U0VSVChtX2V4cHItPmlzRG90QWNjZXNzb3JOb2RlKCkpOwogICAgIERvdEFjY2Vzc29yTm9kZSog ZG90QWNjZXNzb3IgPSBzdGF0aWNfY2FzdDxEb3RBY2Nlc3Nvck5vZGUqPihtX2V4cHIpOwogICAg IEV4cHJlc3Npb25Ob2RlKiBiYXNlTm9kZSA9IGRvdEFjY2Vzc29yLT5iYXNlKCk7CkBAIC03MDEs MTIgKzY5Miw2IEBAIFJlZ2lzdGVySUQqIFBvc3RmaXhOb2RlOjplbWl0RG90KEJ5dGVjb2QKIAog ICAgIGdlbmVyYXRvci5lbWl0RXhwcmVzc2lvbkluZm8oZG90QWNjZXNzb3ItPmRpdm90KCksIGRv dEFjY2Vzc29yLT5zdGFydE9mZnNldCgpLCBkb3RBY2Nlc3Nvci0+ZW5kT2Zmc2V0KCkpOwogICAg IFJlZlB0cjxSZWdpc3RlcklEPiB2YWx1ZSA9IGdlbmVyYXRvci5lbWl0R2V0QnlJZChnZW5lcmF0 b3IubmV3VGVtcG9yYXJ5KCksIGJhc2UuZ2V0KCksIGlkZW50KTsKLSAgICBpZiAoZHN0ID09IGdl bmVyYXRvci5pZ25vcmVkUmVzdWx0KCkpIHsKLSAgICAgICAgZW1pdFByZUluY09yRGVjKGdlbmVy YXRvciwgdmFsdWUuZ2V0KCksIG1fb3BlcmF0b3IpOwotICAgICAgICBnZW5lcmF0b3IuZW1pdEV4 cHJlc3Npb25JbmZvKGRpdm90KCksIHN0YXJ0T2Zmc2V0KCksIGVuZE9mZnNldCgpKTsKLSAgICAg ICAgZ2VuZXJhdG9yLmVtaXRQdXRCeUlkKGJhc2UuZ2V0KCksIGlkZW50LCB2YWx1ZS5nZXQoKSk7 Ci0gICAgICAgIHJldHVybiAwOwotICAgIH0KICAgICBSZWdpc3RlcklEKiBvbGRWYWx1ZSA9IGVt aXRQb3N0SW5jT3JEZWMoZ2VuZXJhdG9yLCBnZW5lcmF0b3IudGVtcERlc3RpbmF0aW9uKGRzdCks IHZhbHVlLmdldCgpLCBtX29wZXJhdG9yKTsKICAgICBnZW5lcmF0b3IuZW1pdEV4cHJlc3Npb25J bmZvKGRpdm90KCksIHN0YXJ0T2Zmc2V0KCksIGVuZE9mZnNldCgpKTsKICAgICBnZW5lcmF0b3Iu ZW1pdFB1dEJ5SWQoYmFzZS5nZXQoKSwgaWRlbnQsIHZhbHVlLmdldCgpKTsKSW5kZXg6IFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvTm9kZUNvbnN0cnVjdG9ycy5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvTm9kZUNvbnN0cnVjdG9ycy5oCShyZXZpc2lv biAxNDc2MTIpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL05vZGVDb25zdHJ1Y3Rv cnMuaAkod29ya2luZyBjb3B5KQpAQCAtMjg4LDEwICsyODgsNyBAQCBuYW1lc3BhY2UgSlNDIHsK ICAgICB9CiAKICAgICBpbmxpbmUgUG9zdGZpeE5vZGU6OlBvc3RmaXhOb2RlKGNvbnN0IEpTVG9r ZW5Mb2NhdGlvbiYgbG9jYXRpb24sIEV4cHJlc3Npb25Ob2RlKiBleHByLCBPcGVyYXRvciBvcGVy LCB1bnNpZ25lZCBkaXZvdCwgdW5zaWduZWQgc3RhcnRPZmZzZXQsIHVuc2lnbmVkIGVuZE9mZnNl dCkKLSAgICAgICAgOiBFeHByZXNzaW9uTm9kZShsb2NhdGlvbikKLSAgICAgICAgLCBUaHJvd2Fi bGVFeHByZXNzaW9uRGF0YShkaXZvdCwgc3RhcnRPZmZzZXQsIGVuZE9mZnNldCkKLSAgICAgICAg LCBtX2V4cHIoZXhwcikKLSAgICAgICAgLCBtX29wZXJhdG9yKG9wZXIpCisgICAgICAgIDogUHJl Zml4Tm9kZShsb2NhdGlvbiwgZXhwciwgb3BlciwgZGl2b3QsIHN0YXJ0T2Zmc2V0LCBlbmRPZmZz ZXQpCiAgICAgewogICAgIH0KIApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9O b2Rlcy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvTm9kZXMu aAkocmV2aXNpb24gMTQ3NjEyKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9Ob2Rl cy5oCSh3b3JraW5nIGNvcHkpCkBAIC01ODcsMjAgKzU4Nyw2IEBAIG5hbWVzcGFjZSBKU0Mgewog ICAgICAgICB2aXJ0dWFsIFJlZ2lzdGVySUQqIGVtaXRCeXRlY29kZShCeXRlY29kZUdlbmVyYXRv ciYsIFJlZ2lzdGVySUQqID0gMCk7CiAgICAgfTsKIAotICAgIGNsYXNzIFBvc3RmaXhOb2RlIDog cHVibGljIEV4cHJlc3Npb25Ob2RlLCBwdWJsaWMgVGhyb3dhYmxlRXhwcmVzc2lvbkRhdGEgewot ICAgIHB1YmxpYzoKLSAgICAgICAgUG9zdGZpeE5vZGUoY29uc3QgSlNUb2tlbkxvY2F0aW9uJiwg RXhwcmVzc2lvbk5vZGUqLCBPcGVyYXRvciwgdW5zaWduZWQgZGl2b3QsIHVuc2lnbmVkIHN0YXJ0 T2Zmc2V0LCB1bnNpZ25lZCBlbmRPZmZzZXQpOwotCi0gICAgcHJpdmF0ZToKLSAgICAgICAgdmly dHVhbCBSZWdpc3RlcklEKiBlbWl0Qnl0ZWNvZGUoQnl0ZWNvZGVHZW5lcmF0b3ImLCBSZWdpc3Rl cklEKiA9IDApOwotICAgICAgICB2aXJ0dWFsIFJlZ2lzdGVySUQqIGVtaXRSZXNvbHZlKEJ5dGVj b2RlR2VuZXJhdG9yJiwgUmVnaXN0ZXJJRCogPSAwKTsKLSAgICAgICAgdmlydHVhbCBSZWdpc3Rl cklEKiBlbWl0QnJhY2tldChCeXRlY29kZUdlbmVyYXRvciYsIFJlZ2lzdGVySUQqID0gMCk7Ci0g ICAgICAgIHZpcnR1YWwgUmVnaXN0ZXJJRCogZW1pdERvdChCeXRlY29kZUdlbmVyYXRvciYsIFJl Z2lzdGVySUQqID0gMCk7Ci0KLSAgICAgICAgRXhwcmVzc2lvbk5vZGUqIG1fZXhwcjsKLSAgICAg ICAgT3BlcmF0b3IgbV9vcGVyYXRvcjsKLSAgICB9OwotCiAgICAgY2xhc3MgRGVsZXRlUmVzb2x2 ZU5vZGUgOiBwdWJsaWMgRXhwcmVzc2lvbk5vZGUsIHB1YmxpYyBUaHJvd2FibGVFeHByZXNzaW9u RGF0YSB7CiAgICAgcHVibGljOgogICAgICAgICBEZWxldGVSZXNvbHZlTm9kZShjb25zdCBKU1Rv a2VuTG9jYXRpb24mLCBjb25zdCBJZGVudGlmaWVyJiwgdW5zaWduZWQgZGl2b3QsIHVuc2lnbmVk IHN0YXJ0T2Zmc2V0LCB1bnNpZ25lZCBlbmRPZmZzZXQpOwpAQCAtNjc5LDcgKzY2NSw3IEBAIG5h bWVzcGFjZSBKU0MgewogICAgIHB1YmxpYzoKICAgICAgICAgUHJlZml4Tm9kZShjb25zdCBKU1Rv a2VuTG9jYXRpb24mLCBFeHByZXNzaW9uTm9kZSosIE9wZXJhdG9yLCB1bnNpZ25lZCBkaXZvdCwg dW5zaWduZWQgc3RhcnRPZmZzZXQsIHVuc2lnbmVkIGVuZE9mZnNldCk7CiAKLSAgICBwcml2YXRl OgorICAgIHByb3RlY3RlZDoKICAgICAgICAgdmlydHVhbCBSZWdpc3RlcklEKiBlbWl0Qnl0ZWNv ZGUoQnl0ZWNvZGVHZW5lcmF0b3ImLCBSZWdpc3RlcklEKiA9IDApOwogICAgICAgICB2aXJ0dWFs IFJlZ2lzdGVySUQqIGVtaXRSZXNvbHZlKEJ5dGVjb2RlR2VuZXJhdG9yJiwgUmVnaXN0ZXJJRCog PSAwKTsKICAgICAgICAgdmlydHVhbCBSZWdpc3RlcklEKiBlbWl0QnJhY2tldChCeXRlY29kZUdl bmVyYXRvciYsIFJlZ2lzdGVySUQqID0gMCk7CkBAIC02ODksNiArNjc1LDE3IEBAIG5hbWVzcGFj ZSBKU0MgewogICAgICAgICBPcGVyYXRvciBtX29wZXJhdG9yOwogICAgIH07CiAKKyAgICBjbGFz cyBQb3N0Zml4Tm9kZSA6IHB1YmxpYyBQcmVmaXhOb2RlIHsKKyAgICBwdWJsaWM6CisgICAgICAg IFBvc3RmaXhOb2RlKGNvbnN0IEpTVG9rZW5Mb2NhdGlvbiYsIEV4cHJlc3Npb25Ob2RlKiwgT3Bl cmF0b3IsIHVuc2lnbmVkIGRpdm90LCB1bnNpZ25lZCBzdGFydE9mZnNldCwgdW5zaWduZWQgZW5k T2Zmc2V0KTsKKworICAgIHByaXZhdGU6CisgICAgICAgIHZpcnR1YWwgUmVnaXN0ZXJJRCogZW1p dEJ5dGVjb2RlKEJ5dGVjb2RlR2VuZXJhdG9yJiwgUmVnaXN0ZXJJRCogPSAwKTsKKyAgICAgICAg dmlydHVhbCBSZWdpc3RlcklEKiBlbWl0UmVzb2x2ZShCeXRlY29kZUdlbmVyYXRvciYsIFJlZ2lz dGVySUQqID0gMCk7CisgICAgICAgIHZpcnR1YWwgUmVnaXN0ZXJJRCogZW1pdEJyYWNrZXQoQnl0 ZWNvZGVHZW5lcmF0b3ImLCBSZWdpc3RlcklEKiA9IDApOworICAgICAgICB2aXJ0dWFsIFJlZ2lz dGVySUQqIGVtaXREb3QoQnl0ZWNvZGVHZW5lcmF0b3ImLCBSZWdpc3RlcklEKiA9IDApOworICAg IH07CisKICAgICBjbGFzcyBVbmFyeU9wTm9kZSA6IHB1YmxpYyBFeHByZXNzaW9uTm9kZSB7CiAg ICAgcHVibGljOgogICAgICAgICBVbmFyeU9wTm9kZShjb25zdCBKU1Rva2VuTG9jYXRpb24mLCBS ZXN1bHRUeXBlLCBFeHByZXNzaW9uTm9kZSosIE9wY29kZUlEKTsK