173609 2017-06-20 11:27:56 -0700 Make it clear that regenerating ICs are holding the CodeBlock's lock by passing the locker as a parameter 2017-06-21 11:42:49 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 saam saam benjamin commit-queue fpizlo ggaren gskachkov jfbastien keith_miller mark.lam msaboff ticaiolima ysuzuki oldest_to_newest 1321172 0 saam 2017-06-20 11:27:56 -0700 ... 1321188 1 313421 saam 2017-06-20 12:23:02 -0700 Created attachment 313421 patch 1321189 2 313421 keith_miller 2017-06-20 12:24:32 -0700 Comment on attachment 313421 patch r=me. 1321574 3 313421 commit-queue 2017-06-21 11:42:47 -0700 Comment on attachment 313421 patch Clearing flags on attachment: 313421 Committed r218641: <http://trac.webkit.org/changeset/218641> 1321575 4 commit-queue 2017-06-21 11:42:49 -0700 All reviewed patches have been landed. Closing bug. 313421 2017-06-20 12:23:02 -0700 2017-06-21 11:42:47 -0700 patch b-backup.diff text/plain 15392 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjE4NjA1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM0IEBA CisyMDE3LTA2LTIwICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IE1ha2UgaXQgY2xlYXIgdGhhdCByZWdlbmVyYXRpbmcgSUNzIGFyZSBob2xkaW5nIHRoZSBDb2Rl QmxvY2sncyBsb2NrIGJ5IHBhc3NpbmcgdGhlIGxvY2tlciBhcyBhIHBhcmFtZXRlcgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTczNjA5CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBtYWtl cyBtYW55IG9mIHRoZSBJQyBnZW5lcmF0aW5nIGZ1bmN0aW9ucyByZXF1aXJlIGEgbG9ja2VyIGFz CisgICAgICAgIGEgcGFyYW1ldGVyLiBXZSBkbyB0aGlzIGluIG90aGVyIHBsYWNlcyBpbiBKU0Mg dG8gaW5kaWNhdGUgdGhhdAorICAgICAgICBhIHBhcnRpY3VsYXIgQVBJIGlzIG9ubHkgdmFsaWQg d2hpbGUgYSBwYXJ0aWN1bGFyIGxvY2sgaXMgaGVsZC4KKyAgICAgICAgVGhpcyBpcyB0aGUgY2Fz ZSB3aGVuIGdlbmVyYXRpbmcgSUNzLiBUaGlzIHBhdGNoIGp1c3QgbWFrZXMgaXQKKyAgICAgICAg ZXhwbGljaXQgaW4gdGhlIElDIGdlbmVyYXRpbmcgaW50ZXJmYWNlLgorCisgICAgICAgICogYnl0 ZWNvZGUvUG9seW1vcnBoaWNBY2Nlc3MuY3BwOgorICAgICAgICAoSlNDOjpQb2x5bW9ycGhpY0Fj Y2Vzczo6YWRkQ2FzZXMpOgorICAgICAgICAoSlNDOjpQb2x5bW9ycGhpY0FjY2Vzczo6YWRkQ2Fz ZSk6CisgICAgICAgIChKU0M6OlBvbHltb3JwaGljQWNjZXNzOjpjb21taXQpOgorICAgICAgICAo SlNDOjpQb2x5bW9ycGhpY0FjY2Vzczo6cmVnZW5lcmF0ZSk6CisgICAgICAgICogYnl0ZWNvZGUv UG9seW1vcnBoaWNBY2Nlc3MuaDoKKyAgICAgICAgKiBieXRlY29kZS9TdHJ1Y3R1cmVTdHViSW5m by5jcHA6CisgICAgICAgIChKU0M6OlN0cnVjdHVyZVN0dWJJbmZvOjphZGRBY2Nlc3NDYXNlKToK KyAgICAgICAgKEpTQzo6U3RydWN0dXJlU3R1YkluZm86OmluaXRTdHViKTogRGVsZXRlZC4KKyAg ICAgICAgKiBieXRlY29kZS9TdHJ1Y3R1cmVTdHViSW5mby5oOgorICAgICAgICAqIGppdC9SZXBh dGNoLmNwcDoKKyAgICAgICAgKEpTQzo6dHJ5Q2FjaGVHZXRCeUlEKToKKyAgICAgICAgKEpTQzo6 cmVwYXRjaEdldEJ5SUQpOgorICAgICAgICAoSlNDOjp0cnlDYWNoZVB1dEJ5SUQpOgorICAgICAg ICAoSlNDOjpyZXBhdGNoUHV0QnlJRCk6CisgICAgICAgIChKU0M6OnRyeVJlcGF0Y2hJbik6Cisg ICAgICAgIChKU0M6OnJlcGF0Y2hJbik6CisKIDIwMTctMDYtMjAgIEtvbnN0YW50aW4gVG9rYXJl diAgPGFubnVsZW5AeWFuZGV4LnJ1PgogCiAgICAgICAgIFJlbW92ZSBleGNlc3NpdmUgaW5jbHVk ZSBkaXJlY3RpdmVzIGZyb20gV1RGCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNv ZGUvUG9seW1vcnBoaWNBY2Nlc3MuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ieXRlY29kZS9Qb2x5bW9ycGhpY0FjY2Vzcy5jcHAJKHJldmlzaW9uIDIxODYwMCkKKysr IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Qb2x5bW9ycGhpY0FjY2Vzcy5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTIxMCw4ICsyMTAsOCBAQCBQb2x5bW9ycGhpY0FjY2Vzczo6UG9seW1v cnBoaWNBY2Nlc3MoKSB7CiBQb2x5bW9ycGhpY0FjY2Vzczo6flBvbHltb3JwaGljQWNjZXNzKCkg eyB9CiAKIEFjY2Vzc0dlbmVyYXRpb25SZXN1bHQgUG9seW1vcnBoaWNBY2Nlc3M6OmFkZENhc2Vz KAotICAgIFZNJiB2bSwgQ29kZUJsb2NrKiBjb2RlQmxvY2ssIFN0cnVjdHVyZVN0dWJJbmZvJiBz dHViSW5mbywgY29uc3QgSWRlbnRpZmllciYgaWRlbnQsCi0gICAgVmVjdG9yPHN0ZDo6dW5pcXVl X3B0cjxBY2Nlc3NDYXNlPiwgMj4gb3JpZ2luYWxDYXNlc1RvQWRkKQorICAgIGNvbnN0IEdDU2Fm ZUNvbmN1cnJlbnRKU0xvY2tlciYgbG9ja2VyLCBWTSYgdm0sIENvZGVCbG9jayogY29kZUJsb2Nr LCBTdHJ1Y3R1cmVTdHViSW5mbyYgc3R1YkluZm8sCisgICAgY29uc3QgSWRlbnRpZmllciYgaWRl bnQsIFZlY3RvcjxzdGQ6OnVuaXF1ZV9wdHI8QWNjZXNzQ2FzZT4sIDI+IG9yaWdpbmFsQ2FzZXNU b0FkZCkKIHsKICAgICBTdXBlclNhbXBsZXJTY29wZSBzdXBlclNhbXBsZXJTY29wZShmYWxzZSk7 CiAgICAgCkBAIC0yNTgsNyArMjU4LDcgQEAgQWNjZXNzR2VuZXJhdGlvblJlc3VsdCBQb2x5bW9y cGhpY0FjY2VzcwogICAgIC8vIE5vdyBhZGQgdGhpbmdzIHRvIHRoZSBuZXcgbGlzdC4gTm90ZSB0 aGF0IGF0IHRoaXMgcG9pbnQsIHdlIHdpbGwgc3RpbGwgaGF2ZSBvbGQgY2FzZXMgdGhhdAogICAg IC8vIG1heSBiZSByZXBsYWNlZCBieSB0aGUgbmV3IG9uZXMuIFRoYXQncyBmaW5lLiBXZSB3aWxs IHNvcnQgdGhhdCBvdXQgd2hlbiB3ZSByZWdlbmVyYXRlLgogICAgIGZvciAoYXV0byYgY2FzZVRv QWRkIDogY2FzZXNUb0FkZCkgewotICAgICAgICBjb21taXQodm0sIG1fd2F0Y2hwb2ludHMsIGNv ZGVCbG9jaywgc3R1YkluZm8sIGlkZW50LCAqY2FzZVRvQWRkKTsKKyAgICAgICAgY29tbWl0KGxv Y2tlciwgdm0sIG1fd2F0Y2hwb2ludHMsIGNvZGVCbG9jaywgc3R1YkluZm8sIGlkZW50LCAqY2Fz ZVRvQWRkKTsKICAgICAgICAgbV9saXN0LmFwcGVuZChXVEZNb3ZlKGNhc2VUb0FkZCkpOwogICAg IH0KICAgICAKQEAgLTI2OSwxMiArMjY5LDEyIEBAIEFjY2Vzc0dlbmVyYXRpb25SZXN1bHQgUG9s eW1vcnBoaWNBY2Nlc3MKIH0KIAogQWNjZXNzR2VuZXJhdGlvblJlc3VsdCBQb2x5bW9ycGhpY0Fj Y2Vzczo6YWRkQ2FzZSgKLSAgICBWTSYgdm0sIENvZGVCbG9jayogY29kZUJsb2NrLCBTdHJ1Y3R1 cmVTdHViSW5mbyYgc3R1YkluZm8sIGNvbnN0IElkZW50aWZpZXImIGlkZW50LAotICAgIHN0ZDo6 dW5pcXVlX3B0cjxBY2Nlc3NDYXNlPiBuZXdBY2Nlc3MpCisgICAgY29uc3QgR0NTYWZlQ29uY3Vy cmVudEpTTG9ja2VyJiBsb2NrZXIsIFZNJiB2bSwgQ29kZUJsb2NrKiBjb2RlQmxvY2ssIFN0cnVj dHVyZVN0dWJJbmZvJiBzdHViSW5mbywKKyAgICBjb25zdCBJZGVudGlmaWVyJiBpZGVudCwgc3Rk Ojp1bmlxdWVfcHRyPEFjY2Vzc0Nhc2U+IG5ld0FjY2VzcykKIHsKICAgICBWZWN0b3I8c3RkOjp1 bmlxdWVfcHRyPEFjY2Vzc0Nhc2U+LCAyPiBuZXdBY2Nlc3NlczsKICAgICBuZXdBY2Nlc3Nlcy5h cHBlbmQoV1RGTW92ZShuZXdBY2Nlc3MpKTsKLSAgICByZXR1cm4gYWRkQ2FzZXModm0sIGNvZGVC bG9jaywgc3R1YkluZm8sIGlkZW50LCBXVEZNb3ZlKG5ld0FjY2Vzc2VzKSk7CisgICAgcmV0dXJu IGFkZENhc2VzKGxvY2tlciwgdm0sIGNvZGVCbG9jaywgc3R1YkluZm8sIGlkZW50LCBXVEZNb3Zl KG5ld0FjY2Vzc2VzKSk7CiB9CiAKIGJvb2wgUG9seW1vcnBoaWNBY2Nlc3M6OnZpc2l0V2VhayhW TSYgdm0pIGNvbnN0CkBAIC0zMTAsNyArMzEwLDcgQEAgdm9pZCBQb2x5bW9ycGhpY0FjY2Vzczo6 ZHVtcChQcmludFN0cmVhbQogfQogCiB2b2lkIFBvbHltb3JwaGljQWNjZXNzOjpjb21taXQoCi0g ICAgVk0mIHZtLCBzdGQ6OnVuaXF1ZV9wdHI8V2F0Y2hwb2ludHNPblN0cnVjdHVyZVN0dWJJbmZv PiYgd2F0Y2hwb2ludHMsIENvZGVCbG9jayogY29kZUJsb2NrLAorICAgIGNvbnN0IEdDU2FmZUNv bmN1cnJlbnRKU0xvY2tlciYsIFZNJiB2bSwgc3RkOjp1bmlxdWVfcHRyPFdhdGNocG9pbnRzT25T dHJ1Y3R1cmVTdHViSW5mbz4mIHdhdGNocG9pbnRzLCBDb2RlQmxvY2sqIGNvZGVCbG9jaywKICAg ICBTdHJ1Y3R1cmVTdHViSW5mbyYgc3R1YkluZm8sIGNvbnN0IElkZW50aWZpZXImIGlkZW50LCBB Y2Nlc3NDYXNlJiBhY2Nlc3NDYXNlKQogewogICAgIC8vIE5PVEU6IFdlIGN1cnJlbnRseSBhc3N1 bWUgdGhhdCB0aGlzIGlzIHJlbGF0aXZlbHkgcmFyZS4gSXQgbWFpbmx5IGFyaXNlcyBmb3IgYWNj ZXNzZXMgdG8KQEAgLTMyOSw3ICszMjksNyBAQCB2b2lkIFBvbHltb3JwaGljQWNjZXNzOjpjb21t aXQoCiB9CiAKIEFjY2Vzc0dlbmVyYXRpb25SZXN1bHQgUG9seW1vcnBoaWNBY2Nlc3M6OnJlZ2Vu ZXJhdGUoCi0gICAgVk0mIHZtLCBDb2RlQmxvY2sqIGNvZGVCbG9jaywgU3RydWN0dXJlU3R1Yklu Zm8mIHN0dWJJbmZvLCBjb25zdCBJZGVudGlmaWVyJiBpZGVudCkKKyAgICBjb25zdCBHQ1NhZmVD b25jdXJyZW50SlNMb2NrZXImIGxvY2tlciwgVk0mIHZtLCBDb2RlQmxvY2sqIGNvZGVCbG9jaywg U3RydWN0dXJlU3R1YkluZm8mIHN0dWJJbmZvLCBjb25zdCBJZGVudGlmaWVyJiBpZGVudCkKIHsK ICAgICBTdXBlclNhbXBsZXJTY29wZSBzdXBlclNhbXBsZXJTY29wZShmYWxzZSk7CiAgICAgCkBA IC00MTAsNyArNDEwLDcgQEAgQWNjZXNzR2VuZXJhdGlvblJlc3VsdCBQb2x5bW9ycGhpY0FjY2Vz cwogICAgIGJvb2wgYWxsR3VhcmRlZEJ5U3RydWN0dXJlQ2hlY2sgPSB0cnVlOwogICAgIGJvb2wg aGFzSlNHZXR0ZXJTZXR0ZXJDYWxsID0gZmFsc2U7CiAgICAgZm9yIChhdXRvJiBuZXdDYXNlIDog Y2FzZXMpIHsKLSAgICAgICAgY29tbWl0KHZtLCBzdGF0ZS53YXRjaHBvaW50cywgY29kZUJsb2Nr LCBzdHViSW5mbywgaWRlbnQsICpuZXdDYXNlKTsKKyAgICAgICAgY29tbWl0KGxvY2tlciwgdm0s IHN0YXRlLndhdGNocG9pbnRzLCBjb2RlQmxvY2ssIHN0dWJJbmZvLCBpZGVudCwgKm5ld0Nhc2Up OwogICAgICAgICBhbGxHdWFyZGVkQnlTdHJ1Y3R1cmVDaGVjayAmPSBuZXdDYXNlLT5ndWFyZGVk QnlTdHJ1Y3R1cmVDaGVjaygpOwogICAgICAgICBpZiAobmV3Q2FzZS0+dHlwZSgpID09IEFjY2Vz c0Nhc2U6OkdldHRlciB8fCBuZXdDYXNlLT50eXBlKCkgPT0gQWNjZXNzQ2FzZTo6U2V0dGVyKQog ICAgICAgICAgICAgaGFzSlNHZXR0ZXJTZXR0ZXJDYWxsID0gdHJ1ZTsKSW5kZXg6IFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Qb2x5bW9ycGhpY0FjY2Vzcy5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Qb2x5bW9ycGhpY0FjY2Vzcy5oCShyZXZp c2lvbiAyMTg2MDApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvUG9seW1vcnBo aWNBY2Nlc3MuaAkod29ya2luZyBjb3B5KQpAQCAtMTI1LDEyICsxMjUsMTIgQEAgcHVibGljOgog ICAgIC8vIFdoZW4gdGhpcyBmYWlscyAocmV0dXJucyBHYXZlVXApLCB0aGlzIHdpbGwgbGVhdmUg dGhlIG9sZCBzdHViIGludGFjdCBidXQgeW91IHNob3VsZCBub3QgdHJ5CiAgICAgLy8gdG8gY2Fs bCB0aGlzIG1ldGhvZCBhZ2FpbiBmb3IgdGhhdCBQb2x5bW9ycGhpY0FjY2VzcyBpbnN0YW5jZS4K ICAgICBBY2Nlc3NHZW5lcmF0aW9uUmVzdWx0IGFkZENhc2VzKAotICAgICAgICBWTSYsIENvZGVC bG9jayosIFN0cnVjdHVyZVN0dWJJbmZvJiwgY29uc3QgSWRlbnRpZmllciYsIFZlY3RvcjxzdGQ6 OnVuaXF1ZV9wdHI8QWNjZXNzQ2FzZT4sIDI+KTsKKyAgICAgICAgY29uc3QgR0NTYWZlQ29uY3Vy cmVudEpTTG9ja2VyJiwgVk0mLCBDb2RlQmxvY2sqLCBTdHJ1Y3R1cmVTdHViSW5mbyYsIGNvbnN0 IElkZW50aWZpZXImLCBWZWN0b3I8c3RkOjp1bmlxdWVfcHRyPEFjY2Vzc0Nhc2U+LCAyPik7CiAK ICAgICBBY2Nlc3NHZW5lcmF0aW9uUmVzdWx0IGFkZENhc2UoCi0gICAgICAgIFZNJiwgQ29kZUJs b2NrKiwgU3RydWN0dXJlU3R1YkluZm8mLCBjb25zdCBJZGVudGlmaWVyJiwgc3RkOjp1bmlxdWVf cHRyPEFjY2Vzc0Nhc2U+KTsKKyAgICAgICAgY29uc3QgR0NTYWZlQ29uY3VycmVudEpTTG9ja2Vy JiwgVk0mLCBDb2RlQmxvY2sqLCBTdHJ1Y3R1cmVTdHViSW5mbyYsIGNvbnN0IElkZW50aWZpZXIm LCBzdGQ6OnVuaXF1ZV9wdHI8QWNjZXNzQ2FzZT4pOwogICAgIAotICAgIEFjY2Vzc0dlbmVyYXRp b25SZXN1bHQgcmVnZW5lcmF0ZShWTSYsIENvZGVCbG9jayosIFN0cnVjdHVyZVN0dWJJbmZvJiwg Y29uc3QgSWRlbnRpZmllciYpOworICAgIEFjY2Vzc0dlbmVyYXRpb25SZXN1bHQgcmVnZW5lcmF0 ZShjb25zdCBHQ1NhZmVDb25jdXJyZW50SlNMb2NrZXImLCBWTSYsIENvZGVCbG9jayosIFN0cnVj dHVyZVN0dWJJbmZvJiwgY29uc3QgSWRlbnRpZmllciYpOwogICAgIAogICAgIGJvb2wgaXNFbXB0 eSgpIGNvbnN0IHsgcmV0dXJuIG1fbGlzdC5pc0VtcHR5KCk7IH0KICAgICB1bnNpZ25lZCBzaXpl KCkgY29uc3QgeyByZXR1cm4gbV9saXN0LnNpemUoKTsgfQpAQCAtMTY0LDEyICsxNjQsOSBAQCBw cml2YXRlOgogICAgIHR5cGVkZWYgVmVjdG9yPHN0ZDo6dW5pcXVlX3B0cjxBY2Nlc3NDYXNlPiwg Mj4gTGlzdFR5cGU7CiAgICAgCiAgICAgdm9pZCBjb21taXQoCi0gICAgICAgIFZNJiwgc3RkOjp1 bmlxdWVfcHRyPFdhdGNocG9pbnRzT25TdHJ1Y3R1cmVTdHViSW5mbz4mLCBDb2RlQmxvY2sqLCBT dHJ1Y3R1cmVTdHViSW5mbyYsCisgICAgICAgIGNvbnN0IEdDU2FmZUNvbmN1cnJlbnRKU0xvY2tl ciYsIFZNJiwgc3RkOjp1bmlxdWVfcHRyPFdhdGNocG9pbnRzT25TdHJ1Y3R1cmVTdHViSW5mbz4m LCBDb2RlQmxvY2sqLCBTdHJ1Y3R1cmVTdHViSW5mbyYsCiAgICAgICAgIGNvbnN0IElkZW50aWZp ZXImLCBBY2Nlc3NDYXNlJik7CiAKLSAgICBNYWNyb0Fzc2VtYmxlckNvZGVQdHIgcmVnZW5lcmF0 ZSgKLSAgICAgICAgVk0mLCBDb2RlQmxvY2sqLCBTdHJ1Y3R1cmVTdHViSW5mbyYsIGNvbnN0IElk ZW50aWZpZXImLCBMaXN0VHlwZSYgY2FzZXMpOwotCiAgICAgTGlzdFR5cGUgbV9saXN0OwogICAg IFJlZlB0cjxKSVRTdHViUm91dGluZT4gbV9zdHViUm91dGluZTsKICAgICBzdGQ6OnVuaXF1ZV9w dHI8V2F0Y2hwb2ludHNPblN0cnVjdHVyZVN0dWJJbmZvPiBtX3dhdGNocG9pbnRzOwpJbmRleDog U291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1N0cnVjdHVyZVN0dWJJbmZvLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvU3RydWN0dXJlU3R1Yklu Zm8uY3BwCShyZXZpc2lvbiAyMTg2MDApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNv ZGUvU3RydWN0dXJlU3R1YkluZm8uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03OCwxMiArNzgsNiBA QCB2b2lkIFN0cnVjdHVyZVN0dWJJbmZvOjppbml0UHV0QnlJZFJlcGxhCiAgICAgdS5ieUlkU2Vs Zi5vZmZzZXQgPSBvZmZzZXQ7CiB9CiAKLXZvaWQgU3RydWN0dXJlU3R1YkluZm86OmluaXRTdHVi KENvZGVCbG9jayosIHN0ZDo6dW5pcXVlX3B0cjxQb2x5bW9ycGhpY0FjY2Vzcz4gc3R1YikKLXsK LSAgICBjYWNoZVR5cGUgPSBDYWNoZVR5cGU6OlN0dWI7Ci0gICAgdS5zdHViID0gc3R1Yi5yZWxl YXNlKCk7Ci19Ci0KIHZvaWQgU3RydWN0dXJlU3R1YkluZm86OmRlcmVmKCkKIHsKICAgICBzd2l0 Y2ggKGNhY2hlVHlwZSkgewpAQCAtMTE3LDcgKzExMSw3IEBAIHZvaWQgU3RydWN0dXJlU3R1Yklu Zm86OmFib3V0VG9EaWUoKQogfQogCiBBY2Nlc3NHZW5lcmF0aW9uUmVzdWx0IFN0cnVjdHVyZVN0 dWJJbmZvOjphZGRBY2Nlc3NDYXNlKAotICAgIENvZGVCbG9jayogY29kZUJsb2NrLCBjb25zdCBJ ZGVudGlmaWVyJiBpZGVudCwgc3RkOjp1bmlxdWVfcHRyPEFjY2Vzc0Nhc2U+IGFjY2Vzc0Nhc2Up CisgICAgY29uc3QgR0NTYWZlQ29uY3VycmVudEpTTG9ja2VyJiBsb2NrZXIsIENvZGVCbG9jayog Y29kZUJsb2NrLCBjb25zdCBJZGVudGlmaWVyJiBpZGVudCwgc3RkOjp1bmlxdWVfcHRyPEFjY2Vz c0Nhc2U+IGFjY2Vzc0Nhc2UpCiB7CiAgICAgVk0mIHZtID0gKmNvZGVCbG9jay0+dm0oKTsKICAg ICAKQEAgLTEzMCw3ICsxMjQsNyBAQCBBY2Nlc3NHZW5lcmF0aW9uUmVzdWx0IFN0cnVjdHVyZVN0 dWJJbmZvCiAgICAgQWNjZXNzR2VuZXJhdGlvblJlc3VsdCByZXN1bHQ7CiAgICAgCiAgICAgaWYg KGNhY2hlVHlwZSA9PSBDYWNoZVR5cGU6OlN0dWIpIHsKLSAgICAgICAgcmVzdWx0ID0gdS5zdHVi LT5hZGRDYXNlKHZtLCBjb2RlQmxvY2ssICp0aGlzLCBpZGVudCwgV1RGTW92ZShhY2Nlc3NDYXNl KSk7CisgICAgICAgIHJlc3VsdCA9IHUuc3R1Yi0+YWRkQ2FzZShsb2NrZXIsIHZtLCBjb2RlQmxv Y2ssICp0aGlzLCBpZGVudCwgV1RGTW92ZShhY2Nlc3NDYXNlKSk7CiAgICAgICAgIAogICAgICAg ICBpZiAodmVyYm9zZSkKICAgICAgICAgICAgIGRhdGFMb2coIkhhZCBzdHViLCByZXN1bHQ6ICIs IHJlc3VsdCwgIlxuIik7CkBAIC0xNTEsNyArMTQ1LDcgQEAgQWNjZXNzR2VuZXJhdGlvblJlc3Vs dCBTdHJ1Y3R1cmVTdHViSW5mbwogICAgICAgICAKICAgICAgICAgYWNjZXNzQ2FzZXMuYXBwZW5k KFdURk1vdmUoYWNjZXNzQ2FzZSkpOwogICAgICAgICAKLSAgICAgICAgcmVzdWx0ID0gYWNjZXNz LT5hZGRDYXNlcyh2bSwgY29kZUJsb2NrLCAqdGhpcywgaWRlbnQsIFdURk1vdmUoYWNjZXNzQ2Fz ZXMpKTsKKyAgICAgICAgcmVzdWx0ID0gYWNjZXNzLT5hZGRDYXNlcyhsb2NrZXIsIHZtLCBjb2Rl QmxvY2ssICp0aGlzLCBpZGVudCwgV1RGTW92ZShhY2Nlc3NDYXNlcykpOwogICAgICAgICAKICAg ICAgICAgaWYgKHZlcmJvc2UpCiAgICAgICAgICAgICBkYXRhTG9nKCJDcmVhdGVkIHN0dWIsIHJl c3VsdDogIiwgcmVzdWx0LCAiXG4iKTsKQEAgLTE2MSw3ICsxNTUsOCBAQCBBY2Nlc3NHZW5lcmF0 aW9uUmVzdWx0IFN0cnVjdHVyZVN0dWJJbmZvCiAgICAgICAgICAgICByZXR1cm4gcmVzdWx0Owog ICAgICAgICB9CiAgICAgICAgIAotICAgICAgICBpbml0U3R1Yihjb2RlQmxvY2ssIFdURk1vdmUo YWNjZXNzKSk7CisgICAgICAgIGNhY2hlVHlwZSA9IENhY2hlVHlwZTo6U3R1YjsKKyAgICAgICAg dS5zdHViID0gYWNjZXNzLnJlbGVhc2UoKTsKICAgICB9CiAgICAgCiAgICAgUkVMRUFTRV9BU1NF UlQoIXJlc3VsdC5nZW5lcmF0ZWRTb21lQ29kZSgpKTsKQEAgLTE4Niw3ICsxODEsNyBAQCBBY2Nl c3NHZW5lcmF0aW9uUmVzdWx0IFN0cnVjdHVyZVN0dWJJbmZvCiAgICAgLy8gUG9seW1vcnBoaWNB Y2Nlc3MuCiAgICAgYnVmZmVyZWRTdHJ1Y3R1cmVzLmNsZWFyKCk7CiAgICAgCi0gICAgcmVzdWx0 ID0gdS5zdHViLT5yZWdlbmVyYXRlKHZtLCBjb2RlQmxvY2ssICp0aGlzLCBpZGVudCk7CisgICAg cmVzdWx0ID0gdS5zdHViLT5yZWdlbmVyYXRlKGxvY2tlciwgdm0sIGNvZGVCbG9jaywgKnRoaXMs IGlkZW50KTsKICAgICAKICAgICBpZiAodmVyYm9zZSkKICAgICAgICAgZGF0YUxvZygiUmVnZW5l cmF0aW9uIHJlc3VsdDogIiwgcmVzdWx0LCAiXG4iKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ieXRlY29kZS9TdHJ1Y3R1cmVTdHViSW5mby5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9ieXRlY29kZS9TdHJ1Y3R1cmVTdHViSW5mby5oCShyZXZpc2lvbiAyMTg2 MDApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvU3RydWN0dXJlU3R1YkluZm8u aAkod29ya2luZyBjb3B5KQpAQCAtNzEsOSArNzEsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCBpbml0 R2V0QnlJZFNlbGYoQ29kZUJsb2NrKiwgU3RydWN0dXJlKiBiYXNlT2JqZWN0U3RydWN0dXJlLCBQ cm9wZXJ0eU9mZnNldCk7CiAgICAgdm9pZCBpbml0QXJyYXlMZW5ndGgoKTsKICAgICB2b2lkIGlu aXRQdXRCeUlkUmVwbGFjZShDb2RlQmxvY2sqLCBTdHJ1Y3R1cmUqIGJhc2VPYmplY3RTdHJ1Y3R1 cmUsIFByb3BlcnR5T2Zmc2V0KTsKLSAgICB2b2lkIGluaXRTdHViKENvZGVCbG9jayosIHN0ZDo6 dW5pcXVlX3B0cjxQb2x5bW9ycGhpY0FjY2Vzcz4pOwogCi0gICAgQWNjZXNzR2VuZXJhdGlvblJl c3VsdCBhZGRBY2Nlc3NDYXNlKENvZGVCbG9jayosIGNvbnN0IElkZW50aWZpZXImLCBzdGQ6OnVu aXF1ZV9wdHI8QWNjZXNzQ2FzZT4pOworICAgIEFjY2Vzc0dlbmVyYXRpb25SZXN1bHQgYWRkQWNj ZXNzQ2FzZShjb25zdCBHQ1NhZmVDb25jdXJyZW50SlNMb2NrZXImLCBDb2RlQmxvY2sqLCBjb25z dCBJZGVudGlmaWVyJiwgc3RkOjp1bmlxdWVfcHRyPEFjY2Vzc0Nhc2U+KTsKIAogICAgIHZvaWQg cmVzZXQoQ29kZUJsb2NrKik7CiAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvUmVw YXRjaC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9SZXBhdGNo LmNwcAkocmV2aXNpb24gMjE4NjAwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9SZXBh dGNoLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTU3LDcgKzE1Nyw3IEBAIGlubGluZSBGdW5jdGlv blB0ciBhcHByb3ByaWF0ZUdlbmVyaWNHZXQKICAgICByZXR1cm4gb3BlcmF0aW9uVHJ5R2V0QnlJ ZDsKIH0KIAotc3RhdGljIElubGluZUNhY2hlQWN0aW9uIHRyeUNhY2hlR2V0QnlJRChFeGVjU3Rh dGUqIGV4ZWMsIEpTVmFsdWUgYmFzZVZhbHVlLCBjb25zdCBJZGVudGlmaWVyJiBwcm9wZXJ0eU5h bWUsIGNvbnN0IFByb3BlcnR5U2xvdCYgc2xvdCwgU3RydWN0dXJlU3R1YkluZm8mIHN0dWJJbmZv LCBHZXRCeUlES2luZCBraW5kKQorc3RhdGljIElubGluZUNhY2hlQWN0aW9uIHRyeUNhY2hlR2V0 QnlJRChjb25zdCBHQ1NhZmVDb25jdXJyZW50SlNMb2NrZXImIGxvY2tlciwgRXhlY1N0YXRlKiBl eGVjLCBKU1ZhbHVlIGJhc2VWYWx1ZSwgY29uc3QgSWRlbnRpZmllciYgcHJvcGVydHlOYW1lLCBj b25zdCBQcm9wZXJ0eVNsb3QmIHNsb3QsIFN0cnVjdHVyZVN0dWJJbmZvJiBzdHViSW5mbywgR2V0 QnlJREtpbmQga2luZCkKIHsKICAgICBpZiAoZm9yY2VJQ0ZhaWx1cmUoZXhlYykpCiAgICAgICAg IHJldHVybiBHaXZlVXBPbkNhY2hlOwpAQCAtMzIzLDcgKzMyMyw3IEBAIHN0YXRpYyBJbmxpbmVD YWNoZUFjdGlvbiB0cnlDYWNoZUdldEJ5SUQKIAogICAgIExPR19JQygoSUNFdmVudDo6R2V0QnlJ ZEFkZEFjY2Vzc0Nhc2UsIGJhc2VWYWx1ZS5jbGFzc0luZm9Pck51bGwodm0pLCBwcm9wZXJ0eU5h bWUpKTsKIAotICAgIEFjY2Vzc0dlbmVyYXRpb25SZXN1bHQgcmVzdWx0ID0gc3R1YkluZm8uYWRk QWNjZXNzQ2FzZShjb2RlQmxvY2ssIHByb3BlcnR5TmFtZSwgV1RGTW92ZShuZXdDYXNlKSk7Cisg ICAgQWNjZXNzR2VuZXJhdGlvblJlc3VsdCByZXN1bHQgPSBzdHViSW5mby5hZGRBY2Nlc3NDYXNl KGxvY2tlciwgY29kZUJsb2NrLCBwcm9wZXJ0eU5hbWUsIFdURk1vdmUobmV3Q2FzZSkpOwogCiAg ICAgaWYgKHJlc3VsdC5nZW5lcmF0ZWRTb21lQ29kZSgpKSB7CiAgICAgICAgIExPR19JQygoSUNF dmVudDo6R2V0QnlJZFJlcGxhY2VXaXRoSnVtcCwgYmFzZVZhbHVlLmNsYXNzSW5mb09yTnVsbCh2 bSksIHByb3BlcnR5TmFtZSkpOwpAQCAtMzQwLDcgKzM0MCw3IEBAIHZvaWQgcmVwYXRjaEdldEJ5 SUQoRXhlY1N0YXRlKiBleGVjLCBKU1YKICAgICBTdXBlclNhbXBsZXJTY29wZSBzdXBlclNhbXBs ZXJTY29wZShmYWxzZSk7CiAgICAgR0NTYWZlQ29uY3VycmVudEpTTG9ja2VyIGxvY2tlcihleGVj LT5jb2RlQmxvY2soKS0+bV9sb2NrLCBleGVjLT52bSgpLmhlYXApOwogICAgIAotICAgIGlmICh0 cnlDYWNoZUdldEJ5SUQoZXhlYywgYmFzZVZhbHVlLCBwcm9wZXJ0eU5hbWUsIHNsb3QsIHN0dWJJ bmZvLCBraW5kKSA9PSBHaXZlVXBPbkNhY2hlKQorICAgIGlmICh0cnlDYWNoZUdldEJ5SUQobG9j a2VyLCBleGVjLCBiYXNlVmFsdWUsIHByb3BlcnR5TmFtZSwgc2xvdCwgc3R1YkluZm8sIGtpbmQp ID09IEdpdmVVcE9uQ2FjaGUpCiAgICAgICAgIGZ0bFRodW5rQXdhcmVSZXBhdGNoQ2FsbChleGVj LT5jb2RlQmxvY2soKSwgc3R1YkluZm8uc2xvd1BhdGhDYWxsTG9jYXRpb24oKSwgYXBwcm9wcmlh dGVHZW5lcmljR2V0QnlJZEZ1bmN0aW9uKGtpbmQpKTsKIH0KIApAQCAtMzY4LDcgKzM2OCw3IEBA IHN0YXRpYyBWX0pJVE9wZXJhdGlvbl9FU3NpSkpJIGFwcHJvcHJpYXQKICAgICByZXR1cm4gb3Bl cmF0aW9uUHV0QnlJZE5vblN0cmljdE9wdGltaXplOwogfQogCi1zdGF0aWMgSW5saW5lQ2FjaGVB Y3Rpb24gdHJ5Q2FjaGVQdXRCeUlEKEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSBiYXNlVmFsdWUs IFN0cnVjdHVyZSogc3RydWN0dXJlLCBjb25zdCBJZGVudGlmaWVyJiBpZGVudCwgY29uc3QgUHV0 UHJvcGVydHlTbG90JiBzbG90LCBTdHJ1Y3R1cmVTdHViSW5mbyYgc3R1YkluZm8sIFB1dEtpbmQg cHV0S2luZCkKK3N0YXRpYyBJbmxpbmVDYWNoZUFjdGlvbiB0cnlDYWNoZVB1dEJ5SUQoY29uc3Qg R0NTYWZlQ29uY3VycmVudEpTTG9ja2VyJiBsb2NrZXIsIEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1 ZSBiYXNlVmFsdWUsIFN0cnVjdHVyZSogc3RydWN0dXJlLCBjb25zdCBJZGVudGlmaWVyJiBpZGVu dCwgY29uc3QgUHV0UHJvcGVydHlTbG90JiBzbG90LCBTdHJ1Y3R1cmVTdHViSW5mbyYgc3R1Yklu Zm8sIFB1dEtpbmQgcHV0S2luZCkKIHsKICAgICBpZiAoZm9yY2VJQ0ZhaWx1cmUoZXhlYykpCiAg ICAgICAgIHJldHVybiBHaXZlVXBPbkNhY2hlOwpAQCAtNDc2LDcgKzQ3Niw3IEBAIHN0YXRpYyBJ bmxpbmVDYWNoZUFjdGlvbiB0cnlDYWNoZVB1dEJ5SUQKIAogICAgIExPR19JQygoSUNFdmVudDo6 UHV0QnlJZEFkZEFjY2Vzc0Nhc2UsIHN0cnVjdHVyZS0+Y2xhc3NJbmZvKCksIGlkZW50KSk7CiAg ICAgCi0gICAgQWNjZXNzR2VuZXJhdGlvblJlc3VsdCByZXN1bHQgPSBzdHViSW5mby5hZGRBY2Nl c3NDYXNlKGNvZGVCbG9jaywgaWRlbnQsIFdURk1vdmUobmV3Q2FzZSkpOworICAgIEFjY2Vzc0dl bmVyYXRpb25SZXN1bHQgcmVzdWx0ID0gc3R1YkluZm8uYWRkQWNjZXNzQ2FzZShsb2NrZXIsIGNv ZGVCbG9jaywgaWRlbnQsIFdURk1vdmUobmV3Q2FzZSkpOwogICAgIAogICAgIGlmIChyZXN1bHQu Z2VuZXJhdGVkU29tZUNvZGUoKSkgewogICAgICAgICBMT0dfSUMoKElDRXZlbnQ6OlB1dEJ5SWRS ZXBsYWNlV2l0aEp1bXAsIHN0cnVjdHVyZS0+Y2xhc3NJbmZvKCksIGlkZW50KSk7CkBAIC00OTQs MTMgKzQ5NCwxMyBAQCB2b2lkIHJlcGF0Y2hQdXRCeUlEKEV4ZWNTdGF0ZSogZXhlYywgSlNWCiAg ICAgU3VwZXJTYW1wbGVyU2NvcGUgc3VwZXJTYW1wbGVyU2NvcGUoZmFsc2UpOwogICAgIEdDU2Fm ZUNvbmN1cnJlbnRKU0xvY2tlciBsb2NrZXIoZXhlYy0+Y29kZUJsb2NrKCktPm1fbG9jaywgZXhl Yy0+dm0oKS5oZWFwKTsKICAgICAKLSAgICBpZiAodHJ5Q2FjaGVQdXRCeUlEKGV4ZWMsIGJhc2VW YWx1ZSwgc3RydWN0dXJlLCBwcm9wZXJ0eU5hbWUsIHNsb3QsIHN0dWJJbmZvLCBwdXRLaW5kKSA9 PSBHaXZlVXBPbkNhY2hlKQorICAgIGlmICh0cnlDYWNoZVB1dEJ5SUQobG9ja2VyLCBleGVjLCBi YXNlVmFsdWUsIHN0cnVjdHVyZSwgcHJvcGVydHlOYW1lLCBzbG90LCBzdHViSW5mbywgcHV0S2lu ZCkgPT0gR2l2ZVVwT25DYWNoZSkKICAgICAgICAgZnRsVGh1bmtBd2FyZVJlcGF0Y2hDYWxsKGV4 ZWMtPmNvZGVCbG9jaygpLCBzdHViSW5mby5zbG93UGF0aENhbGxMb2NhdGlvbigpLCBhcHByb3By aWF0ZUdlbmVyaWNQdXRCeUlkRnVuY3Rpb24oc2xvdCwgcHV0S2luZCkpOwogfQogCiBzdGF0aWMg SW5saW5lQ2FjaGVBY3Rpb24gdHJ5UmVwYXRjaEluKAotICAgIEV4ZWNTdGF0ZSogZXhlYywgSlND ZWxsKiBiYXNlLCBjb25zdCBJZGVudGlmaWVyJiBpZGVudCwgYm9vbCB3YXNGb3VuZCwKLSAgICBj b25zdCBQcm9wZXJ0eVNsb3QmIHNsb3QsIFN0cnVjdHVyZVN0dWJJbmZvJiBzdHViSW5mbykKKyAg ICBjb25zdCBHQ1NhZmVDb25jdXJyZW50SlNMb2NrZXImIGxvY2tlciwgRXhlY1N0YXRlKiBleGVj LCBKU0NlbGwqIGJhc2UsIGNvbnN0IElkZW50aWZpZXImIGlkZW50LAorICAgIGJvb2wgd2FzRm91 bmQsIGNvbnN0IFByb3BlcnR5U2xvdCYgc2xvdCwgU3RydWN0dXJlU3R1YkluZm8mIHN0dWJJbmZv KQogewogICAgIGlmIChmb3JjZUlDRmFpbHVyZShleGVjKSkKICAgICAgICAgcmV0dXJuIEdpdmVV cE9uQ2FjaGU7CkBAIC01MzUsNyArNTM1LDcgQEAgc3RhdGljIElubGluZUNhY2hlQWN0aW9uIHRy eVJlcGF0Y2hJbigKICAgICBzdGQ6OnVuaXF1ZV9wdHI8QWNjZXNzQ2FzZT4gbmV3Q2FzZSA9IEFj Y2Vzc0Nhc2U6OmNyZWF0ZSgKICAgICAgICAgdm0sIGNvZGVCbG9jaywgd2FzRm91bmQgPyBBY2Nl c3NDYXNlOjpJbkhpdCA6IEFjY2Vzc0Nhc2U6OkluTWlzcywgaW52YWxpZE9mZnNldCwgc3RydWN0 dXJlLCBjb25kaXRpb25TZXQpOwogCi0gICAgQWNjZXNzR2VuZXJhdGlvblJlc3VsdCByZXN1bHQg PSBzdHViSW5mby5hZGRBY2Nlc3NDYXNlKGNvZGVCbG9jaywgaWRlbnQsIFdURk1vdmUobmV3Q2Fz ZSkpOworICAgIEFjY2Vzc0dlbmVyYXRpb25SZXN1bHQgcmVzdWx0ID0gc3R1YkluZm8uYWRkQWNj ZXNzQ2FzZShsb2NrZXIsIGNvZGVCbG9jaywgaWRlbnQsIFdURk1vdmUobmV3Q2FzZSkpOwogICAg IAogICAgIGlmIChyZXN1bHQuZ2VuZXJhdGVkU29tZUNvZGUoKSkgewogICAgICAgICBMT0dfSUMo KElDRXZlbnQ6OkluUmVwbGFjZVdpdGhKdW1wLCBzdHJ1Y3R1cmUtPmNsYXNzSW5mbygpLCBpZGVu dCkpOwpAQCAtNTU2LDcgKzU1Niw3IEBAIHZvaWQgcmVwYXRjaEluKAogewogICAgIFN1cGVyU2Ft cGxlclNjb3BlIHN1cGVyU2FtcGxlclNjb3BlKGZhbHNlKTsKICAgICBHQ1NhZmVDb25jdXJyZW50 SlNMb2NrZXIgbG9ja2VyKGV4ZWMtPmNvZGVCbG9jaygpLT5tX2xvY2ssIGV4ZWMtPnZtKCkuaGVh cCk7Ci0gICAgaWYgKHRyeVJlcGF0Y2hJbihleGVjLCBiYXNlLCBpZGVudCwgd2FzRm91bmQsIHNs b3QsIHN0dWJJbmZvKSA9PSBHaXZlVXBPbkNhY2hlKQorICAgIGlmICh0cnlSZXBhdGNoSW4obG9j a2VyLCBleGVjLCBiYXNlLCBpZGVudCwgd2FzRm91bmQsIHNsb3QsIHN0dWJJbmZvKSA9PSBHaXZl VXBPbkNhY2hlKQogICAgICAgICBmdGxUaHVua0F3YXJlUmVwYXRjaENhbGwoZXhlYy0+Y29kZUJs b2NrKCksIHN0dWJJbmZvLnNsb3dQYXRoQ2FsbExvY2F0aW9uKCksIG9wZXJhdGlvbkluKTsKIH0K IAo=