121802 2013-09-23 14:04:15 -0700 ListHashSet should work with move-only types 2013-09-23 14:38:51 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca benjamin cmarcelo commit-queue darin oldest_to_newest 932278 0 andersca 2013-09-23 14:04:15 -0700 ListHashSet should work with move-only types 932283 1 212389 andersca 2013-09-23 14:09:45 -0700 Created attachment 212389 Patch 932284 2 commit-queue 2013-09-23 14:12:54 -0700 Attachment 212389 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WTF/ChangeLog', u'Source/WTF/wtf/ListHashSet.h', u'Tools/ChangeLog', u'Tools/TestWebKitAPI/Tests/WTF/ListHashSet.cpp']" exit_code: 1 Source/WTF/wtf/ListHashSet.h:126: Missing spaces around && [whitespace/operators] [3] Source/WTF/wtf/ListHashSet.h:131: Missing spaces around && [whitespace/operators] [3] Source/WTF/wtf/ListHashSet.h:136: Missing spaces around && [whitespace/operators] [3] Source/WTF/wtf/ListHashSet.h:141: Missing spaces around && [whitespace/operators] [3] Source/WTF/wtf/ListHashSet.h:599: This { should be at the end of the previous line [whitespace/braces] [4] Source/WTF/wtf/ListHashSet.h:620: This { should be at the end of the previous line [whitespace/braces] [4] Source/WTF/wtf/ListHashSet.h:644: This { should be at the end of the previous line [whitespace/braces] [4] Source/WTF/wtf/ListHashSet.h:656: This { should be at the end of the previous line [whitespace/braces] [4] Source/WTF/wtf/ListHashSet.h:662: This { should be at the end of the previous line [whitespace/braces] [4] Total errors found: 9 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 932295 3 andersca 2013-09-23 14:38:51 -0700 Committed r156294: <http://trac.webkit.org/changeset/156294> 212389 2013-09-23 14:09:45 -0700 2013-09-23 14:33:29 -0700 Patch bug-121802-20130923140945.patch text/plain 11702 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTU2MjgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGYwZjJlZDkyODMxNjZjMTlkMTIwNDZk N2JjYjIxYTEzMWQ4ZWIwNmIuLjc5MWRjZGFhOTU4MzJkY2ZjMTYyM2UxZjBlZDRkNjZjOGVkMTgx MWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDUgKzEsMjcgQEAKIDIwMTMtMDktMjMgIEFuZGVycyBDYXJsc3NvbiAgPGFu ZGVyc2NhQGFwcGxlLmNvbT4KIAorICAgICAgICBMaXN0SGFzaFNldCBzaG91bGQgd29yayB3aXRo IG1vdmUtb25seSB0eXBlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTIxODAyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQWRkIHJ2YWx1ZSByZWZlcmVuY2Ugb3ZlcmxvYWRzIGFuZCBjYWxscyB0byBzdGQ6 OmZvcndhcmQgYW5kIHN0ZDo6bW92ZSB3aGVyZSBhcHByb3ByaWF0ZS4KKworICAgICAgICAqIHd0 Zi9MaXN0SGFzaFNldC5oOgorICAgICAgICAoV1RGOjo6OnJlbW92ZUZpcnN0KToKKyAgICAgICAg SW1wbGVtZW50IHRoaXMgaW4gdGVybXMgb2YgdGFrZUZpcnN0LgorCisgICAgICAgIChXVEY6Ojo6 dGFrZUZpcnN0KToKKyAgICAgICAgTG9vayB1cCB0aGUgaXRlcmF0b3IgYmVmb3JlIHdlIG1vdmUg b3V0IHRoZSB2YWx1ZSBzbyB3ZSB3b24ndCBicmVhayB0aGUgaGFzaCBpbnZhcmlhbnQuCisgICAg ICAgIAorICAgICAgICAoV1RGOjo6OnJlbW92ZUxhc3QpOgorICAgICAgICBJbXBsZW1lbnQgdGhp cyBpbiB0ZXJtcyBvZiB0YWtlTGFzdC4KKworICAgICAgICAoV1RGOjo6OnRha2VMYXN0KToKKyAg ICAgICAgTG9vayB1cCB0aGUgaXRlcmF0b3IgYmVmb3JlIHdlIG1vdmUgb3V0IHRoZSB2YWx1ZSBz byB3ZSB3b24ndCBicmVhayB0aGUgaGFzaCBpbnZhcmlhbnQuCisKKzIwMTMtMDktMjMgIEFuZGVy cyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwogICAgICAgICBDbGVhbiB1cCBMaXN0 SGFzaFNldAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTIxNzk3CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL0xpc3RIYXNoU2V0LmggYi9Tb3Vy Y2UvV1RGL3d0Zi9MaXN0SGFzaFNldC5oCmluZGV4IDkzMjZjZDM0ODY4YmE5MTA3ODk2NjY2M2I0 N2M0ODU3MzgyM2ZkZGQuLjFhYzIyMWRlYzljMGZlNDVjNzE0YzE1ZmU0MmU2ZDQ3ZGMyMTE0OWQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL0xpc3RIYXNoU2V0LmgKKysrIGIvU291cmNlL1dU Ri93dGYvTGlzdEhhc2hTZXQuaApAQCAtMTIzLDE3ICsxMjMsMjIgQEAgcHVibGljOgogICAgIC8v IFRoZSByZXR1cm4gdmFsdWUgb2YgYWRkIGlzIGEgcGFpciBvZiBhbiBpdGVyYXRvciB0byB0aGUg bmV3IHZhbHVlJ3MgbG9jYXRpb24sIAogICAgIC8vIGFuZCBhIGJvb2wgdGhhdCBpcyB0cnVlIGlm IGFuIG5ldyBlbnRyeSB3YXMgYWRkZWQuCiAgICAgQWRkUmVzdWx0IGFkZChjb25zdCBWYWx1ZVR5 cGUmKTsKKyAgICBBZGRSZXN1bHQgYWRkKFZhbHVlVHlwZSYmKTsKIAogICAgIC8vIEFkZCB0aGUg dmFsdWUgdG8gdGhlIGVuZCBvZiB0aGUgY29sbGVjdGlvbi4gSWYgdGhlIHZhbHVlIHdhcyBhbHJl YWR5IGluCiAgICAgLy8gdGhlIGxpc3QsIGl0IGlzIG1vdmVkIHRvIHRoZSBlbmQuCiAgICAgQWRk UmVzdWx0IGFwcGVuZE9yTW92ZVRvTGFzdChjb25zdCBWYWx1ZVR5cGUmKTsKKyAgICBBZGRSZXN1 bHQgYXBwZW5kT3JNb3ZlVG9MYXN0KFZhbHVlVHlwZSYmKTsKIAogICAgIC8vIEFkZCB0aGUgdmFs dWUgdG8gdGhlIGJlZ2lubmluZyBvZiB0aGUgY29sbGVjdGlvbi4gSWYgdGhlIHZhbHVlIHdhcyBh bHJlYWR5IGluCiAgICAgLy8gdGhlIGxpc3QsIGl0IGlzIG1vdmVkIHRvIHRoZSBiZWdpbm5pbmcu CiAgICAgQWRkUmVzdWx0IHByZXBlbmRPck1vdmVUb0ZpcnN0KGNvbnN0IFZhbHVlVHlwZSYpOwor ICAgIEFkZFJlc3VsdCBwcmVwZW5kT3JNb3ZlVG9GaXJzdChWYWx1ZVR5cGUmJik7CiAKICAgICBB ZGRSZXN1bHQgaW5zZXJ0QmVmb3JlKGNvbnN0IFZhbHVlVHlwZSYgYmVmb3JlVmFsdWUsIGNvbnN0 IFZhbHVlVHlwZSYgbmV3VmFsdWUpOworICAgIEFkZFJlc3VsdCBpbnNlcnRCZWZvcmUoY29uc3Qg VmFsdWVUeXBlJiBiZWZvcmVWYWx1ZSwgVmFsdWVUeXBlJiYgbmV3VmFsdWUpOwogICAgIEFkZFJl c3VsdCBpbnNlcnRCZWZvcmUoaXRlcmF0b3IsIGNvbnN0IFZhbHVlVHlwZSYpOworICAgIEFkZFJl c3VsdCBpbnNlcnRCZWZvcmUoaXRlcmF0b3IsIFZhbHVlVHlwZSYmKTsKIAogICAgIGJvb2wgcmVt b3ZlKGNvbnN0IFZhbHVlVHlwZSYpOwogICAgIGJvb2wgcmVtb3ZlKGl0ZXJhdG9yKTsKQEAgLTIy OSw4ICsyMzQsOSBAQCBwcml2YXRlOgogdGVtcGxhdGU8dHlwZW5hbWUgVmFsdWVBcmcsIHNpemVf dCBpbmxpbmVDYXBhY2l0eT4gc3RydWN0IExpc3RIYXNoU2V0Tm9kZSB7CiAgICAgdHlwZWRlZiBM aXN0SGFzaFNldE5vZGVBbGxvY2F0b3I8VmFsdWVBcmcsIGlubGluZUNhcGFjaXR5PiBOb2RlQWxs b2NhdG9yOwogCi0gICAgTGlzdEhhc2hTZXROb2RlKFZhbHVlQXJnIHZhbHVlKQotICAgICAgICA6 IG1fdmFsdWUodmFsdWUpCisgICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4KKyAgICBMaXN0SGFzaFNl dE5vZGUoVCYmIHZhbHVlKQorICAgICAgICA6IG1fdmFsdWUoc3RkOjpmb3J3YXJkPFQ+KHZhbHVl KSkKICAgICAgICAgLCBtX3ByZXYoMCkKICAgICAgICAgLCBtX25leHQoMCkKICNpZm5kZWYgTkRF QlVHCkBAIC0zODksOSArMzk1LDkgQEAgdGVtcGxhdGU8dHlwZW5hbWUgSGFzaEZ1bmN0aW9ucz4K IHN0cnVjdCBMaXN0SGFzaFNldFRyYW5zbGF0b3IgewogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQ+ IHN0YXRpYyB1bnNpZ25lZCBoYXNoKGNvbnN0IFQmIGtleSkgeyByZXR1cm4gSGFzaEZ1bmN0aW9u czo6aGFzaChrZXkpOyB9CiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgVCwgdHlwZW5hbWUgVT4gc3Rh dGljIGJvb2wgZXF1YWwoY29uc3QgVCYgYSwgY29uc3QgVSYgYikgeyByZXR1cm4gSGFzaEZ1bmN0 aW9uczo6ZXF1YWwoYS0+bV92YWx1ZSwgYik7IH0KLSAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBULCB0 eXBlbmFtZSBVLCB0eXBlbmFtZSBWPiBzdGF0aWMgdm9pZCB0cmFuc2xhdGUoVComIGxvY2F0aW9u LCBjb25zdCBVJiBrZXksIGNvbnN0IFYmIGFsbG9jYXRvcikKKyAgICB0ZW1wbGF0ZTx0eXBlbmFt ZSBULCB0eXBlbmFtZSBVLCB0eXBlbmFtZSBWPiBzdGF0aWMgdm9pZCB0cmFuc2xhdGUoVComIGxv Y2F0aW9uLCBVJiYga2V5LCBjb25zdCBWJiBhbGxvY2F0b3IpCiAgICAgewotICAgICAgICBsb2Nh dGlvbiA9IG5ldyAoYWxsb2NhdG9yKSBUKGtleSk7CisgICAgICAgIGxvY2F0aW9uID0gbmV3IChh bGxvY2F0b3IpIFQoc3RkOjpmb3J3YXJkPFU+KGtleSkpOwogICAgIH0KIH07CiAKQEAgLTQ2NCwx NiArNDcwLDE5IEBAIGlubGluZSBUJiBMaXN0SGFzaFNldDxULCBpbmxpbmVDYXBhY2l0eSwgVT46 OmZpcnN0KCkKIHRlbXBsYXRlPHR5cGVuYW1lIFQsIHNpemVfdCBpbmxpbmVDYXBhY2l0eSwgdHlw ZW5hbWUgVT4KIGlubGluZSB2b2lkIExpc3RIYXNoU2V0PFQsIGlubGluZUNhcGFjaXR5LCBVPjo6 cmVtb3ZlRmlyc3QoKQogewotICAgIEFTU0VSVCghaXNFbXB0eSgpKTsKLSAgICBtX2ltcGwucmVt b3ZlKG1faGVhZCk7Ci0gICAgdW5saW5rQW5kRGVsZXRlKG1faGVhZCk7CisgICAgdGFrZUZpcnN0 KCk7CiB9CiAKIHRlbXBsYXRlPHR5cGVuYW1lIFQsIHNpemVfdCBpbmxpbmVDYXBhY2l0eSwgdHlw ZW5hbWUgVT4KIGlubGluZSBUIExpc3RIYXNoU2V0PFQsIGlubGluZUNhcGFjaXR5LCBVPjo6dGFr ZUZpcnN0KCkKIHsKLSAgICBUIHJlc3VsdCA9IGZpcnN0KCk7Ci0gICAgcmVtb3ZlRmlyc3QoKTsK KyAgICBBU1NFUlQoIWlzRW1wdHkoKSk7CisgICAgYXV0byBpdCA9IG1faW1wbC5maW5kKG1faGVh ZCk7CisKKyAgICBUIHJlc3VsdCA9IHN0ZDo6bW92ZSgoKml0KS0+bV92YWx1ZSk7CisgICAgbV9p bXBsLnJlbW92ZShpdCk7CisgICAgdW5saW5rQW5kRGVsZXRlKG1faGVhZCk7CisKICAgICByZXR1 cm4gcmVzdWx0OwogfQogCkBAIC01MDEsNyArNTEwLDcgQEAgaW5saW5lIGNvbnN0IFQmIExpc3RI YXNoU2V0PFQsIGlubGluZUNhcGFjaXR5LCBVPjo6bGFzdCgpIGNvbnN0CiB0ZW1wbGF0ZTx0eXBl bmFtZSBULCBzaXplX3QgaW5saW5lQ2FwYWNpdHksIHR5cGVuYW1lIFU+CiBpbmxpbmUgdm9pZCBM aXN0SGFzaFNldDxULCBpbmxpbmVDYXBhY2l0eSwgVT46OnJlbW92ZUxhc3QoKQogewotICAgIEFT U0VSVCghaXNFbXB0eSgpKTsKKyAgICB0YWtlTGFzdCgpOwogICAgIG1faW1wbC5yZW1vdmUobV90 YWlsKTsKICAgICB1bmxpbmtBbmREZWxldGUobV90YWlsKTsKIH0KQEAgLTUwOSw4ICs1MTgsMTMg QEAgaW5saW5lIHZvaWQgTGlzdEhhc2hTZXQ8VCwgaW5saW5lQ2FwYWNpdHksIFU+OjpyZW1vdmVM YXN0KCkKIHRlbXBsYXRlPHR5cGVuYW1lIFQsIHNpemVfdCBpbmxpbmVDYXBhY2l0eSwgdHlwZW5h bWUgVT4KIGlubGluZSBUIExpc3RIYXNoU2V0PFQsIGlubGluZUNhcGFjaXR5LCBVPjo6dGFrZUxh c3QoKQogewotICAgIFQgcmVzdWx0ID0gbGFzdCgpOwotICAgIHJlbW92ZUxhc3QoKTsKKyAgICBB U1NFUlQoIWlzRW1wdHkoKSk7CisgICAgYXV0byBpdCA9IG1faW1wbC5maW5kKG1fdGFpbCk7CisK KyAgICBUIHJlc3VsdCA9IHN0ZDo6bW92ZSgoKml0KS0+bV92YWx1ZSk7CisgICAgbV9pbXBsLnJl bW92ZShpdCk7CisgICAgdW5saW5rQW5kRGVsZXRlKG1fdGFpbCk7CisKICAgICByZXR1cm4gcmVz dWx0OwogfQogCkBAIC01NzIsNyArNTg2LDcgQEAgaW5saW5lIGJvb2wgTGlzdEhhc2hTZXQ8VCwg aW5saW5lQ2FwYWNpdHksIFU+Ojpjb250YWlucyhjb25zdCBWYWx1ZVR5cGUmIHZhbHVlKQogfQog CiB0ZW1wbGF0ZTx0eXBlbmFtZSBULCBzaXplX3QgaW5saW5lQ2FwYWNpdHksIHR5cGVuYW1lIFU+ Ci1hdXRvIExpc3RIYXNoU2V0PFQsIGlubGluZUNhcGFjaXR5LCBVPjo6YWRkKGNvbnN0IFZhbHVl VHlwZSAmdmFsdWUpIC0+IEFkZFJlc3VsdAorYXV0byBMaXN0SGFzaFNldDxULCBpbmxpbmVDYXBh Y2l0eSwgVT46OmFkZChjb25zdCBWYWx1ZVR5cGUmIHZhbHVlKSAtPiBBZGRSZXN1bHQKIHsKICAg ICBhdXRvIHJlc3VsdCA9IG1faW1wbC50ZW1wbGF0ZSBhZGQ8QmFzZVRyYW5zbGF0b3I+KHZhbHVl LCBtX2FsbG9jYXRvci5nZXQoKSk7CiAgICAgaWYgKHJlc3VsdC5pc05ld0VudHJ5KQpAQCAtNTgx LDcgKzU5NSwxNiBAQCBhdXRvIExpc3RIYXNoU2V0PFQsIGlubGluZUNhcGFjaXR5LCBVPjo6YWRk KGNvbnN0IFZhbHVlVHlwZSAmdmFsdWUpIC0+IEFkZFJlc3VsdAogfQogCiB0ZW1wbGF0ZTx0eXBl bmFtZSBULCBzaXplX3QgaW5saW5lQ2FwYWNpdHksIHR5cGVuYW1lIFU+Ci1hdXRvIExpc3RIYXNo U2V0PFQsIGlubGluZUNhcGFjaXR5LCBVPjo6YXBwZW5kT3JNb3ZlVG9MYXN0KGNvbnN0IFZhbHVl VHlwZSAmdmFsdWUpIC0+IEFkZFJlc3VsdAorYXV0byBMaXN0SGFzaFNldDxULCBpbmxpbmVDYXBh Y2l0eSwgVT46OmFkZChWYWx1ZVR5cGUmJiB2YWx1ZSkgLT4gQWRkUmVzdWx0Cit7CisgICAgYXV0 byByZXN1bHQgPSBtX2ltcGwudGVtcGxhdGUgYWRkPEJhc2VUcmFuc2xhdG9yPihzdGQ6Om1vdmUo dmFsdWUpLCBtX2FsbG9jYXRvci5nZXQoKSk7CisgICAgaWYgKHJlc3VsdC5pc05ld0VudHJ5KQor ICAgICAgICBhcHBlbmROb2RlKCpyZXN1bHQuaXRlcmF0b3IpOworICAgIHJldHVybiBBZGRSZXN1 bHQobWFrZUl0ZXJhdG9yKCpyZXN1bHQuaXRlcmF0b3IpLCByZXN1bHQuaXNOZXdFbnRyeSk7Cit9 CisKK3RlbXBsYXRlPHR5cGVuYW1lIFQsIHNpemVfdCBpbmxpbmVDYXBhY2l0eSwgdHlwZW5hbWUg VT4KK2F1dG8gTGlzdEhhc2hTZXQ8VCwgaW5saW5lQ2FwYWNpdHksIFU+OjphcHBlbmRPck1vdmVU b0xhc3QoY29uc3QgVmFsdWVUeXBlJiB2YWx1ZSkgLT4gQWRkUmVzdWx0CiB7CiAgICAgYXV0byBy ZXN1bHQgPSBtX2ltcGwudGVtcGxhdGUgYWRkPEJhc2VUcmFuc2xhdG9yPih2YWx1ZSwgbV9hbGxv Y2F0b3IuZ2V0KCkpOwogICAgIE5vZGUqIG5vZGUgPSAqcmVzdWx0Lml0ZXJhdG9yOwpAQCAtNTkz LDcgKzYxNiwxOSBAQCBhdXRvIExpc3RIYXNoU2V0PFQsIGlubGluZUNhcGFjaXR5LCBVPjo6YXBw ZW5kT3JNb3ZlVG9MYXN0KGNvbnN0IFZhbHVlVHlwZSAmdmFsdQogfQogCiB0ZW1wbGF0ZTx0eXBl bmFtZSBULCBzaXplX3QgaW5saW5lQ2FwYWNpdHksIHR5cGVuYW1lIFU+Ci1hdXRvIExpc3RIYXNo U2V0PFQsIGlubGluZUNhcGFjaXR5LCBVPjo6cHJlcGVuZE9yTW92ZVRvRmlyc3QoY29uc3QgVmFs dWVUeXBlICZ2YWx1ZSkgLT4gQWRkUmVzdWx0CithdXRvIExpc3RIYXNoU2V0PFQsIGlubGluZUNh cGFjaXR5LCBVPjo6YXBwZW5kT3JNb3ZlVG9MYXN0KFZhbHVlVHlwZSYmIHZhbHVlKSAtPiBBZGRS ZXN1bHQKK3sKKyAgICBhdXRvIHJlc3VsdCA9IG1faW1wbC50ZW1wbGF0ZSBhZGQ8QmFzZVRyYW5z bGF0b3I+KHN0ZDo6bW92ZSh2YWx1ZSksIG1fYWxsb2NhdG9yLmdldCgpKTsKKyAgICBOb2RlKiBu b2RlID0gKnJlc3VsdC5pdGVyYXRvcjsKKyAgICBpZiAoIXJlc3VsdC5pc05ld0VudHJ5KQorICAg ICAgICB1bmxpbmsobm9kZSk7CisgICAgYXBwZW5kTm9kZShub2RlKTsKKworICAgIHJldHVybiBB ZGRSZXN1bHQobWFrZUl0ZXJhdG9yKCpyZXN1bHQuaXRlcmF0b3IpLCByZXN1bHQuaXNOZXdFbnRy eSk7Cit9CisKK3RlbXBsYXRlPHR5cGVuYW1lIFQsIHNpemVfdCBpbmxpbmVDYXBhY2l0eSwgdHlw ZW5hbWUgVT4KK2F1dG8gTGlzdEhhc2hTZXQ8VCwgaW5saW5lQ2FwYWNpdHksIFU+OjpwcmVwZW5k T3JNb3ZlVG9GaXJzdChjb25zdCBWYWx1ZVR5cGUmIHZhbHVlKSAtPiBBZGRSZXN1bHQKIHsKICAg ICBhdXRvIHJlc3VsdCA9IG1faW1wbC50ZW1wbGF0ZSBhZGQ8QmFzZVRyYW5zbGF0b3I+KHZhbHVl LCBtX2FsbG9jYXRvci5nZXQoKSk7CiAgICAgTm9kZSogbm9kZSA9ICpyZXN1bHQuaXRlcmF0b3I7 CkBAIC02MDUsNiArNjQwLDMwIEBAIGF1dG8gTGlzdEhhc2hTZXQ8VCwgaW5saW5lQ2FwYWNpdHks IFU+OjpwcmVwZW5kT3JNb3ZlVG9GaXJzdChjb25zdCBWYWx1ZVR5cGUgJnZhCiB9CiAKIHRlbXBs YXRlPHR5cGVuYW1lIFQsIHNpemVfdCBpbmxpbmVDYXBhY2l0eSwgdHlwZW5hbWUgVT4KK2F1dG8g TGlzdEhhc2hTZXQ8VCwgaW5saW5lQ2FwYWNpdHksIFU+OjpwcmVwZW5kT3JNb3ZlVG9GaXJzdChW YWx1ZVR5cGUmJiB2YWx1ZSkgLT4gQWRkUmVzdWx0Cit7CisgICAgYXV0byByZXN1bHQgPSBtX2lt cGwudGVtcGxhdGUgYWRkPEJhc2VUcmFuc2xhdG9yPihzdGQ6Om1vdmUodmFsdWUpLCBtX2FsbG9j YXRvci5nZXQoKSk7CisgICAgTm9kZSogbm9kZSA9ICpyZXN1bHQuaXRlcmF0b3I7CisgICAgaWYg KCFyZXN1bHQuaXNOZXdFbnRyeSkKKyAgICAgICAgdW5saW5rKG5vZGUpOworICAgIHByZXBlbmRO b2RlKG5vZGUpOworCisgICAgcmV0dXJuIEFkZFJlc3VsdChtYWtlSXRlcmF0b3IoKnJlc3VsdC5p dGVyYXRvciksIHJlc3VsdC5pc05ld0VudHJ5KTsKK30KKwordGVtcGxhdGU8dHlwZW5hbWUgVCwg c2l6ZV90IGlubGluZUNhcGFjaXR5LCB0eXBlbmFtZSBVPgorYXV0byBMaXN0SGFzaFNldDxULCBp bmxpbmVDYXBhY2l0eSwgVT46Omluc2VydEJlZm9yZShjb25zdCBWYWx1ZVR5cGUmIGJlZm9yZVZh bHVlLCBjb25zdCBWYWx1ZVR5cGUmIG5ld1ZhbHVlKSAtPiBBZGRSZXN1bHQKK3sKKyAgICByZXR1 cm4gaW5zZXJ0QmVmb3JlKGZpbmQoYmVmb3JlVmFsdWUpLCBuZXdWYWx1ZSk7Cit9CisKK3RlbXBs YXRlPHR5cGVuYW1lIFQsIHNpemVfdCBpbmxpbmVDYXBhY2l0eSwgdHlwZW5hbWUgVT4KK2F1dG8g TGlzdEhhc2hTZXQ8VCwgaW5saW5lQ2FwYWNpdHksIFU+OjppbnNlcnRCZWZvcmUoY29uc3QgVmFs dWVUeXBlJiBiZWZvcmVWYWx1ZSwgVmFsdWVUeXBlJiYgbmV3VmFsdWUpIC0+IEFkZFJlc3VsdAor eworICAgIHJldHVybiBpbnNlcnRCZWZvcmUoZmluZChiZWZvcmVWYWx1ZSksIHN0ZDo6bW92ZShu ZXdWYWx1ZSkpOworfQorCit0ZW1wbGF0ZTx0eXBlbmFtZSBULCBzaXplX3QgaW5saW5lQ2FwYWNp dHksIHR5cGVuYW1lIFU+CiBhdXRvIExpc3RIYXNoU2V0PFQsIGlubGluZUNhcGFjaXR5LCBVPjo6 aW5zZXJ0QmVmb3JlKGl0ZXJhdG9yIGl0LCBjb25zdCBWYWx1ZVR5cGUmIG5ld1ZhbHVlKSAtPiBB ZGRSZXN1bHQKIHsKICAgICBhdXRvIHJlc3VsdCA9IG1faW1wbC50ZW1wbGF0ZSBhZGQ8QmFzZVRy YW5zbGF0b3I+KG5ld1ZhbHVlLCBtX2FsbG9jYXRvci5nZXQoKSk7CkBAIC02MTQsOSArNjczLDEy IEBAIGF1dG8gTGlzdEhhc2hTZXQ8VCwgaW5saW5lQ2FwYWNpdHksIFU+OjppbnNlcnRCZWZvcmUo aXRlcmF0b3IgaXQsIGNvbnN0IFZhbHVlVHlwCiB9CiAKIHRlbXBsYXRlPHR5cGVuYW1lIFQsIHNp emVfdCBpbmxpbmVDYXBhY2l0eSwgdHlwZW5hbWUgVT4KLWF1dG8gTGlzdEhhc2hTZXQ8VCwgaW5s aW5lQ2FwYWNpdHksIFU+OjppbnNlcnRCZWZvcmUoY29uc3QgVmFsdWVUeXBlJiBiZWZvcmVWYWx1 ZSwgY29uc3QgVmFsdWVUeXBlJiBuZXdWYWx1ZSkgLT4gQWRkUmVzdWx0CithdXRvIExpc3RIYXNo U2V0PFQsIGlubGluZUNhcGFjaXR5LCBVPjo6aW5zZXJ0QmVmb3JlKGl0ZXJhdG9yIGl0LCBWYWx1 ZVR5cGUmJiBuZXdWYWx1ZSkgLT4gQWRkUmVzdWx0CiB7Ci0gICAgcmV0dXJuIGluc2VydEJlZm9y ZShmaW5kKGJlZm9yZVZhbHVlKSwgbmV3VmFsdWUpOyAKKyAgICBhdXRvIHJlc3VsdCA9IG1faW1w bC50ZW1wbGF0ZSBhZGQ8QmFzZVRyYW5zbGF0b3I+KHN0ZDo6bW92ZShuZXdWYWx1ZSksIG1fYWxs b2NhdG9yLmdldCgpKTsKKyAgICBpZiAocmVzdWx0LmlzTmV3RW50cnkpCisgICAgICAgIGluc2Vy dE5vZGVCZWZvcmUoaXQubm9kZSgpLCAqcmVzdWx0Lml0ZXJhdG9yKTsKKyAgICByZXR1cm4gQWRk UmVzdWx0KG1ha2VJdGVyYXRvcigqcmVzdWx0Lml0ZXJhdG9yKSwgcmVzdWx0LmlzTmV3RW50cnkp OwogfQogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBULCBzaXplX3QgaW5saW5lQ2FwYWNpdHksIHR5cGVu YW1lIFU+CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5k ZXggNWQyYjkwMDgyMjQzZWNhMWU0OTVmMDNhMjRhMzJiOWZjZDJhMjA0Zi4uNTdhOGE2ZjY0YTVm YTM4MzJkZTE4NmViMjJmNzM0YmFmZWRlZDljYiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9n CisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE2IEBACiAyMDEzLTA5LTIzICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgTGlzdEhhc2hTZXQg c2hvdWxkIHdvcmsgd2l0aCBtb3ZlLW9ubHkgdHlwZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMTgwMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XVEYvTGlzdEhh c2hTZXQuY3BwOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6VEVTVCk6CisgICAgICAgIEFkZCBh IHRlc3QgZm9yIG1vdmUtb25seSB0eXBlcy4KKworMjAxMy0wOS0yMyAgQW5kZXJzIENhcmxzc29u ICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIExpc3RIYXNoU2V0IHNob3VsZCB1c2Ug c3RkOjpyZXZlcnNlX2l0ZXJhdG9yIGZvciByZXZlcnNlIGl0ZXJhdG9ycwogICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIxNzk1CiAKZGlmZiAtLWdpdCBh L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV1RGL0xpc3RIYXNoU2V0LmNwcCBiL1Rvb2xzL1Rl c3RXZWJLaXRBUEkvVGVzdHMvV1RGL0xpc3RIYXNoU2V0LmNwcAppbmRleCBiOTQ2ZmEwN2UyNzdh M2FjNDQzMjNlNTY5MWFkYjc0ZTE0MTA3Y2QwLi5kMjdmOTEzODJiZWE5NWEyYzlmNTIyYmM3ZWRl NTdjZGFjNTExYjU5IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dURi9M aXN0SGFzaFNldC5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XVEYvTGlzdEhh c2hTZXQuY3BwCkBAIC0yNSw2ICsyNSw3IEBACiAKICNpbmNsdWRlICJjb25maWcuaCIKIAorI2lu Y2x1ZGUgIk1vdmVPbmx5LmgiCiAjaW5jbHVkZSA8d3RmL0xpc3RIYXNoU2V0Lmg+CiAKIG5hbWVz cGFjZSBUZXN0V2ViS2l0QVBJIHsKQEAgLTE5OSw0ICsyMDAsNTEgQEAgVEVTVChXVEZfTGlzdEhh c2hTZXQsIFJldmVyc2VJdGVyYXRvcikKICAgICBBU1NFUlRfVFJVRShjb25zdEl0ID09IGxpc3RI YXNoU2V0LnJlbmQoKSk7CiB9CiAKK1RFU1QoV1RGX0xpc3RIYXNoU2V0LCBNb3ZlT25seSkKK3sK KyAgICBMaXN0SGFzaFNldDxNb3ZlT25seT4gbGlzdDsKKyAgICBsaXN0LmFkZChNb3ZlT25seSgy KSk7CisgICAgbGlzdC5hZGQoTW92ZU9ubHkoNCkpOworCisgICAgLy8geyAyLCA0IH0KKyAgICBB U1NFUlRfRVEoMlUsIGxpc3QuZmlyc3QoKS52YWx1ZSgpKTsKKyAgICBBU1NFUlRfRVEoNFUsIGxp c3QubGFzdCgpLnZhbHVlKCkpOworCisgICAgbGlzdC5hcHBlbmRPck1vdmVUb0xhc3QoTW92ZU9u bHkoMykpOworCisgICAgLy8geyAyLCA0LCAzIH0KKyAgICBBU1NFUlRfRVEoM1UsIGxpc3QubGFz dCgpLnZhbHVlKCkpOworCisgICAgLy8geyA0LCAzLCAyIH0KKyAgICBsaXN0LmFwcGVuZE9yTW92 ZVRvTGFzdChNb3ZlT25seSgyKSk7CisgICAgQVNTRVJUX0VRKDRVLCBsaXN0LmZpcnN0KCkudmFs dWUoKSk7CisgICAgQVNTRVJUX0VRKDJVLCBsaXN0Lmxhc3QoKS52YWx1ZSgpKTsKKworICAgIGxp c3QucHJlcGVuZE9yTW92ZVRvRmlyc3QoTW92ZU9ubHkoNSkpOworCisgICAgLy8geyA1LCAyLCA0 LCAzIH0KKyAgICBBU1NFUlRfRVEoNVUsIGxpc3QuZmlyc3QoKS52YWx1ZSgpKTsKKworICAgIGxp c3QucHJlcGVuZE9yTW92ZVRvRmlyc3QoTW92ZU9ubHkoMykpOworCisgICAgLy8geyAzLCA1LCA0 LCAyIH0KKyAgICBBU1NFUlRfRVEoM1UsIGxpc3QuZmlyc3QoKS52YWx1ZSgpKTsKKyAgICBBU1NF UlRfRVEoMlUsIGxpc3QubGFzdCgpLnZhbHVlKCkpOworCisgICAgbGlzdC5pbnNlcnRCZWZvcmUo TW92ZU9ubHkoNCksIE1vdmVPbmx5KDEpKTsKKyAgICBsaXN0Lmluc2VydEJlZm9yZShsaXN0LmVu ZCgpLCBNb3ZlT25seSg2KSk7CisKKyAgICAvLyB7IDMsIDUsIDEsIDQsIDIsIDYgfQorICAgIEFT U0VSVF9FUSgzVSwgbGlzdC50YWtlRmlyc3QoKS52YWx1ZSgpKTsKKyAgICBBU1NFUlRfRVEoNVUs IGxpc3QudGFrZUZpcnN0KCkudmFsdWUoKSk7CisgICAgQVNTRVJUX0VRKDFVLCBsaXN0LnRha2VG aXJzdCgpLnZhbHVlKCkpOworCisgICAgLy8geyA0LCAyLCA2IH0KKyAgICBBU1NFUlRfRVEoNlUs IGxpc3QudGFrZUxhc3QoKS52YWx1ZSgpKTsKKyAgICBBU1NFUlRfRVEoMlUsIGxpc3QudGFrZUxh c3QoKS52YWx1ZSgpKTsKKyAgICBBU1NFUlRfRVEoNFUsIGxpc3QudGFrZUxhc3QoKS52YWx1ZSgp KTsKKworICAgIEFTU0VSVF9UUlVFKGxpc3QuaXNFbXB0eSgpKTsKK30KKwogfSAvLyBuYW1lc3Bh Y2UgVGVzdFdlYktpdEFQSQo=