112059 2013-03-11 13:21:06 -0700 Make SegmentedVector Noncopyable 2013-03-11 14:04:42 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 oliver oliver benjamin cmarcelo ggaren ojan.autocc webkit.review.bot oldest_to_newest 852646 0 oliver 2013-03-11 13:21:06 -0700 Make SegmentedVector Noncopyable 852650 1 192538 oliver 2013-03-11 13:25:06 -0700 Created attachment 192538 Patch 852664 2 192538 ggaren 2013-03-11 13:37:01 -0700 Comment on attachment 192538 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=192538&action=review r=me > Source/JavaScriptCore/bytecompiler/LabelScope.h:79 > + struct LabelScopeRef { Let's make this a class. The idiomatic name for this in WebKit would be "LabelScopePtr". 852666 3 ggaren 2013-03-11 13:37:32 -0700 In future, I think we should just refactor LabelScope to be a true malloc'd, refcounted object, that knows how to notify the byte code generator when it is destroyed. 852703 4 oliver 2013-03-11 14:04:42 -0700 Committed r145401: <http://trac.webkit.org/changeset/145401> 192538 2013-03-11 13:25:06 -0700 2013-03-11 13:37:01 -0700 Patch bug-112059-20130311132106.patch text/plain 11257 oliver U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1Mzc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA5 MTE2YTQ4NzJkNTU3NzJiZWJjYjVhODc2MDZlNDM4ZDlmZjJhOTI2Li4wM2YyNmQzMGNiM2VkM2Zj NjVkNWY4YjYzZDg3NGM0YzNhNmY2Nzk1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzNiBAQAorMjAxMy0wMy0xMSAgT2xpdmVyIEh1bnQgIDxvbGl2ZXJAYXBwbGUuY29tPgor CisgICAgICAgIE1ha2UgU2VnbWVudGVkVmVjdG9yIE5vbmNvcHlhYmxlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTIwNTkKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb3B5aW5nIGEgU2VnbWVudGVkVmVj dG9yIGlzIHZlcnkgZXhwZW5zaXZlLCBhbmQgcmVhbGx5IHNob3VsZG4ndAorICAgICAgICBiZSBu ZWNlc3NhcnkuICBTbyBJJ3ZlIHRha2VuIHRoZSBvbmUgcGxhY2Ugd2hlcmUgd2UgY3VycmVudGx5 IGNvcHkKKyAgICAgICAgYW5kIHJlcGxhY2VkIGl0IHdpdGggYSByZWd1bGFyIFZlY3RvciwgYW5k IHJlcGxhY2VkIHRoZSBhZGRyZXNzCisgICAgICAgIGRlcGVuZGVudCBsb2dpYyB3aXRoIGEgaW5k ZXhpbmcgcmVmIGluc3RlYWQuCisKKyAgICAgICAgKiBieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5l cmF0b3IuY3BwOgorICAgICAgICAoSlNDOjpCeXRlY29kZUdlbmVyYXRvcjo6bmV3TGFiZWxTY29w ZSk6CisgICAgICAgIChKU0M6OkJ5dGVjb2RlR2VuZXJhdG9yOjplbWl0Q29tcGxleEp1bXBTY29w ZXMpOgorICAgICAgICAqIGJ5dGVjb21waWxlci9CeXRlY29kZUdlbmVyYXRvci5oOgorICAgICAg ICAoQnl0ZWNvZGVHZW5lcmF0b3IpOgorICAgICAgICAqIGJ5dGVjb21waWxlci9MYWJlbFNjb3Bl Lmg6CisgICAgICAgIChKU0MpOgorICAgICAgICAoSlNDOjpMYWJlbFNjb3BlUmVmOjpMYWJlbFNj b3BlUmVmKToKKyAgICAgICAgKExhYmVsU2NvcGVSZWYpOgorICAgICAgICAoSlNDOjpMYWJlbFNj b3BlUmVmOjpvcGVyYXRvcj0pOgorICAgICAgICAoSlNDOjpMYWJlbFNjb3BlUmVmOjp+TGFiZWxT Y29wZVJlZik6CisgICAgICAgIChKU0M6OkxhYmVsU2NvcGVSZWY6Om9wZXJhdG9yKik6CisgICAg ICAgIChKU0M6OkxhYmVsU2NvcGVSZWY6Om9wZXJhdG9yLT4pOgorICAgICAgICAqIGJ5dGVjb21w aWxlci9Ob2Rlc0NvZGVnZW4uY3BwOgorICAgICAgICAoSlNDOjpEb1doaWxlTm9kZTo6ZW1pdEJ5 dGVjb2RlKToKKyAgICAgICAgKEpTQzo6V2hpbGVOb2RlOjplbWl0Qnl0ZWNvZGUpOgorICAgICAg ICAoSlNDOjpGb3JOb2RlOjplbWl0Qnl0ZWNvZGUpOgorICAgICAgICAoSlNDOjpGb3JJbk5vZGU6 OmVtaXRCeXRlY29kZSk6CisgICAgICAgIChKU0M6OlN3aXRjaE5vZGU6OmVtaXRCeXRlY29kZSk6 CisgICAgICAgIChKU0M6OkxhYmVsTm9kZTo6ZW1pdEJ5dGVjb2RlKToKKwogMjAxMy0wMy0xMCAg QW5kcmVhcyBLbGluZyAgPGFrbGluZ0BhcHBsZS5jb20+CiAKICAgICAgICAgU3BlY3VsYXRpdmVK SVQgc2hvdWxkIHVzZSBPd25QdHI8U2xvd1BhdGhHZW5lcmF0b3I+LgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dURi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV1RGL0NoYW5nZUxvZwppbmRleCBlNWU5N2MzM2M0 MmFlZDlhMDI0YzgyZTU4OWY3Mjg1ODljMDFjYTZhLi4wYTkwMjNmMmY1MzE1OTYxMTBkZGZmYzJm ZTU3YTRjMWQ2OGNiMWJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL0NoYW5nZUxvZworKysgYi9T b3VyY2UvV1RGL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEzLTAzLTExICBPbGl2ZXIg SHVudCAgPG9saXZlckBhcHBsZS5jb20+CisKKyAgICAgICAgTWFrZSBTZWdtZW50ZWRWZWN0b3Ig Tm9uY29weWFibGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTExMjA1OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIENvcHlpbmcgYSBTZWdtZW50ZWRWZWN0b3IgY2FuIGJlIGV4dHJhb3JkaW5hcmlseSBleHBl bnNpdmUsIHNvIHdlIGJlYXQKKyAgICAgICAgaXQgd2l0aCB0aGUgTm9uY29weWFibGUgc3RpY2sg LSB0aGF0IHdheSB3ZSBjYW4gZW5zdXJlIHRoYXQgaWYgYW55b25lCisgICAgICAgIHdhbnRzIGFu IGFjdHVhbCBjb3B5IHRoZXkga25vdyB3aGF0IHRoZXkncmUgZG9pbmcuCisKKyAgICAgICAgKiB3 dGYvU2VnbWVudGVkVmVjdG9yLmg6CisgICAgICAgIChTZWdtZW50ZWRWZWN0b3IpOgorCiAyMDEz LTAzLTA4ICBCZW5qYW1pbiBQb3VsYWluICA8YmVuamFtaW5Ad2Via2l0Lm9yZz4KIAogICAgICAg ICBbTWFjXSBBZGQgYSBmZWF0dXJlIGZsYWcgZm9yICd2aWV3LW1vZGUnIE1lZGlhIEZlYXR1cmUs IGRpc2FibGUgaXQgb24gTWFjCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0 ZWNvbXBpbGVyL0J5dGVjb2RlR2VuZXJhdG9yLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9i eXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuY3BwCmluZGV4IGQwY2QyNzkzMjY3OWJkMDUz MTM1MGYyY2QwNGQ0YTMyZjI1NzExOGEuLjIyNTg0N2U5YzE0ZmZlMDFlZmRlMjU1ZWU5OTA4NDJh NmE2YTNlMWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIv Qnl0ZWNvZGVHZW5lcmF0b3IuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29t cGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuY3BwCkBAIC02MzksNyArNjM5LDcgQEAgUmVnaXN0ZXJJ RCogQnl0ZWNvZGVHZW5lcmF0b3I6Om5ld1RlbXBvcmFyeSgpCiAgICAgcmV0dXJuIHJlc3VsdDsK IH0KIAotUGFzc1JlZlB0cjxMYWJlbFNjb3BlPiBCeXRlY29kZUdlbmVyYXRvcjo6bmV3TGFiZWxT Y29wZShMYWJlbFNjb3BlOjpUeXBlIHR5cGUsIGNvbnN0IElkZW50aWZpZXIqIG5hbWUpCitMYWJl bFNjb3BlUmVmIEJ5dGVjb2RlR2VuZXJhdG9yOjpuZXdMYWJlbFNjb3BlKExhYmVsU2NvcGU6OlR5 cGUgdHlwZSwgY29uc3QgSWRlbnRpZmllciogbmFtZSkKIHsKICAgICAvLyBSZWNsYWltIGZyZWUg bGFiZWwgc2NvcGVzLgogICAgIHdoaWxlIChtX2xhYmVsU2NvcGVzLnNpemUoKSAmJiAhbV9sYWJl bFNjb3Blcy5sYXN0KCkucmVmQ291bnQoKSkKQEAgLTY0OCw3ICs2NDgsNyBAQCBQYXNzUmVmUHRy PExhYmVsU2NvcGU+IEJ5dGVjb2RlR2VuZXJhdG9yOjpuZXdMYWJlbFNjb3BlKExhYmVsU2NvcGU6 OlR5cGUgdHlwZSwgYwogICAgIC8vIEFsbG9jYXRlIG5ldyBsYWJlbCBzY29wZS4KICAgICBMYWJl bFNjb3BlIHNjb3BlKHR5cGUsIG5hbWUsIHNjb3BlRGVwdGgoKSwgbmV3TGFiZWwoKSwgdHlwZSA9 PSBMYWJlbFNjb3BlOjpMb29wID8gbmV3TGFiZWwoKSA6IFBhc3NSZWZQdHI8TGFiZWw+KCkpOyAv LyBPbmx5IGxvb3BzIGhhdmUgY29udGludWUgdGFyZ2V0cy4KICAgICBtX2xhYmVsU2NvcGVzLmFw cGVuZChzY29wZSk7Ci0gICAgcmV0dXJuICZtX2xhYmVsU2NvcGVzLmxhc3QoKTsKKyAgICByZXR1 cm4gTGFiZWxTY29wZVJlZigmbV9sYWJlbFNjb3BlcywgbV9sYWJlbFNjb3Blcy5zaXplKCkgLSAx KTsKIH0KIAogUGFzc1JlZlB0cjxMYWJlbD4gQnl0ZWNvZGVHZW5lcmF0b3I6Om5ld0xhYmVsKCkK QEAgLTIyODEsNyArMjI4MSw3IEBAIFBhc3NSZWZQdHI8TGFiZWw+IEJ5dGVjb2RlR2VuZXJhdG9y OjplbWl0Q29tcGxleEp1bXBTY29wZXMoTGFiZWwqIHRhcmdldCwgQ29udHJvCiAgICAgICAgIFZl Y3RvcjxTd2l0Y2hJbmZvPiBzYXZlZFN3aXRjaENvbnRleHRTdGFjazsKICAgICAgICAgVmVjdG9y PEZvckluQ29udGV4dD4gc2F2ZWRGb3JJbkNvbnRleHRTdGFjazsKICAgICAgICAgVmVjdG9yPFRy eUNvbnRleHQ+IHBvcHBlZFRyeUNvbnRleHRzOwotICAgICAgICBTZWdtZW50ZWRWZWN0b3I8TGFi ZWxTY29wZSwgOD4gc2F2ZWRMYWJlbFNjb3BlczsKKyAgICAgICAgTGFiZWxTY29wZVN0b3JlIHNh dmVkTGFiZWxTY29wZXM7CiAgICAgICAgIHdoaWxlICh0b3BTY29wZSA+IGJvdHRvbVNjb3BlICYm IHRvcFNjb3BlLT5pc0ZpbmFsbHlCbG9jaykgewogICAgICAgICAgICAgUmVmUHRyPExhYmVsPiBi ZWZvcmVGaW5hbGx5ID0gZW1pdExhYmVsKG5ld0xhYmVsKCkuZ2V0KCkpOwogICAgICAgICAgICAg CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVyL0J5dGVjb2Rl R2VuZXJhdG9yLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVyL0J5dGVjb2Rl R2VuZXJhdG9yLmgKaW5kZXggYTUxMzVkNzFmZWI3Mjg4OGU5Mjk0OTFjZDc5YmE4ZWI2MjY4Yjkx Mi4uM2YzZWZiNGYyYWU4NjFhMTg1MzBmZmYxMDc4MDM5MzQ4MWE4OTgwYSAxMDA2NDQKLS0tIGEv U291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb21waWxlci9CeXRlY29kZUdlbmVyYXRvci5oCisr KyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3Iu aApAQCAtMzMxLDcgKzMzMSw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICAgICAgcmV0dXJu IGRzdCA9PSBpZ25vcmVkUmVzdWx0KCkgPyAwIDogKGRzdCAmJiBkc3QgIT0gc3JjKSA/IGVtaXRN b3ZlKGRzdCwgc3JjKSA6IHNyYzsKICAgICAgICAgfQogCi0gICAgICAgIFBhc3NSZWZQdHI8TGFi ZWxTY29wZT4gbmV3TGFiZWxTY29wZShMYWJlbFNjb3BlOjpUeXBlLCBjb25zdCBJZGVudGlmaWVy KiA9IDApOworICAgICAgICBMYWJlbFNjb3BlUmVmIG5ld0xhYmVsU2NvcGUoTGFiZWxTY29wZTo6 VHlwZSwgY29uc3QgSWRlbnRpZmllciogPSAwKTsKICAgICAgICAgUGFzc1JlZlB0cjxMYWJlbD4g bmV3TGFiZWwoKTsKIAogICAgICAgICAvLyBUaGUgZW1pdE5vZGUgZnVuY3Rpb25zIGFyZSBqdXN0 IHN5bnRhY3RpYyBzdWdhciBmb3IgY2FsbGluZwpAQCAtNzAxLDcgKzcwMSw3IEBAIG5hbWVzcGFj ZSBKU0MgewogICAgICAgICBTZWdtZW50ZWRWZWN0b3I8UmVnaXN0ZXJJRCwgMzI+IG1fY2FsbGVl UmVnaXN0ZXJzOwogICAgICAgICBTZWdtZW50ZWRWZWN0b3I8UmVnaXN0ZXJJRCwgMzI+IG1fcGFy YW1ldGVyczsKICAgICAgICAgU2VnbWVudGVkVmVjdG9yPExhYmVsLCAzMj4gbV9sYWJlbHM7Ci0g ICAgICAgIFNlZ21lbnRlZFZlY3RvcjxMYWJlbFNjb3BlLCA4PiBtX2xhYmVsU2NvcGVzOworICAg ICAgICBMYWJlbFNjb3BlU3RvcmUgbV9sYWJlbFNjb3BlczsKICAgICAgICAgUmVmUHRyPFJlZ2lz dGVySUQ+IG1fbGFzdFZhcjsKICAgICAgICAgaW50IG1fZmluYWxseURlcHRoOwogICAgICAgICBp bnQgbV9keW5hbWljU2NvcGVEZXB0aDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ieXRlY29tcGlsZXIvTGFiZWxTY29wZS5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVj b21waWxlci9MYWJlbFNjb3BlLmgKaW5kZXggY2MyMWZmZmQxMTRiMjJhNjM0M2RiODQwOTgxNDA3 NjA1MGY3ZmI4Mi4uOWM3OGIwMzMzZWZkZjMxMjZmNjhmZDEyNjdiYWI5MmJjMmJhMDhjNSAxMDA2 NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb21waWxlci9MYWJlbFNjb3BlLmgK KysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb21waWxlci9MYWJlbFNjb3BlLmgKQEAg LTc0LDYgKzc0LDU2IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICBSZWZQdHI8TGFiZWw+IG1f Y29udGludWVUYXJnZXQ7CiAgICAgfTsKIAorICAgIHR5cGVkZWYgVmVjdG9yPExhYmVsU2NvcGUs IDg+IExhYmVsU2NvcGVTdG9yZTsKKworICAgIHN0cnVjdCBMYWJlbFNjb3BlUmVmIHsKKyAgICAg ICAgTGFiZWxTY29wZVJlZigpCisgICAgICAgICAgICA6IG1fb3duZXIoMCkKKyAgICAgICAgICAg ICwgbV9pbmRleCgwKQorICAgICAgICB7CisgICAgICAgIH0KKyAgICAgICAgTGFiZWxTY29wZVJl ZihMYWJlbFNjb3BlU3RvcmUqIG93bmVyLCBzaXplX3QgaW5kZXgpCisgICAgICAgICAgICA6IG1f b3duZXIob3duZXIpCisgICAgICAgICAgICAsIG1faW5kZXgoaW5kZXgpCisgICAgICAgIHsKKyAg ICAgICAgICAgIG1fb3duZXItPmF0KGluZGV4KS5yZWYoKTsKKyAgICAgICAgfQorCisgICAgICAg IExhYmVsU2NvcGVSZWYoY29uc3QgTGFiZWxTY29wZVJlZiYgb3RoZXIpCisgICAgICAgICAgICA6 IG1fb3duZXIob3RoZXIubV9vd25lcikKKyAgICAgICAgICAgICwgbV9pbmRleChvdGhlci5tX2lu ZGV4KQorICAgICAgICB7CisgICAgICAgICAgICBpZiAobV9vd25lcikKKyAgICAgICAgICAgICAg ICBtX293bmVyLT5hdChtX2luZGV4KS5yZWYoKTsKKyAgICAgICAgfQorCisgICAgICAgIGNvbnN0 IExhYmVsU2NvcGVSZWYmIG9wZXJhdG9yPShjb25zdCBMYWJlbFNjb3BlUmVmJiBvdGhlcikKKyAg ICAgICAgeworICAgICAgICAgICAgaWYgKG90aGVyLm1fb3duZXIpCisgICAgICAgICAgICAgICAg b3RoZXIubV9vd25lci0+YXQob3RoZXIubV9pbmRleCkucmVmKCk7CisgICAgICAgICAgICBpZiAo bV9vd25lcikKKyAgICAgICAgICAgICAgICBtX293bmVyLT5hdChtX2luZGV4KS5kZXJlZigpOwor ICAgICAgICAgICAgbV9vd25lciA9IG90aGVyLm1fb3duZXI7CisgICAgICAgICAgICBtX2luZGV4 ID0gb3RoZXIubV9pbmRleDsKKyAgICAgICAgICAgIHJldHVybiAqdGhpczsKKyAgICAgICAgfQor CisgICAgICAgIH5MYWJlbFNjb3BlUmVmKCkKKyAgICAgICAgeworICAgICAgICAgICAgaWYgKG1f b3duZXIpCisgICAgICAgICAgICAgICAgbV9vd25lci0+YXQobV9pbmRleCkuZGVyZWYoKTsKKyAg ICAgICAgfQorCisgICAgICAgIExhYmVsU2NvcGUmIG9wZXJhdG9yKigpIHsgQVNTRVJUKG1fb3du ZXIpOyByZXR1cm4gbV9vd25lci0+YXQobV9pbmRleCk7IH0KKyAgICAgICAgTGFiZWxTY29wZSog b3BlcmF0b3ItPigpIHsgQVNTRVJUKG1fb3duZXIpOyByZXR1cm4gJm1fb3duZXItPmF0KG1faW5k ZXgpOyB9CisgICAgICAgIGNvbnN0IExhYmVsU2NvcGUmIG9wZXJhdG9yKigpIGNvbnN0IHsgQVNT RVJUKG1fb3duZXIpOyByZXR1cm4gbV9vd25lci0+YXQobV9pbmRleCk7IH0KKyAgICAgICAgY29u c3QgTGFiZWxTY29wZSogb3BlcmF0b3ItPigpIGNvbnN0IHsgQVNTRVJUKG1fb3duZXIpOyByZXR1 cm4gJm1fb3duZXItPmF0KG1faW5kZXgpOyB9CisKKyAgICBwcml2YXRlOgorICAgICAgICBMYWJl bFNjb3BlU3RvcmUqIG1fb3duZXI7CisgICAgICAgIHNpemVfdCBtX2luZGV4OworICAgIH07CisK IH0gLy8gbmFtZXNwYWNlIEpTQwogCiAjZW5kaWYgLy8gTGFiZWxTY29wZV9oCmRpZmYgLS1naXQg YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVyL05vZGVzQ29kZWdlbi5jcHAgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVyL05vZGVzQ29kZWdlbi5jcHAKaW5kZXgg YTgxODczZjY5ZGJmMTVkOTZlN2E0NjU1NDc4ZmZkODkzMmExNjQ3ZC4uMzE2OTY3Y2M1ZWZiODRl NjkyN2RhYjQwMDY5YjVlMGQ2ODExMzY0NSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRD b3JlL2J5dGVjb21waWxlci9Ob2Rlc0NvZGVnZW4uY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ieXRlY29tcGlsZXIvTm9kZXNDb2RlZ2VuLmNwcApAQCAtMTU5NCw3ICsxNTk0LDcgQEAg UmVnaXN0ZXJJRCogSWZFbHNlTm9kZTo6ZW1pdEJ5dGVjb2RlKEJ5dGVjb2RlR2VuZXJhdG9yJiBn ZW5lcmF0b3IsIFJlZ2lzdGVySUQqIGQKIAogUmVnaXN0ZXJJRCogRG9XaGlsZU5vZGU6OmVtaXRC eXRlY29kZShCeXRlY29kZUdlbmVyYXRvciYgZ2VuZXJhdG9yLCBSZWdpc3RlcklEKiBkc3QpCiB7 Ci0gICAgUmVmUHRyPExhYmVsU2NvcGU+IHNjb3BlID0gZ2VuZXJhdG9yLm5ld0xhYmVsU2NvcGUo TGFiZWxTY29wZTo6TG9vcCk7CisgICAgTGFiZWxTY29wZVJlZiBzY29wZSA9IGdlbmVyYXRvci5u ZXdMYWJlbFNjb3BlKExhYmVsU2NvcGU6Okxvb3ApOwogCiAgICAgUmVmUHRyPExhYmVsPiB0b3BP Zkxvb3AgPSBnZW5lcmF0b3IubmV3TGFiZWwoKTsKICAgICBnZW5lcmF0b3IuZW1pdExhYmVsKHRv cE9mTG9vcC5nZXQoKSk7CkBAIC0xNjIwLDcgKzE2MjAsNyBAQCBSZWdpc3RlcklEKiBEb1doaWxl Tm9kZTo6ZW1pdEJ5dGVjb2RlKEJ5dGVjb2RlR2VuZXJhdG9yJiBnZW5lcmF0b3IsIFJlZ2lzdGVy SUQqCiAKIFJlZ2lzdGVySUQqIFdoaWxlTm9kZTo6ZW1pdEJ5dGVjb2RlKEJ5dGVjb2RlR2VuZXJh dG9yJiBnZW5lcmF0b3IsIFJlZ2lzdGVySUQqIGRzdCkKIHsKLSAgICBSZWZQdHI8TGFiZWxTY29w ZT4gc2NvcGUgPSBnZW5lcmF0b3IubmV3TGFiZWxTY29wZShMYWJlbFNjb3BlOjpMb29wKTsKKyAg ICBMYWJlbFNjb3BlUmVmIHNjb3BlID0gZ2VuZXJhdG9yLm5ld0xhYmVsU2NvcGUoTGFiZWxTY29w ZTo6TG9vcCk7CiAgICAgUmVmUHRyPExhYmVsPiB0b3BPZkxvb3AgPSBnZW5lcmF0b3IubmV3TGFi ZWwoKTsKIAogICAgIGdlbmVyYXRvci5lbWl0RGVidWdIb29rKFdpbGxFeGVjdXRlU3RhdGVtZW50 LCBtX2V4cHItPmxpbmVObygpLCBtX2V4cHItPmxpbmVObygpLCBtX2V4cHItPmNvbHVtbk5vKCkp OwpAQCAtMTY1Niw3ICsxNjU2LDcgQEAgUmVnaXN0ZXJJRCogV2hpbGVOb2RlOjplbWl0Qnl0ZWNv ZGUoQnl0ZWNvZGVHZW5lcmF0b3ImIGdlbmVyYXRvciwgUmVnaXN0ZXJJRCogZHMKIAogUmVnaXN0 ZXJJRCogRm9yTm9kZTo6ZW1pdEJ5dGVjb2RlKEJ5dGVjb2RlR2VuZXJhdG9yJiBnZW5lcmF0b3Is IFJlZ2lzdGVySUQqIGRzdCkKIHsKLSAgICBSZWZQdHI8TGFiZWxTY29wZT4gc2NvcGUgPSBnZW5l cmF0b3IubmV3TGFiZWxTY29wZShMYWJlbFNjb3BlOjpMb29wKTsKKyAgICBMYWJlbFNjb3BlUmVm IHNjb3BlID0gZ2VuZXJhdG9yLm5ld0xhYmVsU2NvcGUoTGFiZWxTY29wZTo6TG9vcCk7CiAKICAg ICBnZW5lcmF0b3IuZW1pdERlYnVnSG9vayhXaWxsRXhlY3V0ZVN0YXRlbWVudCwgZmlyc3RMaW5l KCksIGxhc3RMaW5lKCksIGNvbHVtbigpKTsKIApAQCAtMTcwMSw3ICsxNzAxLDcgQEAgUmVnaXN0 ZXJJRCogRm9yTm9kZTo6ZW1pdEJ5dGVjb2RlKEJ5dGVjb2RlR2VuZXJhdG9yJiBnZW5lcmF0b3Is IFJlZ2lzdGVySUQqIGRzdCkKIAogUmVnaXN0ZXJJRCogRm9ySW5Ob2RlOjplbWl0Qnl0ZWNvZGUo Qnl0ZWNvZGVHZW5lcmF0b3ImIGdlbmVyYXRvciwgUmVnaXN0ZXJJRCogZHN0KQogewotICAgIFJl ZlB0cjxMYWJlbFNjb3BlPiBzY29wZSA9IGdlbmVyYXRvci5uZXdMYWJlbFNjb3BlKExhYmVsU2Nv cGU6Okxvb3ApOworICAgIExhYmVsU2NvcGVSZWYgc2NvcGUgPSBnZW5lcmF0b3IubmV3TGFiZWxT Y29wZShMYWJlbFNjb3BlOjpMb29wKTsKIAogICAgIGlmICghbV9sZXhwci0+aXNMb2NhdGlvbigp KQogICAgICAgICByZXR1cm4gZW1pdFRocm93UmVmZXJlbmNlRXJyb3IoZ2VuZXJhdG9yLCAiTGVm dCBzaWRlIG9mIGZvci1pbiBzdGF0ZW1lbnQgaXMgbm90IGEgcmVmZXJlbmNlLiIpOwpAQCAtMjAx MCw3ICsyMDEwLDcgQEAgUmVnaXN0ZXJJRCogU3dpdGNoTm9kZTo6ZW1pdEJ5dGVjb2RlKEJ5dGVj b2RlR2VuZXJhdG9yJiBnZW5lcmF0b3IsIFJlZ2lzdGVySUQqIGQKIHsKICAgICBnZW5lcmF0b3Iu ZW1pdERlYnVnSG9vayhXaWxsRXhlY3V0ZVN0YXRlbWVudCwgZmlyc3RMaW5lKCksIGxhc3RMaW5l KCksIGNvbHVtbigpKTsKICAgICAKLSAgICBSZWZQdHI8TGFiZWxTY29wZT4gc2NvcGUgPSBnZW5l cmF0b3IubmV3TGFiZWxTY29wZShMYWJlbFNjb3BlOjpTd2l0Y2gpOworICAgIExhYmVsU2NvcGVS ZWYgc2NvcGUgPSBnZW5lcmF0b3IubmV3TGFiZWxTY29wZShMYWJlbFNjb3BlOjpTd2l0Y2gpOwog CiAgICAgUmVmUHRyPFJlZ2lzdGVySUQ+IHIwID0gZ2VuZXJhdG9yLmVtaXROb2RlKG1fZXhwcik7 CiAgICAgUmVnaXN0ZXJJRCogcjEgPSBtX2Jsb2NrLT5lbWl0Qnl0ZWNvZGVGb3JCbG9jayhnZW5l cmF0b3IsIHIwLmdldCgpLCBkc3QpOwpAQCAtMjAyNyw3ICsyMDI3LDcgQEAgUmVnaXN0ZXJJRCog TGFiZWxOb2RlOjplbWl0Qnl0ZWNvZGUoQnl0ZWNvZGVHZW5lcmF0b3ImIGdlbmVyYXRvciwgUmVn aXN0ZXJJRCogZHMKIAogICAgIEFTU0VSVCghZ2VuZXJhdG9yLmJyZWFrVGFyZ2V0KG1fbmFtZSkp OwogCi0gICAgUmVmUHRyPExhYmVsU2NvcGU+IHNjb3BlID0gZ2VuZXJhdG9yLm5ld0xhYmVsU2Nv cGUoTGFiZWxTY29wZTo6TmFtZWRMYWJlbCwgJm1fbmFtZSk7CisgICAgTGFiZWxTY29wZVJlZiBz Y29wZSA9IGdlbmVyYXRvci5uZXdMYWJlbFNjb3BlKExhYmVsU2NvcGU6Ok5hbWVkTGFiZWwsICZt X25hbWUpOwogICAgIFJlZ2lzdGVySUQqIHIwID0gZ2VuZXJhdG9yLmVtaXROb2RlKGRzdCwgbV9z dGF0ZW1lbnQpOwogCiAgICAgZ2VuZXJhdG9yLmVtaXRMYWJlbChzY29wZS0+YnJlYWtUYXJnZXQo KSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9TZWdtZW50ZWRWZWN0b3IuaCBiL1NvdXJj ZS9XVEYvd3RmL1NlZ21lbnRlZFZlY3Rvci5oCmluZGV4IGI1YmY5OTkwYWZhZWQyMDA3ZGY3M2Rh Zjg1YmQ1NzQ0YWUzZWM2N2YuLjkwNjVmMmYxNTM1OTM1NjhhYjE4YTcwNGVkMjBmYThmMmNjM2Nk ZTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL1NlZ21lbnRlZFZlY3Rvci5oCisrKyBiL1Nv dXJjZS9XVEYvd3RmL1NlZ21lbnRlZFZlY3Rvci5oCkBAIC0yOSw2ICsyOSw3IEBACiAjaWZuZGVm IFNlZ21lbnRlZFZlY3Rvcl9oCiAjZGVmaW5lIFNlZ21lbnRlZFZlY3Rvcl9oCiAKKyNpbmNsdWRl IDx3dGYvTm9uY29weWFibGUuaD4KICNpbmNsdWRlIDx3dGYvVmVjdG9yLmg+CiAKIG5hbWVzcGFj ZSBXVEYgewpAQCAtMTA0LDYgKzEwNSw4IEBAIG5hbWVzcGFjZSBXVEYgewogICAgIHRlbXBsYXRl IDx0eXBlbmFtZSBULCBzaXplX3QgU2VnbWVudFNpemUsIHNpemVfdCBJbmxpbmVDYXBhY2l0eT4K ICAgICBjbGFzcyBTZWdtZW50ZWRWZWN0b3IgewogICAgICAgICBmcmllbmQgY2xhc3MgU2VnbWVu dGVkVmVjdG9ySXRlcmF0b3I8VCwgU2VnbWVudFNpemUsIElubGluZUNhcGFjaXR5PjsKKyAgICAg ICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoU2VnbWVudGVkVmVjdG9yKTsKKwogICAgIHB1YmxpYzoK ICAgICAgICAgdHlwZWRlZiBTZWdtZW50ZWRWZWN0b3JJdGVyYXRvcjxULCBTZWdtZW50U2l6ZSwg SW5saW5lQ2FwYWNpdHk+IEl0ZXJhdG9yOwogCg==