69446 2011-10-05 11:23:09 -0700 Use std::reverse_iterator for ListHashSet reverse iterators 2011-10-16 04:17:10 -0700 1 1 1 Unclassified WebKit Web Template Framework 528+ (Nightly build) Unspecified Unspecified REOPENED P2 Normal --- 69454 1 andersca andersca darin rniwa webkit.review.bot oldest_to_newest 478533 0 andersca 2011-10-05 11:23:09 -0700 Use std::reverse_iterator for ListHashSet reverse iterators 478534 1 109827 andersca 2011-10-05 11:24:27 -0700 Created attachment 109827 Patch 478535 2 109827 darin 2011-10-05 11:26:01 -0700 Comment on attachment 109827 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=109827&action=review Did you test this? Does it work? > Source/JavaScriptCore/ChangeLog:13 > + (WTF::::rbegin): > + (WTF::::rend): You should remove these garbled lines from the change log. 478536 3 webkit.review.bot 2011-10-05 11:27:04 -0700 Attachment 109827 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/JavaScriptCore/ChangeLog', u'Source..." exit_code: 1 Source/JavaScriptCore/wtf/ListHashSet.h:80: reverse_iterator is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/JavaScriptCore/wtf/ListHashSet.h:81: const_reverse_iterator is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/JavaScriptCore/wtf/ListHashSet.h:274: iterator_category is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/JavaScriptCore/wtf/ListHashSet.h:275: value_type is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/JavaScriptCore/wtf/ListHashSet.h:278: difference_type is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/JavaScriptCore/wtf/ListHashSet.h:328: iterator_category is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/JavaScriptCore/wtf/ListHashSet.h:329: value_type is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/JavaScriptCore/wtf/ListHashSet.h:332: difference_type is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Total errors found: 8 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 478539 4 andersca 2011-10-05 11:28:55 -0700 Committed r96733: <http://trac.webkit.org/changeset/96733> 478572 5 rniwa 2011-10-05 12:19:52 -0700 This patch broke Mac builds: http://build.webkit.org/builders/Leopard%20Intel%20Debug%20%28Build%29/builds/40228/steps/compile-webkit/logs/stdio http://build.webkit.org/builders/SnowLeopard%20Intel%20Debug%20%28Build%29/builds/2691/steps/compile-webkit/logs/stdio http://build.webkit.org/builders/Lion%20Intel%20Release%20%28Build%29/builds/2025/steps/compile-webkit/logs/stdio 478599 6 darin 2011-10-05 12:50:49 -0700 Apparently on older toolsets, <iterator> is not compatible with -fno-exceptions. 478600 7 darin 2011-10-05 12:52:14 -0700 Maybe not practical if we support those old Mac toolsets? 478631 8 andersca 2011-10-05 13:30:10 -0700 (In reply to comment #7) > Maybe not practical if we support those old Mac toolsets? It seems to me like if we include something that ends up including exception_defines.h we should be fine - it contains macros that define away try/catch. 484764 9 109827 dbates 2011-10-16 04:17:10 -0700 Comment on attachment 109827 Patch Attachment 109827 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/10073612 109827 2011-10-05 11:24:27 -0700 2011-10-16 04:17:10 -0700 Patch bug-69446-20111005112426.patch text/plain 10278 andersca SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gOTY3MzIpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAK KzIwMTEtMTAtMDUgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAg ICAgICBVc2Ugc3RkOjpyZXZlcnNlX2l0ZXJhdG9yIGZvciBMaXN0SGFzaFNldCByZXZlcnNlIGl0 ZXJhdG9ycworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 Njk0NDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBV c2UgdGhlIHN0ZDo6cmV2ZXJzZV9pdGVyYXRvciBpdGVyYXRvciBhZGFwdG9yIGZvciB0aGUgTGlz dEhhc2hTZXQgcmV2ZXJzZSBpdGVyYXRvcnMKKyAgICAgICAgYW5kIGdldCByaWQgb2YgdGhlIExp c3RIYXNoU2V0UmV2ZXJzZUl0ZXJhdG9yIGFuZCBMaXN0SGFzaFNldENvbnN0UmV2ZXJzZUl0ZXJh dG9yIGNsYXNzZXMuCisKKyAgICAgICAgKiB3dGYvTGlzdEhhc2hTZXQuaDoKKyAgICAgICAgKFdU Rjo6OjpyYmVnaW4pOgorICAgICAgICAoV1RGOjo6OnJlbmQpOgorCiAyMDExLTEwLTA0ICBHYXZp biBCYXJyYWNsb3VnaCAgPGJhcnJhY2xvdWdoQGFwcGxlLmNvbT4KIAogICAgICAgICBNYWtlIE9i amVjdC5wcm90b3R5cGUgZ2V0dGVyL3NldHRlciBtZXRob2RzIG1hdGNoIEVTNSBiZWhhdmlvdXIK SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS93dGYvTGlzdEhhc2hTZXQuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvd3RmL0xpc3RIYXNoU2V0LmgJKHJldmlzaW9uIDk2 NzE3KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi9MaXN0SGFzaFNldC5oCSh3b3JraW5n IGNvcHkpCkBAIC0yNyw2ICsyNyw3IEBACiAjaW5jbHVkZSAiT3duUHRyLmgiCiAjaW5jbHVkZSAi UGFzc093blB0ci5oIgogI2luY2x1ZGUgIlN0ZExpYkV4dHJhcy5oIgorI2luY2x1ZGUgPGl0ZXJh dG9yPgogCiBuYW1lc3BhY2UgV1RGIHsKIApAQCAtNDksOCArNTAsNiBAQCBuYW1lc3BhY2UgV1RG IHsKIAogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFZhbHVlQXJnLCBzaXplX3QgaW5saW5lQ2FwYWNp dHksIHR5cGVuYW1lIEhhc2hBcmc+IGNsYXNzIExpc3RIYXNoU2V0SXRlcmF0b3I7CiAgICAgdGVt cGxhdGU8dHlwZW5hbWUgVmFsdWVBcmcsIHNpemVfdCBpbmxpbmVDYXBhY2l0eSwgdHlwZW5hbWUg SGFzaEFyZz4gY2xhc3MgTGlzdEhhc2hTZXRDb25zdEl0ZXJhdG9yOwotICAgIHRlbXBsYXRlPHR5 cGVuYW1lIFZhbHVlQXJnLCBzaXplX3QgaW5saW5lQ2FwYWNpdHksIHR5cGVuYW1lIEhhc2hBcmc+ IGNsYXNzIExpc3RIYXNoU2V0UmV2ZXJzZUl0ZXJhdG9yOwotICAgIHRlbXBsYXRlPHR5cGVuYW1l IFZhbHVlQXJnLCBzaXplX3QgaW5saW5lQ2FwYWNpdHksIHR5cGVuYW1lIEhhc2hBcmc+IGNsYXNz IExpc3RIYXNoU2V0Q29uc3RSZXZlcnNlSXRlcmF0b3I7CiAKICAgICB0ZW1wbGF0ZTx0eXBlbmFt ZSBWYWx1ZUFyZywgc2l6ZV90IGlubGluZUNhcGFjaXR5PiBzdHJ1Y3QgTGlzdEhhc2hTZXROb2Rl OwogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFZhbHVlQXJnLCBzaXplX3QgaW5saW5lQ2FwYWNpdHk+ IHN0cnVjdCBMaXN0SGFzaFNldE5vZGVBbGxvY2F0b3I7CkBAIC03OCw5ICs3Nyw4IEBAIG5hbWVz cGFjZSBXVEYgewogICAgICAgICB0eXBlZGVmIExpc3RIYXNoU2V0Q29uc3RJdGVyYXRvcjxWYWx1 ZVR5cGUsIGlubGluZUNhcGFjaXR5LCBIYXNoQXJnPiBjb25zdF9pdGVyYXRvcjsKICAgICAgICAg ZnJpZW5kIGNsYXNzIExpc3RIYXNoU2V0Q29uc3RJdGVyYXRvcjxWYWx1ZVR5cGUsIGlubGluZUNh cGFjaXR5LCBIYXNoQXJnPjsKIAotICAgICAgICB0eXBlZGVmIExpc3RIYXNoU2V0UmV2ZXJzZUl0 ZXJhdG9yPFZhbHVlVHlwZSwgaW5saW5lQ2FwYWNpdHksIEhhc2hBcmc+IHJldmVyc2VfaXRlcmF0 b3I7Ci0gICAgICAgIHR5cGVkZWYgTGlzdEhhc2hTZXRDb25zdFJldmVyc2VJdGVyYXRvcjxWYWx1 ZVR5cGUsIGlubGluZUNhcGFjaXR5LCBIYXNoQXJnPiBjb25zdF9yZXZlcnNlX2l0ZXJhdG9yOwot ICAgICAgICBmcmllbmQgY2xhc3MgTGlzdEhhc2hTZXRDb25zdFJldmVyc2VJdGVyYXRvcjxWYWx1 ZVR5cGUsIGlubGluZUNhcGFjaXR5LCBIYXNoQXJnPjsKKyAgICAgICAgdHlwZWRlZiBzdGQ6OnJl dmVyc2VfaXRlcmF0b3I8aXRlcmF0b3I+IHJldmVyc2VfaXRlcmF0b3I7CisgICAgICAgIHR5cGVk ZWYgc3RkOjpyZXZlcnNlX2l0ZXJhdG9yPGNvbnN0X2l0ZXJhdG9yPiBjb25zdF9yZXZlcnNlX2l0 ZXJhdG9yOwogCiAgICAgICAgIExpc3RIYXNoU2V0KCk7CiAgICAgICAgIExpc3RIYXNoU2V0KGNv bnN0IExpc3RIYXNoU2V0Jik7CkBAIC0xNDAsOCArMTM4LDYgQEAgbmFtZXNwYWNlIFdURiB7CiAg ICAgICAgIAogICAgICAgICBpdGVyYXRvciBtYWtlSXRlcmF0b3IoTm9kZSopOwogICAgICAgICBj b25zdF9pdGVyYXRvciBtYWtlQ29uc3RJdGVyYXRvcihOb2RlKikgY29uc3Q7Ci0gICAgICAgIHJl dmVyc2VfaXRlcmF0b3IgbWFrZVJldmVyc2VJdGVyYXRvcihOb2RlKik7Ci0gICAgICAgIGNvbnN0 X3JldmVyc2VfaXRlcmF0b3IgbWFrZUNvbnN0UmV2ZXJzZUl0ZXJhdG9yKE5vZGUqKSBjb25zdDsK IAogICAgICAgICBmcmllbmQgdm9pZCBkZWxldGVBbGxWYWx1ZXM8Pihjb25zdCBMaXN0SGFzaFNl dCYpOwogCkBAIC0yNzEsMTAgKzI2NywxNiBAQCBuYW1lc3BhY2UgV1RGIHsKICAgICAgICAgdHlw ZWRlZiBWYWx1ZVR5cGUqIFBvaW50ZXJUeXBlOwogCiAgICAgICAgIGZyaWVuZCBjbGFzcyBMaXN0 SGFzaFNldDxWYWx1ZUFyZywgaW5saW5lQ2FwYWNpdHksIEhhc2hBcmc+OwotCisgICAgICAgIAog ICAgICAgICBMaXN0SGFzaFNldEl0ZXJhdG9yKGNvbnN0IExpc3RIYXNoU2V0VHlwZSogc2V0LCBO b2RlKiBwb3NpdGlvbikgOiBtX2l0ZXJhdG9yKHNldCwgcG9zaXRpb24pIHsgfQogCiAgICAgcHVi bGljOgorICAgICAgICB0eXBlZGVmIHN0ZDo6YmlkaXJlY3Rpb25hbF9pdGVyYXRvcl90YWcgaXRl cmF0b3JfY2F0ZWdvcnk7CisgICAgICAgIHR5cGVkZWYgVmFsdWVUeXBlIHZhbHVlX3R5cGU7Cisg ICAgICAgIHR5cGVkZWYgUmVmZXJlbmNlVHlwZSByZWZlcmVuY2U7CisgICAgICAgIHR5cGVkZWYg UG9pbnRlclR5cGUgcG9pbnRlcjsKKyAgICAgICAgdHlwZWRlZiBpbnQgZGlmZmVyZW5jZV90eXBl OworCiAgICAgICAgIExpc3RIYXNoU2V0SXRlcmF0b3IoKSB7IH0KIAogICAgICAgICAvLyBkZWZh dWx0IGNvcHksIGFzc2lnbm1lbnQgYW5kIGRlc3RydWN0b3IgYXJlIE9LCkBAIC0zMjMsNiArMzI1 LDEyIEBAIG5hbWVzcGFjZSBXVEYgewogICAgICAgICB9CiAKICAgICBwdWJsaWM6CisgICAgICAg IHR5cGVkZWYgc3RkOjpiaWRpcmVjdGlvbmFsX2l0ZXJhdG9yX3RhZyBpdGVyYXRvcl9jYXRlZ29y eTsKKyAgICAgICAgdHlwZWRlZiBWYWx1ZVR5cGUgdmFsdWVfdHlwZTsKKyAgICAgICAgdHlwZWRl ZiBSZWZlcmVuY2VUeXBlIHJlZmVyZW5jZTsKKyAgICAgICAgdHlwZWRlZiBQb2ludGVyVHlwZSBw b2ludGVyOworICAgICAgICB0eXBlZGVmIGludCBkaWZmZXJlbmNlX3R5cGU7CisKICAgICAgICAg TGlzdEhhc2hTZXRDb25zdEl0ZXJhdG9yKCkKICAgICAgICAgewogICAgICAgICB9CkBAIC0zNzIs MTE4ICszODAsNiBAQCBuYW1lc3BhY2UgV1RGIHsKICAgICAgICAgTm9kZSogbV9wb3NpdGlvbjsK ICAgICB9OwogCi0gICAgdGVtcGxhdGU8dHlwZW5hbWUgVmFsdWVBcmcsIHNpemVfdCBpbmxpbmVD YXBhY2l0eSwgdHlwZW5hbWUgSGFzaEFyZz4gY2xhc3MgTGlzdEhhc2hTZXRSZXZlcnNlSXRlcmF0 b3IgewotICAgIHByaXZhdGU6Ci0gICAgICAgIHR5cGVkZWYgTGlzdEhhc2hTZXQ8VmFsdWVBcmcs IGlubGluZUNhcGFjaXR5LCBIYXNoQXJnPiBMaXN0SGFzaFNldFR5cGU7Ci0gICAgICAgIHR5cGVk ZWYgTGlzdEhhc2hTZXRSZXZlcnNlSXRlcmF0b3I8VmFsdWVBcmcsIGlubGluZUNhcGFjaXR5LCBI YXNoQXJnPiByZXZlcnNlX2l0ZXJhdG9yOwotICAgICAgICB0eXBlZGVmIExpc3RIYXNoU2V0Q29u c3RJdGVyYXRvcjxWYWx1ZUFyZywgaW5saW5lQ2FwYWNpdHksIEhhc2hBcmc+IGNvbnN0X3JldmVy c2VfaXRlcmF0b3I7Ci0gICAgICAgIHR5cGVkZWYgTGlzdEhhc2hTZXROb2RlPFZhbHVlQXJnLCBp bmxpbmVDYXBhY2l0eT4gTm9kZTsKLSAgICAgICAgdHlwZWRlZiBWYWx1ZUFyZyBWYWx1ZVR5cGU7 Ci0gICAgICAgIHR5cGVkZWYgVmFsdWVUeXBlJiBSZWZlcmVuY2VUeXBlOwotICAgICAgICB0eXBl ZGVmIFZhbHVlVHlwZSogUG9pbnRlclR5cGU7Ci0KLSAgICAgICAgZnJpZW5kIGNsYXNzIExpc3RI YXNoU2V0PFZhbHVlQXJnLCBpbmxpbmVDYXBhY2l0eSwgSGFzaEFyZz47Ci0KLSAgICAgICAgTGlz dEhhc2hTZXRSZXZlcnNlSXRlcmF0b3IoY29uc3QgTGlzdEhhc2hTZXRUeXBlKiBzZXQsIE5vZGUq IHBvc2l0aW9uKSA6IG1faXRlcmF0b3Ioc2V0LCBwb3NpdGlvbikgeyB9Ci0KLSAgICBwdWJsaWM6 Ci0gICAgICAgIExpc3RIYXNoU2V0UmV2ZXJzZUl0ZXJhdG9yKCkgeyB9Ci0KLSAgICAgICAgLy8g ZGVmYXVsdCBjb3B5LCBhc3NpZ25tZW50IGFuZCBkZXN0cnVjdG9yIGFyZSBPSwotCi0gICAgICAg IFBvaW50ZXJUeXBlIGdldCgpIGNvbnN0IHsgcmV0dXJuIGNvbnN0X2Nhc3Q8UG9pbnRlclR5cGU+ KG1faXRlcmF0b3IuZ2V0KCkpOyB9Ci0gICAgICAgIFJlZmVyZW5jZVR5cGUgb3BlcmF0b3IqKCkg Y29uc3QgeyByZXR1cm4gKmdldCgpOyB9Ci0gICAgICAgIFBvaW50ZXJUeXBlIG9wZXJhdG9yLT4o KSBjb25zdCB7IHJldHVybiBnZXQoKTsgfQotCi0gICAgICAgIHJldmVyc2VfaXRlcmF0b3ImIG9w ZXJhdG9yKysoKSB7ICsrbV9pdGVyYXRvcjsgcmV0dXJuICp0aGlzOyB9Ci0KLSAgICAgICAgLy8g cG9zdGZpeCArKyBpbnRlbnRpb25hbGx5IG9taXR0ZWQKLQotICAgICAgICByZXZlcnNlX2l0ZXJh dG9yJiBvcGVyYXRvci0tKCkgeyAtLW1faXRlcmF0b3I7IHJldHVybiAqdGhpczsgfQotCi0gICAg ICAgIC8vIHBvc3RmaXggLS0gaW50ZW50aW9uYWxseSBvbWl0dGVkCi0KLSAgICAgICAgLy8gQ29t cGFyaXNvbi4KLSAgICAgICAgYm9vbCBvcGVyYXRvcj09KGNvbnN0IHJldmVyc2VfaXRlcmF0b3Im IG90aGVyKSBjb25zdCB7IHJldHVybiBtX2l0ZXJhdG9yID09IG90aGVyLm1faXRlcmF0b3I7IH0K LSAgICAgICAgYm9vbCBvcGVyYXRvciE9KGNvbnN0IHJldmVyc2VfaXRlcmF0b3ImIG90aGVyKSBj b25zdCB7IHJldHVybiBtX2l0ZXJhdG9yICE9IG90aGVyLm1faXRlcmF0b3I7IH0KLQotICAgICAg ICBvcGVyYXRvciBjb25zdF9yZXZlcnNlX2l0ZXJhdG9yKCkgY29uc3QgeyByZXR1cm4gbV9pdGVy YXRvcjsgfQotCi0gICAgcHJpdmF0ZToKLSAgICAgICAgTm9kZSogbm9kZSgpIHsgcmV0dXJuIG1f aXRlcmF0b3Iubm9kZSgpOyB9Ci0KLSAgICAgICAgY29uc3RfcmV2ZXJzZV9pdGVyYXRvciBtX2l0 ZXJhdG9yOwotICAgIH07Ci0KLSAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBWYWx1ZUFyZywgc2l6ZV90 IGlubGluZUNhcGFjaXR5LCB0eXBlbmFtZSBIYXNoQXJnPiBjbGFzcyBMaXN0SGFzaFNldENvbnN0 UmV2ZXJzZUl0ZXJhdG9yIHsKLSAgICBwcml2YXRlOgotICAgICAgICB0eXBlZGVmIExpc3RIYXNo U2V0PFZhbHVlQXJnLCBpbmxpbmVDYXBhY2l0eSwgSGFzaEFyZz4gTGlzdEhhc2hTZXRUeXBlOwot ICAgICAgICB0eXBlZGVmIExpc3RIYXNoU2V0UmV2ZXJzZUl0ZXJhdG9yPFZhbHVlQXJnLCBpbmxp bmVDYXBhY2l0eSwgSGFzaEFyZz4gcmV2ZXJzZV9pdGVyYXRvcjsKLSAgICAgICAgdHlwZWRlZiBM aXN0SGFzaFNldENvbnN0UmV2ZXJzZUl0ZXJhdG9yPFZhbHVlQXJnLCBpbmxpbmVDYXBhY2l0eSwg SGFzaEFyZz4gY29uc3RfcmV2ZXJzZV9pdGVyYXRvcjsKLSAgICAgICAgdHlwZWRlZiBMaXN0SGFz aFNldE5vZGU8VmFsdWVBcmcsIGlubGluZUNhcGFjaXR5PiBOb2RlOwotICAgICAgICB0eXBlZGVm IFZhbHVlQXJnIFZhbHVlVHlwZTsKLSAgICAgICAgdHlwZWRlZiBjb25zdCBWYWx1ZVR5cGUmIFJl ZmVyZW5jZVR5cGU7Ci0gICAgICAgIHR5cGVkZWYgY29uc3QgVmFsdWVUeXBlKiBQb2ludGVyVHlw ZTsKLQotICAgICAgICBmcmllbmQgY2xhc3MgTGlzdEhhc2hTZXQ8VmFsdWVBcmcsIGlubGluZUNh cGFjaXR5LCBIYXNoQXJnPjsKLSAgICAgICAgZnJpZW5kIGNsYXNzIExpc3RIYXNoU2V0UmV2ZXJz ZUl0ZXJhdG9yPFZhbHVlQXJnLCBpbmxpbmVDYXBhY2l0eSwgSGFzaEFyZz47Ci0KLSAgICAgICAg TGlzdEhhc2hTZXRDb25zdFJldmVyc2VJdGVyYXRvcihjb25zdCBMaXN0SGFzaFNldFR5cGUqIHNl dCwgTm9kZSogcG9zaXRpb24pCi0gICAgICAgICAgICA6IG1fc2V0KHNldCkKLSAgICAgICAgICAg ICwgbV9wb3NpdGlvbihwb3NpdGlvbikKLSAgICAgICAgewotICAgICAgICB9Ci0KLSAgICBwdWJs aWM6Ci0gICAgICAgIExpc3RIYXNoU2V0Q29uc3RSZXZlcnNlSXRlcmF0b3IoKQotICAgICAgICB7 Ci0gICAgICAgIH0KLQotICAgICAgICBQb2ludGVyVHlwZSBnZXQoKSBjb25zdAotICAgICAgICB7 Ci0gICAgICAgICAgICByZXR1cm4gJm1fcG9zaXRpb24tPm1fdmFsdWU7Ci0gICAgICAgIH0KLSAg ICAgICAgUmVmZXJlbmNlVHlwZSBvcGVyYXRvciooKSBjb25zdCB7IHJldHVybiAqZ2V0KCk7IH0K LSAgICAgICAgUG9pbnRlclR5cGUgb3BlcmF0b3ItPigpIGNvbnN0IHsgcmV0dXJuIGdldCgpOyB9 Ci0KLSAgICAgICAgY29uc3RfcmV2ZXJzZV9pdGVyYXRvciYgb3BlcmF0b3IrKygpCi0gICAgICAg IHsKLSAgICAgICAgICAgIEFTU0VSVChtX3Bvc2l0aW9uICE9IDApOwotICAgICAgICAgICAgbV9w b3NpdGlvbiA9IG1fcG9zaXRpb24tPm1fcHJldjsKLSAgICAgICAgICAgIHJldHVybiAqdGhpczsK LSAgICAgICAgfQotCi0gICAgICAgIC8vIHBvc3RmaXggKysgaW50ZW50aW9uYWxseSBvbWl0dGVk Ci0KLSAgICAgICAgY29uc3RfcmV2ZXJzZV9pdGVyYXRvciYgb3BlcmF0b3ItLSgpCi0gICAgICAg IHsKLSAgICAgICAgICAgIEFTU0VSVChtX3Bvc2l0aW9uICE9IG1fc2V0LT5tX3RhaWwpOwotICAg ICAgICAgICAgaWYgKCFtX3Bvc2l0aW9uKQotICAgICAgICAgICAgICAgIG1fcG9zaXRpb24gPSBt X3NldC0+bV9oZWFkOwotICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgIG1fcG9zaXRp b24gPSBtX3Bvc2l0aW9uLT5tX25leHQ7Ci0gICAgICAgICAgICByZXR1cm4gKnRoaXM7Ci0gICAg ICAgIH0KLQotICAgICAgICAvLyBwb3N0Zml4IC0tIGludGVudGlvbmFsbHkgb21pdHRlZAotCi0g ICAgICAgIC8vIENvbXBhcmlzb24uCi0gICAgICAgIGJvb2wgb3BlcmF0b3I9PShjb25zdCBjb25z dF9yZXZlcnNlX2l0ZXJhdG9yJiBvdGhlcikgY29uc3QKLSAgICAgICAgewotICAgICAgICAgICAg cmV0dXJuIG1fcG9zaXRpb24gPT0gb3RoZXIubV9wb3NpdGlvbjsKLSAgICAgICAgfQotICAgICAg ICBib29sIG9wZXJhdG9yIT0oY29uc3QgY29uc3RfcmV2ZXJzZV9pdGVyYXRvciYgb3RoZXIpIGNv bnN0Ci0gICAgICAgIHsKLSAgICAgICAgICAgIHJldHVybiBtX3Bvc2l0aW9uICE9IG90aGVyLm1f cG9zaXRpb247Ci0gICAgICAgIH0KLQotICAgIHByaXZhdGU6Ci0gICAgICAgIE5vZGUqIG5vZGUo KSB7IHJldHVybiBtX3Bvc2l0aW9uOyB9Ci0KLSAgICAgICAgY29uc3QgTGlzdEhhc2hTZXRUeXBl KiBtX3NldDsKLSAgICAgICAgTm9kZSogbV9wb3NpdGlvbjsKLSAgICB9OwotCiAgICAgdGVtcGxh dGU8dHlwZW5hbWUgVmFsdWVUeXBlLCBzaXplX3QgaW5saW5lQ2FwYWNpdHksIHR5cGVuYW1lIEhh c2hGdW5jdGlvbnM+CiAgICAgc3RydWN0IExpc3RIYXNoU2V0VHJhbnNsYXRvciB7CiAgICAgcHJp dmF0ZToKQEAgLTU4NSwyNSArNDgxLDI1IEBAIG5hbWVzcGFjZSBXVEYgewogICAgIHRlbXBsYXRl PHR5cGVuYW1lIFQsIHNpemVfdCBpbmxpbmVDYXBhY2l0eSwgdHlwZW5hbWUgVT4KICAgICBpbmxp bmUgdHlwZW5hbWUgTGlzdEhhc2hTZXQ8VCwgaW5saW5lQ2FwYWNpdHksIFU+OjpyZXZlcnNlX2l0 ZXJhdG9yIExpc3RIYXNoU2V0PFQsIGlubGluZUNhcGFjaXR5LCBVPjo6cmJlZ2luKCkKICAgICB7 Ci0gICAgICAgIHJldHVybiBtYWtlUmV2ZXJzZUl0ZXJhdG9yKG1fdGFpbCk7IAorICAgICAgICBy ZXR1cm4gcmV2ZXJzZV9pdGVyYXRvcihlbmQoKSk7CiAgICAgfQogCiAgICAgdGVtcGxhdGU8dHlw ZW5hbWUgVCwgc2l6ZV90IGlubGluZUNhcGFjaXR5LCB0eXBlbmFtZSBVPgogICAgIGlubGluZSB0 eXBlbmFtZSBMaXN0SGFzaFNldDxULCBpbmxpbmVDYXBhY2l0eSwgVT46OnJldmVyc2VfaXRlcmF0 b3IgTGlzdEhhc2hTZXQ8VCwgaW5saW5lQ2FwYWNpdHksIFU+OjpyZW5kKCkKICAgICB7Ci0gICAg ICAgIHJldHVybiBtYWtlUmV2ZXJzZUl0ZXJhdG9yKDApOworICAgICAgICByZXR1cm4gcmV2ZXJz ZV9pdGVyYXRvcihiZWdpbigpKTsKICAgICB9CiAKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBULCBz aXplX3QgaW5saW5lQ2FwYWNpdHksIHR5cGVuYW1lIFU+CiAgICAgaW5saW5lIHR5cGVuYW1lIExp c3RIYXNoU2V0PFQsIGlubGluZUNhcGFjaXR5LCBVPjo6Y29uc3RfcmV2ZXJzZV9pdGVyYXRvciBM aXN0SGFzaFNldDxULCBpbmxpbmVDYXBhY2l0eSwgVT46OnJiZWdpbigpIGNvbnN0CiAgICAgewot ICAgICAgICByZXR1cm4gbWFrZUNvbnN0UmV2ZXJzZUl0ZXJhdG9yKG1fdGFpbCk7IAorICAgICAg ICByZXR1cm4gY29uc3RfcmV2ZXJzZV9pdGVyYXRvcihlbmQoKSk7CiAgICAgfQogCiAgICAgdGVt cGxhdGU8dHlwZW5hbWUgVCwgc2l6ZV90IGlubGluZUNhcGFjaXR5LCB0eXBlbmFtZSBVPgogICAg IGlubGluZSB0eXBlbmFtZSBMaXN0SGFzaFNldDxULCBpbmxpbmVDYXBhY2l0eSwgVT46OmNvbnN0 X3JldmVyc2VfaXRlcmF0b3IgTGlzdEhhc2hTZXQ8VCwgaW5saW5lQ2FwYWNpdHksIFU+OjpyZW5k KCkgY29uc3QKICAgICB7Ci0gICAgICAgIHJldHVybiBtYWtlQ29uc3RSZXZlcnNlSXRlcmF0b3Io MCk7IAorICAgICAgICByZXR1cm4gY29uc3RfcmV2ZXJzZV9pdGVyYXRvcihiZWdpbigpKTsKICAg ICB9CiAKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBULCBzaXplX3QgaW5saW5lQ2FwYWNpdHksIHR5 cGVuYW1lIFU+CkBAIC04MjUsMTggKzcyMSw2IEBAIG5hbWVzcGFjZSBXVEYgewogICAgIH0KIAog ICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQsIHNpemVfdCBpbmxpbmVDYXBhY2l0eSwgdHlwZW5hbWUg VT4KLSAgICBpbmxpbmUgTGlzdEhhc2hTZXRSZXZlcnNlSXRlcmF0b3I8VCwgaW5saW5lQ2FwYWNp dHksIFU+IExpc3RIYXNoU2V0PFQsIGlubGluZUNhcGFjaXR5LCBVPjo6bWFrZVJldmVyc2VJdGVy YXRvcihOb2RlKiBwb3NpdGlvbikgCi0gICAgewotICAgICAgICByZXR1cm4gTGlzdEhhc2hTZXRS ZXZlcnNlSXRlcmF0b3I8VCwgaW5saW5lQ2FwYWNpdHksIFU+KHRoaXMsIHBvc2l0aW9uKTsgCi0g ICAgfQotCi0gICAgdGVtcGxhdGU8dHlwZW5hbWUgVCwgc2l6ZV90IGlubGluZUNhcGFjaXR5LCB0 eXBlbmFtZSBVPgotICAgIGlubGluZSBMaXN0SGFzaFNldENvbnN0UmV2ZXJzZUl0ZXJhdG9yPFQs IGlubGluZUNhcGFjaXR5LCBVPiBMaXN0SGFzaFNldDxULCBpbmxpbmVDYXBhY2l0eSwgVT46Om1h a2VDb25zdFJldmVyc2VJdGVyYXRvcihOb2RlKiBwb3NpdGlvbikgY29uc3QKLSAgICB7IAotICAg ICAgICByZXR1cm4gTGlzdEhhc2hTZXRDb25zdFJldmVyc2VJdGVyYXRvcjxULCBpbmxpbmVDYXBh Y2l0eSwgVT4odGhpcywgcG9zaXRpb24pOyAKLSAgICB9Ci0gICAgCi0gICAgdGVtcGxhdGU8dHlw ZW5hbWUgVCwgc2l6ZV90IGlubGluZUNhcGFjaXR5LCB0eXBlbmFtZSBVPgogICAgIGlubGluZSBM aXN0SGFzaFNldEl0ZXJhdG9yPFQsIGlubGluZUNhcGFjaXR5LCBVPiBMaXN0SGFzaFNldDxULCBp bmxpbmVDYXBhY2l0eSwgVT46Om1ha2VJdGVyYXRvcihOb2RlKiBwb3NpdGlvbikgCiAgICAgewog ICAgICAgICByZXR1cm4gTGlzdEhhc2hTZXRJdGVyYXRvcjxULCBpbmxpbmVDYXBhY2l0eSwgVT4o dGhpcywgcG9zaXRpb24pOyAK