129760 2014-03-05 15:03:05 -0800 Fix write barriers in Repatch.cpp for !ENABLE(DFG_JIT) platforms after r165128 2014-03-06 11:55:09 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mhahnenberg mhahnenberg commit-queue oldest_to_newest 987409 0 mhahnenberg 2014-03-05 15:03:05 -0800 r165128 disabled the write barrier fast path for inline caches on !ENABLE(DFG_JIT) platforms. The fix is to refactor the write barrier code into AssemblyHelpers and use that everywhere. 987510 1 225939 mhahnenberg 2014-03-05 19:31:40 -0800 Created attachment 225939 Patch 987534 2 225939 ggaren 2014-03-05 20:27:16 -0800 Comment on attachment 225939 Patch r=me 987792 3 225939 commit-queue 2014-03-06 11:55:08 -0800 Comment on attachment 225939 Patch Clearing flags on attachment: 225939 Committed r165203: <http://trac.webkit.org/changeset/165203> 987793 4 commit-queue 2014-03-06 11:55:09 -0800 All reviewed patches have been landed. Closing bug. 225939 2014-03-05 19:31:40 -0800 2014-03-06 11:55:07 -0800 Patch bug-129760-20140305193138.patch text/plain 10399 mhahnenberg SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTY1MTY2KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBA CisyMDE0LTAzLTA1ICBNYXJrIEhhaG5lbmJlcmcgIDxtaGFobmVuYmVyZ0BhcHBsZS5jb20+CisK KyAgICAgICAgRml4IHdyaXRlIGJhcnJpZXJzIGluIFJlcGF0Y2guY3BwIGZvciAhRU5BQkxFKERG R19KSVQpIHBsYXRmb3JtcyBhZnRlciByMTY1MTI4CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjk3NjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICByMTY1MTI4IGRpc2FibGVkIHRoZSB3cml0ZSBiYXJyaWVy IGZhc3QgcGF0aCBmb3IgaW5saW5lIGNhY2hlcyBvbiAhRU5BQkxFKERGR19KSVQpIHBsYXRmb3Jt cy4gCisgICAgICAgIFRoZSBmaXggaXMgdG8gcmVmYWN0b3IgdGhlIHdyaXRlIGJhcnJpZXIgY29k ZSBpbnRvIEFzc2VtYmx5SGVscGVycyBhbmQgdXNlIHRoYXQgZXZlcnl3aGVyZS4KKworICAgICAg ICAqIGRmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6U3BlY3Vs YXRpdmVKSVQ6OndyaXRlQmFycmllcik6CisgICAgICAgICogZGZnL0RGR1NwZWN1bGF0aXZlSklU Lmg6CisgICAgICAgICogZGZnL0RGR1NwZWN1bGF0aXZlSklUMzJfNjQuY3BwOgorICAgICAgICAo SlNDOjpERkc6OlNwZWN1bGF0aXZlSklUOjp3cml0ZUJhcnJpZXIpOgorICAgICAgICAqIGRmZy9E RkdTcGVjdWxhdGl2ZUpJVDY0LmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpTcGVjdWxhdGl2ZUpJ VDo6d3JpdGVCYXJyaWVyKToKKyAgICAgICAgKiBqaXQvQXNzZW1ibHlIZWxwZXJzLmg6CisgICAg ICAgIChKU0M6OkFzc2VtYmx5SGVscGVyczo6Y2hlY2tNYXJrQnl0ZSk6CisgICAgICAgICogaml0 L0pJVC5oOgorICAgICAgICAqIGppdC9KSVRQcm9wZXJ0eUFjY2Vzcy5jcHA6CisgICAgICAgICog aml0L1JlcGF0Y2guY3BwOgorICAgICAgICAoSlNDOjp3cml0ZUJhcnJpZXIpOgorCiAyMDE0LTAz LTA1ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2Vi IEluc3BlY3RvcjogUHJldmVudCBwb3NzaWJsZSBkZWFkbG9jayBpbiB2aWV3IGluZGljYXRpb24K SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQzMl82NC5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2 ZUpJVDMyXzY0LmNwcAkocmV2aXNpb24gMTY1MTYwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3Jl L2RmZy9ERkdTcGVjdWxhdGl2ZUpJVDMyXzY0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDcyNiw3 ICs0NzI2LDcgQEAgdm9pZCBTcGVjdWxhdGl2ZUpJVDo6d3JpdGVCYXJyaWVyKEdQUlJlZwogICAg IGlmICghaXNLbm93bkNlbGwodmFsdWVVc2Uubm9kZSgpKSkKICAgICAgICAgaXNOb3RDZWxsID0g bV9qaXQuYnJhbmNoMzIoSklUQ29tcGlsZXI6Ok5vdEVxdWFsLCB2YWx1ZVRhZ0dQUiwgSklUQ29t cGlsZXI6OlRydXN0ZWRJbW0zMihKU1ZhbHVlOjpDZWxsVGFnKSk7CiAKLSAgICBKSVRDb21waWxl cjo6SnVtcCBvd25lck5vdE1hcmtlZE9yQWxyZWFkeVJlbWVtYmVyZWQgPSBjaGVja01hcmtCeXRl KG1faml0LCBvd25lckdQUik7CisgICAgSklUQ29tcGlsZXI6Okp1bXAgb3duZXJOb3RNYXJrZWRP ckFscmVhZHlSZW1lbWJlcmVkID0gbV9qaXQuY2hlY2tNYXJrQnl0ZShvd25lckdQUik7CiAgICAg c3RvcmVUb1dyaXRlQmFycmllckJ1ZmZlcihvd25lckdQUiwgc2NyYXRjaDEsIHNjcmF0Y2gyKTsK ICAgICBvd25lck5vdE1hcmtlZE9yQWxyZWFkeVJlbWVtYmVyZWQubGluaygmbV9qaXQpOwogCkBA IC00NzQwLDcgKzQ3NDAsNyBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjp3cml0ZUJhcnJpZXIoSlND ZWxsCiAgICAgaWYgKCFpc0tub3duQ2VsbCh2YWx1ZVVzZS5ub2RlKCkpKQogICAgICAgICBpc05v dENlbGwgPSBtX2ppdC5icmFuY2gzMihKSVRDb21waWxlcjo6Tm90RXF1YWwsIHZhbHVlVGFnR1BS LCBKSVRDb21waWxlcjo6VHJ1c3RlZEltbTMyKEpTVmFsdWU6OkNlbGxUYWcpKTsKIAotICAgIEpJ VENvbXBpbGVyOjpKdW1wIG93bmVyTm90TWFya2VkT3JBbHJlYWR5UmVtZW1iZXJlZCA9IGNoZWNr TWFya0J5dGUobV9qaXQsIG93bmVyKTsKKyAgICBKSVRDb21waWxlcjo6SnVtcCBvd25lck5vdE1h cmtlZE9yQWxyZWFkeVJlbWVtYmVyZWQgPSBtX2ppdC5jaGVja01hcmtCeXRlKG93bmVyKTsKICAg ICBzdG9yZVRvV3JpdGVCYXJyaWVyQnVmZmVyKG93bmVyLCBzY3JhdGNoMSwgc2NyYXRjaDIpOwog ICAgIG93bmVyTm90TWFya2VkT3JBbHJlYWR5UmVtZW1iZXJlZC5saW5rKCZtX2ppdCk7CiAKSW5k ZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQ2NC5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVDY0 LmNwcAkocmV2aXNpb24gMTY1MTYwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdT cGVjdWxhdGl2ZUpJVDY0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTA2MCw3ICs1MDYwLDcgQEAg dm9pZCBTcGVjdWxhdGl2ZUpJVDo6d3JpdGVCYXJyaWVyKEdQUlJlZwogICAgIGlmICghaXNLbm93 bkNlbGwodmFsdWVVc2Uubm9kZSgpKSkKICAgICAgICAgaXNOb3RDZWxsID0gbV9qaXQuYnJhbmNo VGVzdDY0KEpJVENvbXBpbGVyOjpOb25aZXJvLCB2YWx1ZUdQUiwgR1BSSW5mbzo6dGFnTWFza1Jl Z2lzdGVyKTsKIAotICAgIEpJVENvbXBpbGVyOjpKdW1wIG93bmVyTm90TWFya2VkT3JBbHJlYWR5 UmVtZW1iZXJlZCA9IGNoZWNrTWFya0J5dGUobV9qaXQsIG93bmVyR1BSKTsKKyAgICBKSVRDb21w aWxlcjo6SnVtcCBvd25lck5vdE1hcmtlZE9yQWxyZWFkeVJlbWVtYmVyZWQgPSBtX2ppdC5jaGVj a01hcmtCeXRlKG93bmVyR1BSKTsKICAgICBzdG9yZVRvV3JpdGVCYXJyaWVyQnVmZmVyKG93bmVy R1BSLCBzY3JhdGNoMSwgc2NyYXRjaDIpOwogICAgIG93bmVyTm90TWFya2VkT3JBbHJlYWR5UmVt ZW1iZXJlZC5saW5rKCZtX2ppdCk7CiAKQEAgLTUwNzQsNyArNTA3NCw3IEBAIHZvaWQgU3BlY3Vs YXRpdmVKSVQ6OndyaXRlQmFycmllcihKU0NlbGwKICAgICBpZiAoIWlzS25vd25DZWxsKHZhbHVl VXNlLm5vZGUoKSkpCiAgICAgICAgIGlzTm90Q2VsbCA9IG1faml0LmJyYW5jaFRlc3Q2NChKSVRD b21waWxlcjo6Tm9uWmVybywgdmFsdWVHUFIsIEdQUkluZm86OnRhZ01hc2tSZWdpc3Rlcik7CiAK LSAgICBKSVRDb21waWxlcjo6SnVtcCBvd25lck5vdE1hcmtlZE9yQWxyZWFkeVJlbWVtYmVyZWQg PSBjaGVja01hcmtCeXRlKG1faml0LCBvd25lcik7CisgICAgSklUQ29tcGlsZXI6Okp1bXAgb3du ZXJOb3RNYXJrZWRPckFscmVhZHlSZW1lbWJlcmVkID0gbV9qaXQuY2hlY2tNYXJrQnl0ZShvd25l cik7CiAgICAgc3RvcmVUb1dyaXRlQmFycmllckJ1ZmZlcihvd25lciwgc2NyYXRjaDEsIHNjcmF0 Y2gyKTsKICAgICBvd25lck5vdE1hcmtlZE9yQWxyZWFkeVJlbWVtYmVyZWQubGluaygmbV9qaXQp OwogCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZl SklULmNwcAkocmV2aXNpb24gMTY1MTYwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9E RkdTcGVjdWxhdGl2ZUpJVC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU0NjksMTcgKzU0NjksNiBA QCB2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlU3RvcmVCYXJyaWVyCiAgICAgbm9SZXN1bHQo bm9kZSk7CiB9CiAKLUpJVENvbXBpbGVyOjpKdW1wIFNwZWN1bGF0aXZlSklUOjpjaGVja01hcmtC eXRlKENDYWxsSGVscGVycyYgaml0LCBHUFJSZWcgb3duZXIpCi17Ci0gICAgcmV0dXJuIGppdC5i cmFuY2hUZXN0OChNYWNyb0Fzc2VtYmxlcjo6Tm9uWmVybywgTWFjcm9Bc3NlbWJsZXI6OkFkZHJl c3Mob3duZXIsIEpTQ2VsbDo6Z2NEYXRhT2Zmc2V0KCkpKTsKLX0KLQotSklUQ29tcGlsZXI6Okp1 bXAgU3BlY3VsYXRpdmVKSVQ6OmNoZWNrTWFya0J5dGUoQ0NhbGxIZWxwZXJzJiBqaXQsIEpTQ2Vs bCogb3duZXIpCi17Ci0gICAgdWludDhfdCogYWRkcmVzcyA9IHJlaW50ZXJwcmV0X2Nhc3Q8dWlu dDhfdCo+KG93bmVyKSArIEpTQ2VsbDo6Z2NEYXRhT2Zmc2V0KCk7Ci0gICAgcmV0dXJuIGppdC5i cmFuY2hUZXN0OChNYWNyb0Fzc2VtYmxlcjo6Tm9uWmVybywgTWFjcm9Bc3NlbWJsZXI6OkFic29s dXRlQWRkcmVzcyhhZGRyZXNzKSk7Ci19Ci0KIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OnN0b3JlVG9X cml0ZUJhcnJpZXJCdWZmZXIoR1BSUmVnIGNlbGwsIEdQUlJlZyBzY3JhdGNoMSwgR1BSUmVnIHNj cmF0Y2gyKQogewogICAgIEFTU0VSVChzY3JhdGNoMSAhPSBzY3JhdGNoMik7CkBAIC01NTM2LDE0 ICs1NTI1LDE0IEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OndyaXRlQmFycmllcihHUFJSZWcKICAg ICBpZiAoSGVhcDo6aXNNYXJrZWQodmFsdWUpKQogICAgICAgICByZXR1cm47CiAKLSAgICBKSVRD b21waWxlcjo6SnVtcCBvd25lck5vdE1hcmtlZE9yQWxyZWFkeVJlbWVtYmVyZWQgPSBjaGVja01h cmtCeXRlKG1faml0LCBvd25lckdQUik7CisgICAgSklUQ29tcGlsZXI6Okp1bXAgb3duZXJOb3RN YXJrZWRPckFscmVhZHlSZW1lbWJlcmVkID0gbV9qaXQuY2hlY2tNYXJrQnl0ZShvd25lckdQUik7 CiAgICAgc3RvcmVUb1dyaXRlQmFycmllckJ1ZmZlcihvd25lckdQUiwgc2NyYXRjaDEsIHNjcmF0 Y2gyKTsKICAgICBvd25lck5vdE1hcmtlZE9yQWxyZWFkeVJlbWVtYmVyZWQubGluaygmbV9qaXQp OwogfQogCiB2b2lkIFNwZWN1bGF0aXZlSklUOjp3cml0ZUJhcnJpZXIoR1BSUmVnIG93bmVyR1BS LCBHUFJSZWcgc2NyYXRjaDEsIEdQUlJlZyBzY3JhdGNoMikKIHsKLSAgICBKSVRDb21waWxlcjo6 SnVtcCBvd25lck5vdE1hcmtlZE9yQWxyZWFkeVJlbWVtYmVyZWQgPSBjaGVja01hcmtCeXRlKG1f aml0LCBvd25lckdQUik7CisgICAgSklUQ29tcGlsZXI6Okp1bXAgb3duZXJOb3RNYXJrZWRPckFs cmVhZHlSZW1lbWJlcmVkID0gbV9qaXQuY2hlY2tNYXJrQnl0ZShvd25lckdQUik7CiAgICAgc3Rv cmVUb1dyaXRlQmFycmllckJ1ZmZlcihvd25lckdQUiwgc2NyYXRjaDEsIHNjcmF0Y2gyKTsKICAg ICBvd25lck5vdE1hcmtlZE9yQWxyZWFkeVJlbWVtYmVyZWQubGluaygmbV9qaXQpOwogfQpJbmRl eDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuaAkocmV2 aXNpb24gMTY1MTYwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2 ZUpJVC5oCSh3b3JraW5nIGNvcHkpCkBAIC0yOTYsOCArMjk2LDYgQEAgcHVibGljOgogICAgIHZv aWQgc3RvcmVUb1dyaXRlQmFycmllckJ1ZmZlcihHUFJSZWcgY2VsbCwgR1BSUmVnIHNjcmF0Y2gx LCBHUFJSZWcgc2NyYXRjaDIpOwogICAgIHZvaWQgc3RvcmVUb1dyaXRlQmFycmllckJ1ZmZlcihK U0NlbGwqLCBHUFJSZWcgc2NyYXRjaDEsIEdQUlJlZyBzY3JhdGNoMik7CiAKLSAgICBzdGF0aWMg SklUQ29tcGlsZXI6Okp1bXAgY2hlY2tNYXJrQnl0ZShDQ2FsbEhlbHBlcnMmIGppdCwgR1BSUmVn IG93bmVyKTsKLSAgICBzdGF0aWMgSklUQ29tcGlsZXI6Okp1bXAgY2hlY2tNYXJrQnl0ZShDQ2Fs bEhlbHBlcnMmIGppdCwgSlNDZWxsKiBvd25lcik7CiAgICAgdm9pZCB3cml0ZUJhcnJpZXIoR1BS UmVnIG93bmVyLCBHUFJSZWcgc2NyYXRjaDEsIEdQUlJlZyBzY3JhdGNoMik7CiAgICAgdm9pZCB3 cml0ZUJhcnJpZXIoR1BSUmVnIG93bmVyLCBKU0NlbGwqIHZhbHVlLCBHUFJSZWcgc2NyYXRjaDEs IEdQUlJlZyBzY3JhdGNoMik7CiAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvQXNz ZW1ibHlIZWxwZXJzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9B c3NlbWJseUhlbHBlcnMuaAkocmV2aXNpb24gMTY1MTYwKQorKysgU291cmNlL0phdmFTY3JpcHRD b3JlL2ppdC9Bc3NlbWJseUhlbHBlcnMuaAkod29ya2luZyBjb3B5KQpAQCAtMzg3LDExICszODcs NiBAQCBwdWJsaWM6CiAgICAgdm9pZCBqaXRBc3NlcnRBcmd1bWVudENvdW50U2FuZSgpIHsgfQog I2VuZGlmCiAKLSAgICBKdW1wIGNoZWNrTWFya0J5dGUoR1BSUmVnIG93bmVyKQotICAgIHsKLSAg ICAgICAgcmV0dXJuIGJyYW5jaFRlc3Q4KE5vblplcm8sIEFkZHJlc3Mob3duZXIsIEpTQ2VsbDo6 Z2NEYXRhT2Zmc2V0KCkpKTsKLSAgICB9Ci0KICAgICAvLyBUaGVzZSBtZXRob2RzIGNvbnZlcnQg YmV0d2VlbiBkb3VibGVzLCBhbmQgZG91YmxlcyBib3hlZCBhbmQgSlNWYWx1ZXMuCiAjaWYgVVNF KEpTVkFMVUU2NCkKICAgICBHUFJSZWcgYm94RG91YmxlKEZQUlJlZyBmcHIsIEdQUlJlZyBncHIp CkBAIC02MjAsMTkgKzYxNSwxNSBAQCBwdWJsaWM6CiAjZW5kaWYKICAgICB9CiAKLSAgICB2b2lk IHdyaXRlQmFycmllcihHUFJSZWcgb3duZXIsIEdQUlJlZyBzY3JhdGNoMSwgR1BSUmVnIHNjcmF0 Y2gyLCBXcml0ZUJhcnJpZXJVc2VLaW5kIHVzZUtpbmQpCisgICAgSnVtcCBjaGVja01hcmtCeXRl KEdQUlJlZyBjZWxsKQogICAgIHsKLSAgICAgICAgVU5VU0VEX1BBUkFNKG93bmVyKTsKLSAgICAg ICAgVU5VU0VEX1BBUkFNKHNjcmF0Y2gxKTsKLSAgICAgICAgVU5VU0VEX1BBUkFNKHNjcmF0Y2gy KTsKLSAgICAgICAgVU5VU0VEX1BBUkFNKHVzZUtpbmQpOwotICAgICAgICBBU1NFUlQob3duZXIg IT0gc2NyYXRjaDEpOwotICAgICAgICBBU1NFUlQob3duZXIgIT0gc2NyYXRjaDIpOwotICAgICAg ICBBU1NFUlQoc2NyYXRjaDEgIT0gc2NyYXRjaDIpOwotICAgICAgICAKLSNpZiBFTkFCTEUoV1JJ VEVfQkFSUklFUl9QUk9GSUxJTkcpCi0gICAgICAgIGVtaXRDb3VudChXcml0ZUJhcnJpZXJDb3Vu dGVyczo6aml0Q291bnRlckZvcih1c2VLaW5kKSk7Ci0jZW5kaWYKKyAgICAgICAgcmV0dXJuIGJy YW5jaFRlc3Q4KE1hY3JvQXNzZW1ibGVyOjpOb25aZXJvLCBNYWNyb0Fzc2VtYmxlcjo6QWRkcmVz cyhjZWxsLCBKU0NlbGw6OmdjRGF0YU9mZnNldCgpKSk7CisgICAgfQorCisgICAgSnVtcCBjaGVj a01hcmtCeXRlKEpTQ2VsbCogY2VsbCkKKyAgICB7CisgICAgICAgIHVpbnQ4X3QqIGFkZHJlc3Mg PSByZWludGVycHJldF9jYXN0PHVpbnQ4X3QqPihjZWxsKSArIEpTQ2VsbDo6Z2NEYXRhT2Zmc2V0 KCk7CisgICAgICAgIHJldHVybiBicmFuY2hUZXN0OChNYWNyb0Fzc2VtYmxlcjo6Tm9uWmVybywg TWFjcm9Bc3NlbWJsZXI6OkFic29sdXRlQWRkcmVzcyhhZGRyZXNzKSk7CiAgICAgfQogCiAgICAg VmVjdG9yPEJ5dGVjb2RlQW5kTWFjaGluZU9mZnNldD4mIGRlY29kZWRDb2RlTWFwRm9yKENvZGVC bG9jayopOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVQuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVC5oCShyZXZpc2lvbiAxNjUxNjApCisr KyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMTQs OCArMzE0LDYgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgIGVudW0gV3JpdGVCYXJyaWVyTW9k ZSB7IFVuY29uZGl0aW9uYWxXcml0ZUJhcnJpZXIsIFNob3VsZEZpbHRlclZhbHVlLCBTaG91bGRG aWx0ZXJCYXNlQW5kVmFsdWUgfTsKICAgICAgICAgLy8gdmFsdWUgcmVnaXN0ZXIgaW4gd3JpdGUg YmFycmllciBpcyB1c2VkIGJlZm9yZSBhbnkgc2NyYXRjaCByZWdpc3RlcnMKICAgICAgICAgLy8g c28gbWF5IHNhZmVseSBiZSB0aGUgc2FtZSBhcyBlaXRoZXIgb2YgdGhlIHNjcmF0Y2ggcmVnaXN0 ZXJzLgotICAgICAgICBKdW1wIGNoZWNrTWFya0J5dGUoUmVnaXN0ZXJJRCBvd25lcik7Ci0gICAg ICAgIEp1bXAgY2hlY2tNYXJrQnl0ZShKU0NlbGwqIG93bmVyKTsKICAgICAgICAgdm9pZCBlbWl0 V3JpdGVCYXJyaWVyKHVuc2lnbmVkIG93bmVyLCB1bnNpZ25lZCB2YWx1ZSwgV3JpdGVCYXJyaWVy TW9kZSk7CiAgICAgICAgIHZvaWQgZW1pdFdyaXRlQmFycmllcihKU0NlbGwqIG93bmVyLCB1bnNp Z25lZCB2YWx1ZSwgV3JpdGVCYXJyaWVyTW9kZSk7CiAgICAgICAgIHZvaWQgZW1pdFdyaXRlQmFy cmllcihKU0NlbGwqIG93bmVyKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklU UHJvcGVydHlBY2Nlc3MuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9q aXQvSklUUHJvcGVydHlBY2Nlc3MuY3BwCShyZXZpc2lvbiAxNjUxNjApCisrKyBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvaml0L0pJVFByb3BlcnR5QWNjZXNzLmNwcAkod29ya2luZyBjb3B5KQpAQCAt ODc5LDE3ICs4NzksNiBAQCB2b2lkIEpJVDo6ZW1pdF9vcF9pbml0X2dsb2JhbF9jb25zdChJbnN0 CiAKICNlbmRpZiAvLyBVU0UoSlNWQUxVRTY0KQogCi1KSVQ6Okp1bXAgSklUOjpjaGVja01hcmtC eXRlKFJlZ2lzdGVySUQgb3duZXIpCi17Ci0gICAgcmV0dXJuIGJyYW5jaFRlc3Q4KE5vblplcm8s IEFkZHJlc3Mob3duZXIsIEpTQ2VsbDo6Z2NEYXRhT2Zmc2V0KCkpKTsKLX0KLQotSklUOjpKdW1w IEpJVDo6Y2hlY2tNYXJrQnl0ZShKU0NlbGwqIG93bmVyKQotewotICAgIHVpbnQ4X3QqIGFkZHJl c3MgPSByZWludGVycHJldF9jYXN0PHVpbnQ4X3QqPihvd25lcikgKyBKU0NlbGw6OmdjRGF0YU9m ZnNldCgpOwotICAgIHJldHVybiBicmFuY2hUZXN0OChOb25aZXJvLCBBYnNvbHV0ZUFkZHJlc3Mo YWRkcmVzcykpOwotfQotCiAjaWYgVVNFKEpTVkFMVUU2NCkKIHZvaWQgSklUOjplbWl0V3JpdGVC YXJyaWVyKHVuc2lnbmVkIG93bmVyLCB1bnNpZ25lZCB2YWx1ZSwgV3JpdGVCYXJyaWVyTW9kZSBt b2RlKQogewpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9SZXBhdGNoLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L1JlcGF0Y2guY3BwCShyZXZpc2lv biAxNjUxNjApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L1JlcGF0Y2guY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC04MjQsMTMgKzgyNCwxMCBAQCBzdGF0aWMgTWFjcm9Bc3NlbWJsZXI6OkNh bGwgd3JpdGVCYXJyaWVyCiAgICAgQVNTRVJUKG93bmVyICE9IHNjcmF0Y2gxKTsKICAgICBBU1NF UlQob3duZXIgIT0gc2NyYXRjaDIpOwogCi0jaWYgRU5BQkxFKERGR19KSVQpCi0gICAgTWFjcm9B c3NlbWJsZXI6Okp1bXAgb3duZXJOb3RNYXJrZWRPckFscmVhZHlSZW1lbWJlcmVkID0gREZHOjpT cGVjdWxhdGl2ZUpJVDo6Y2hlY2tNYXJrQnl0ZShqaXQsIG93bmVyKTsKLSNlbmRpZgorICAgIE1h Y3JvQXNzZW1ibGVyOjpKdW1wIG93bmVyTm90TWFya2VkT3JBbHJlYWR5UmVtZW1iZXJlZCA9IGpp dC5jaGVja01hcmtCeXRlKG93bmVyKTsKICAgICBNYWNyb0Fzc2VtYmxlcjo6Q2FsbCBjYWxsID0g c3RvcmVUb1dyaXRlQmFycmllckJ1ZmZlcihqaXQsIG93bmVyLCBzY3JhdGNoMSwgc2NyYXRjaDIs IGFsbG9jYXRvcik7Ci0jaWYgRU5BQkxFKERGR19KSVQpCiAgICAgb3duZXJOb3RNYXJrZWRPckFs cmVhZHlSZW1lbWJlcmVkLmxpbmsoJmppdCk7Ci0jZW5kaWYKKwogICAgIHJldHVybiBjYWxsOwog fQogI2VuZGlmIC8vIEVOQUJMRShHR0MpCg==