109625 2013-02-12 15:57:49 -0800 DFG SpeculativeJIT64 should be more precise about when it's dealing with a cell (even though it probably doesn't matter) 2013-02-15 15:00:13 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 fpizlo fpizlo barraclough ggaren mark.lam mhahnenberg msaboff oliver sam oldest_to_newest 831377 0 fpizlo 2013-02-12 15:57:49 -0800 It's a style thing. 831379 1 187955 fpizlo 2013-02-12 15:58:52 -0800 Created attachment 187955 the ptch 831380 2 187955 mhahnenberg 2013-02-12 16:00:45 -0800 Comment on attachment 187955 the ptch r=me 834406 3 fpizlo 2013-02-15 15:00:13 -0800 Landed in http://trac.webkit.org/changeset/143057 187955 2013-02-12 15:58:52 -0800 2013-02-12 16:00:45 -0800 the ptch blah.patch text/plain 10140 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTQyNjg2KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBA CisyMDEzLTAyLTEyICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg REZHIFNwZWN1bGF0aXZlSklUNjQgc2hvdWxkIGJlIG1vcmUgcHJlY2lzZSBhYm91dCB3aGVuIGl0 J3MgZGVhbGluZyB3aXRoIGEgY2VsbCAoZXZlbiB0aG91Z2ggaXQgcHJvYmFibHkgZG9lc24ndCBt YXR0ZXIpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MDk2MjUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IGRmZy9ERkdTcGVjdWxhdGl2ZUpJVDY0LmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpTcGVjdWxh dGl2ZUpJVDo6Y29tcGlsZU9iamVjdEVxdWFsaXR5KToKKyAgICAgICAgKEpTQzo6REZHOjpTcGVj dWxhdGl2ZUpJVDo6Y29tcGlsZU9iamVjdFRvT2JqZWN0T3JPdGhlckVxdWFsaXR5KToKKyAgICAg ICAgKEpTQzo6REZHOjpTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZVBlZXBIb2xlT2JqZWN0VG9PYmpl Y3RPck90aGVyRXF1YWxpdHkpOgorICAgICAgICAoSlNDOjpERkc6OlNwZWN1bGF0aXZlSklUOjpj b21waWxlKToKKwogMjAxMy0wMi0xMiAgRmlsaXAgUGl6bG8gIDxmcGl6bG9AYXBwbGUuY29tPgog CiAgICAgICAgIERGRyBDRkEgZG9lc24ndCBmaWx0ZXIgcHJlY2lzZWx5IGVub3VnaCBmb3IgQ29t cGFyZVN0cmljdEVxCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0 aXZlSklUNjQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH U3BlY3VsYXRpdmVKSVQ2NC5jcHAJKHJldmlzaW9uIDE0MjY4NikKKysrIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQ2NC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE1 NDcsNyArMTU0Nyw3IEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGVPYmplY3RFcXVhbGkK ICAgICAgICAgbV9qaXQuZ3JhcGgoKS5nbG9iYWxPYmplY3RGb3Iobm9kZS0+Y29kZU9yaWdpbikt Pm1hc3F1ZXJhZGVzQXNVbmRlZmluZWRXYXRjaHBvaW50KCktPmFkZChzcGVjdWxhdGlvbldhdGNo cG9pbnQoKSk7CiAgICAgICAgIGlmIChtX3N0YXRlLmZvck5vZGUobm9kZS0+Y2hpbGQxKCkpLm1f dHlwZSAmIH5TcGVjT2JqZWN0TWFzaykgewogICAgICAgICAgICAgc3BlY3VsYXRpb25DaGVjaygK LSAgICAgICAgICAgICAgICBCYWRUeXBlLCBKU1ZhbHVlUmVncyhvcDFHUFIpLCBub2RlLT5jaGls ZDEoKSwKKyAgICAgICAgICAgICAgICBCYWRUeXBlLCBKU1ZhbHVlU291cmNlOjp1bmJveGVkQ2Vs bChvcDFHUFIpLCBub2RlLT5jaGlsZDEoKSwKICAgICAgICAgICAgICAgICBtX2ppdC5icmFuY2hQ dHIoCiAgICAgICAgICAgICAgICAgICAgIE1hY3JvQXNzZW1ibGVyOjpFcXVhbCwgCiAgICAgICAg ICAgICAgICAgICAgIE1hY3JvQXNzZW1ibGVyOjpBZGRyZXNzKG9wMUdQUiwgSlNDZWxsOjpzdHJ1 Y3R1cmVPZmZzZXQoKSksIApAQCAtMTU1NSw3ICsxNTU1LDcgQEAgdm9pZCBTcGVjdWxhdGl2ZUpJ VDo6Y29tcGlsZU9iamVjdEVxdWFsaQogICAgICAgICB9CiAgICAgICAgIGlmIChtX3N0YXRlLmZv ck5vZGUobm9kZS0+Y2hpbGQyKCkpLm1fdHlwZSAmIH5TcGVjT2JqZWN0TWFzaykgewogICAgICAg ICAgICAgc3BlY3VsYXRpb25DaGVjaygKLSAgICAgICAgICAgICAgICBCYWRUeXBlLCBKU1ZhbHVl UmVncyhvcDJHUFIpLCBub2RlLT5jaGlsZDIoKSwKKyAgICAgICAgICAgICAgICBCYWRUeXBlLCBK U1ZhbHVlU291cmNlOjp1bmJveGVkQ2VsbChvcDJHUFIpLCBub2RlLT5jaGlsZDIoKSwKICAgICAg ICAgICAgICAgICBtX2ppdC5icmFuY2hQdHIoCiAgICAgICAgICAgICAgICAgICAgIE1hY3JvQXNz ZW1ibGVyOjpFcXVhbCwgCiAgICAgICAgICAgICAgICAgICAgIE1hY3JvQXNzZW1ibGVyOjpBZGRy ZXNzKG9wMkdQUiwgSlNDZWxsOjpzdHJ1Y3R1cmVPZmZzZXQoKSksIApAQCAtMTU2OCwxMyArMTU2 OCwxMyBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlT2JqZWN0RXF1YWxpCiAgICAgICAg IG1faml0LmxvYWRQdHIoTWFjcm9Bc3NlbWJsZXI6OkFkZHJlc3Mob3AxR1BSLCBKU0NlbGw6OnN0 cnVjdHVyZU9mZnNldCgpKSwgc3RydWN0dXJlR1BSKTsKICAgICAgICAgaWYgKG1fc3RhdGUuZm9y Tm9kZShub2RlLT5jaGlsZDEoKSkubV90eXBlICYgflNwZWNPYmplY3RNYXNrKSB7CiAgICAgICAg ICAgICBzcGVjdWxhdGlvbkNoZWNrKAotICAgICAgICAgICAgICAgIEJhZFR5cGUsIEpTVmFsdWVS ZWdzKG9wMUdQUiksIG5vZGUtPmNoaWxkMSgpLAorICAgICAgICAgICAgICAgIEJhZFR5cGUsIEpT VmFsdWVTb3VyY2U6OnVuYm94ZWRDZWxsKG9wMUdQUiksIG5vZGUtPmNoaWxkMSgpLAogICAgICAg ICAgICAgICAgIG1faml0LmJyYW5jaFB0cigKICAgICAgICAgICAgICAgICAgICAgTWFjcm9Bc3Nl bWJsZXI6OkVxdWFsLCAKICAgICAgICAgICAgICAgICAgICAgc3RydWN0dXJlR1BSLCAKICAgICAg ICAgICAgICAgICAgICAgTWFjcm9Bc3NlbWJsZXI6OlRydXN0ZWRJbW1QdHIobV9qaXQuZ2xvYmFs RGF0YSgpLT5zdHJpbmdTdHJ1Y3R1cmUuZ2V0KCkpKSk7CiAgICAgICAgIH0KLSAgICAgICAgc3Bl Y3VsYXRpb25DaGVjayhCYWRUeXBlLCBKU1ZhbHVlUmVncyhvcDFHUFIpLCBub2RlLT5jaGlsZDEo KSwKKyAgICAgICAgc3BlY3VsYXRpb25DaGVjayhCYWRUeXBlLCBKU1ZhbHVlU291cmNlOjp1bmJv eGVkQ2VsbChvcDFHUFIpLCBub2RlLT5jaGlsZDEoKSwKICAgICAgICAgICAgIG1faml0LmJyYW5j aFRlc3Q4KAogICAgICAgICAgICAgICAgIE1hY3JvQXNzZW1ibGVyOjpOb25aZXJvLCAKICAgICAg ICAgICAgICAgICBNYWNyb0Fzc2VtYmxlcjo6QWRkcmVzcyhzdHJ1Y3R1cmVHUFIsIFN0cnVjdHVy ZTo6dHlwZUluZm9GbGFnc09mZnNldCgpKSwgCkBAIC0xNTgzLDEzICsxNTgzLDEzIEBAIHZvaWQg U3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGVPYmplY3RFcXVhbGkKICAgICAgICAgbV9qaXQubG9hZFB0 cihNYWNyb0Fzc2VtYmxlcjo6QWRkcmVzcyhvcDJHUFIsIEpTQ2VsbDo6c3RydWN0dXJlT2Zmc2V0 KCkpLCBzdHJ1Y3R1cmVHUFIpOwogICAgICAgICBpZiAobV9zdGF0ZS5mb3JOb2RlKG5vZGUtPmNo aWxkMigpKS5tX3R5cGUgJiB+U3BlY09iamVjdE1hc2spIHsKICAgICAgICAgICAgIHNwZWN1bGF0 aW9uQ2hlY2soCi0gICAgICAgICAgICAgICAgQmFkVHlwZSwgSlNWYWx1ZVJlZ3Mob3AyR1BSKSwg bm9kZS0+Y2hpbGQyKCksCisgICAgICAgICAgICAgICAgQmFkVHlwZSwgSlNWYWx1ZVNvdXJjZTo6 dW5ib3hlZENlbGwob3AyR1BSKSwgbm9kZS0+Y2hpbGQyKCksCiAgICAgICAgICAgICAgICAgbV9q aXQuYnJhbmNoUHRyKAogICAgICAgICAgICAgICAgICAgICBNYWNyb0Fzc2VtYmxlcjo6RXF1YWws IAogICAgICAgICAgICAgICAgICAgICBzdHJ1Y3R1cmVHUFIsIAogICAgICAgICAgICAgICAgICAg ICBNYWNyb0Fzc2VtYmxlcjo6VHJ1c3RlZEltbVB0cihtX2ppdC5nbG9iYWxEYXRhKCktPnN0cmlu Z1N0cnVjdHVyZS5nZXQoKSkpKTsKICAgICAgICAgfQotICAgICAgICBzcGVjdWxhdGlvbkNoZWNr KEJhZFR5cGUsIEpTVmFsdWVSZWdzKG9wMkdQUiksIG5vZGUtPmNoaWxkMigpLAorICAgICAgICBz cGVjdWxhdGlvbkNoZWNrKEJhZFR5cGUsIEpTVmFsdWVTb3VyY2U6OnVuYm94ZWRDZWxsKG9wMkdQ UiksIG5vZGUtPmNoaWxkMigpLAogICAgICAgICAgICAgbV9qaXQuYnJhbmNoVGVzdDgoCiAgICAg ICAgICAgICAgICAgTWFjcm9Bc3NlbWJsZXI6Ok5vblplcm8sIAogICAgICAgICAgICAgICAgIE1h Y3JvQXNzZW1ibGVyOjpBZGRyZXNzKHN0cnVjdHVyZUdQUiwgU3RydWN0dXJlOjp0eXBlSW5mb0Zs YWdzT2Zmc2V0KCkpLCAKQEAgLTE2MjAsNyArMTYyMCw3IEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6 OmNvbXBpbGVPYmplY3RUb09iamUKICAgICAgICAgbV9qaXQuZ3JhcGgoKS5nbG9iYWxPYmplY3RG b3IobV9jdXJyZW50Tm9kZS0+Y29kZU9yaWdpbiktPm1hc3F1ZXJhZGVzQXNVbmRlZmluZWRXYXRj aHBvaW50KCktPmFkZChzcGVjdWxhdGlvbldhdGNocG9pbnQoKSk7CiAgICAgICAgIGlmIChtX3N0 YXRlLmZvck5vZGUobGVmdENoaWxkKS5tX3R5cGUgJiB+U3BlY09iamVjdE1hc2spIHsKICAgICAg ICAgICAgIHNwZWN1bGF0aW9uQ2hlY2soCi0gICAgICAgICAgICAgICAgQmFkVHlwZSwgSlNWYWx1 ZVJlZ3Mob3AxR1BSKSwgbGVmdENoaWxkLCAKKyAgICAgICAgICAgICAgICBCYWRUeXBlLCBKU1Zh bHVlU291cmNlOjp1bmJveGVkQ2VsbChvcDFHUFIpLCBsZWZ0Q2hpbGQsIAogICAgICAgICAgICAg ICAgIG1faml0LmJyYW5jaFB0cigKICAgICAgICAgICAgICAgICAgICAgTWFjcm9Bc3NlbWJsZXI6 OkVxdWFsLCAKICAgICAgICAgICAgICAgICAgICAgTWFjcm9Bc3NlbWJsZXI6OkFkZHJlc3Mob3Ax R1BSLCBKU0NlbGw6OnN0cnVjdHVyZU9mZnNldCgpKSwgCkBAIC0xNjMzLDEzICsxNjMzLDEzIEBA IHZvaWQgU3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGVPYmplY3RUb09iamUKICAgICAgICAgbV9qaXQu bG9hZFB0cihNYWNyb0Fzc2VtYmxlcjo6QWRkcmVzcyhvcDFHUFIsIEpTQ2VsbDo6c3RydWN0dXJl T2Zmc2V0KCkpLCBzdHJ1Y3R1cmVHUFIpOwogICAgICAgICBpZiAobV9zdGF0ZS5mb3JOb2RlKGxl ZnRDaGlsZCkubV90eXBlICYgflNwZWNPYmplY3RNYXNrKSB7CiAgICAgICAgICAgICBzcGVjdWxh dGlvbkNoZWNrKAotICAgICAgICAgICAgICAgIEJhZFR5cGUsIEpTVmFsdWVSZWdzKG9wMUdQUiks IGxlZnRDaGlsZCwgCisgICAgICAgICAgICAgICAgQmFkVHlwZSwgSlNWYWx1ZVNvdXJjZTo6dW5i b3hlZENlbGwob3AxR1BSKSwgbGVmdENoaWxkLCAKICAgICAgICAgICAgICAgICBtX2ppdC5icmFu Y2hQdHIoCiAgICAgICAgICAgICAgICAgICAgIE1hY3JvQXNzZW1ibGVyOjpFcXVhbCwKICAgICAg ICAgICAgICAgICAgICAgc3RydWN0dXJlR1BSLAogICAgICAgICAgICAgICAgICAgICBNYWNyb0Fz c2VtYmxlcjo6VHJ1c3RlZEltbVB0cihtX2ppdC5nbG9iYWxEYXRhKCktPnN0cmluZ1N0cnVjdHVy ZS5nZXQoKSkpKTsKICAgICAgICAgfQotICAgICAgICBzcGVjdWxhdGlvbkNoZWNrKEJhZFR5cGUs IEpTVmFsdWVSZWdzKG9wMUdQUiksIGxlZnRDaGlsZCwKKyAgICAgICAgc3BlY3VsYXRpb25DaGVj ayhCYWRUeXBlLCBKU1ZhbHVlU291cmNlOjp1bmJveGVkQ2VsbChvcDFHUFIpLCBsZWZ0Q2hpbGQs CiAgICAgICAgICAgICBtX2ppdC5icmFuY2hUZXN0OCgKICAgICAgICAgICAgICAgICBNYWNyb0Fz c2VtYmxlcjo6Tm9uWmVybywgCiAgICAgICAgICAgICAgICAgTWFjcm9Bc3NlbWJsZXI6OkFkZHJl c3Moc3RydWN0dXJlR1BSLCBTdHJ1Y3R1cmU6OnR5cGVJbmZvRmxhZ3NPZmZzZXQoKSksIApAQCAt MTczMCw3ICsxNzMwLDcgQEAgdm9pZCBTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZVBlZXBIb2xlT2Jq ZQogICAgICAgICBtX2ppdC5ncmFwaCgpLmdsb2JhbE9iamVjdEZvcihtX2N1cnJlbnROb2RlLT5j b2RlT3JpZ2luKS0+bWFzcXVlcmFkZXNBc1VuZGVmaW5lZFdhdGNocG9pbnQoKS0+YWRkKHNwZWN1 bGF0aW9uV2F0Y2hwb2ludCgpKTsKICAgICAgICAgaWYgKG1fc3RhdGUuZm9yTm9kZShsZWZ0Q2hp bGQpLm1fdHlwZSAmIH5TcGVjT2JqZWN0TWFzaykgewogICAgICAgICAgICAgc3BlY3VsYXRpb25D aGVjaygKLSAgICAgICAgICAgICAgICBCYWRUeXBlLCBKU1ZhbHVlUmVncyhvcDFHUFIpLCBsZWZ0 Q2hpbGQsIAorICAgICAgICAgICAgICAgIEJhZFR5cGUsIEpTVmFsdWVTb3VyY2U6OnVuYm94ZWRD ZWxsKG9wMUdQUiksIGxlZnRDaGlsZCwgCiAgICAgICAgICAgICAgICAgbV9qaXQuYnJhbmNoUHRy KAogICAgICAgICAgICAgICAgICAgICBNYWNyb0Fzc2VtYmxlcjo6RXF1YWwsIAogICAgICAgICAg ICAgICAgICAgICBNYWNyb0Fzc2VtYmxlcjo6QWRkcmVzcyhvcDFHUFIsIEpTQ2VsbDo6c3RydWN0 dXJlT2Zmc2V0KCkpLCAKQEAgLTE3NDMsMTMgKzE3NDMsMTMgQEAgdm9pZCBTcGVjdWxhdGl2ZUpJ VDo6Y29tcGlsZVBlZXBIb2xlT2JqZQogICAgICAgICBtX2ppdC5sb2FkUHRyKE1hY3JvQXNzZW1i bGVyOjpBZGRyZXNzKG9wMUdQUiwgSlNDZWxsOjpzdHJ1Y3R1cmVPZmZzZXQoKSksIHN0cnVjdHVy ZUdQUik7CiAgICAgICAgIGlmIChtX3N0YXRlLmZvck5vZGUobGVmdENoaWxkKS5tX3R5cGUgJiB+ U3BlY09iamVjdE1hc2spIHsKICAgICAgICAgICAgIHNwZWN1bGF0aW9uQ2hlY2soCi0gICAgICAg ICAgICAgICAgQmFkVHlwZSwgSlNWYWx1ZVJlZ3Mob3AxR1BSKSwgbGVmdENoaWxkLCAKKyAgICAg ICAgICAgICAgICBCYWRUeXBlLCBKU1ZhbHVlU291cmNlOjp1bmJveGVkQ2VsbChvcDFHUFIpLCBs ZWZ0Q2hpbGQsIAogICAgICAgICAgICAgICAgIG1faml0LmJyYW5jaFB0cigKICAgICAgICAgICAg ICAgICAgICAgTWFjcm9Bc3NlbWJsZXI6OkVxdWFsLCAKICAgICAgICAgICAgICAgICAgICAgc3Ry dWN0dXJlR1BSLCAKICAgICAgICAgICAgICAgICAgICAgTWFjcm9Bc3NlbWJsZXI6OlRydXN0ZWRJ bW1QdHIobV9qaXQuZ2xvYmFsRGF0YSgpLT5zdHJpbmdTdHJ1Y3R1cmUuZ2V0KCkpKSk7CiAgICAg ICAgIH0KLSAgICAgICAgc3BlY3VsYXRpb25DaGVjayhCYWRUeXBlLCBKU1ZhbHVlUmVncyhvcDFH UFIpLCBsZWZ0Q2hpbGQsIAorICAgICAgICBzcGVjdWxhdGlvbkNoZWNrKEJhZFR5cGUsIEpTVmFs dWVTb3VyY2U6OnVuYm94ZWRDZWxsKG9wMUdQUiksIGxlZnRDaGlsZCwgCiAgICAgICAgICAgICBt X2ppdC5icmFuY2hUZXN0OCgKICAgICAgICAgICAgICAgICBNYWNyb0Fzc2VtYmxlcjo6Tm9uWmVy bywgCiAgICAgICAgICAgICAgICAgTWFjcm9Bc3NlbWJsZXI6OkFkZHJlc3Moc3RydWN0dXJlR1BS LCBTdHJ1Y3R1cmU6OnR5cGVJbmZvRmxhZ3NPZmZzZXQoKSksIApAQCAtMzg2NSw3ICszODY1LDcg QEAgdm9pZCBTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZShOb2RlKiBub2RlKQogICAgICAgICAgICAg R1BSUmVnIHJlc3VsdEdQUiA9IHJlc3VsdC5ncHIoKTsKICAgICAgICAgICAgIAogICAgICAgICAg ICAgaWYgKCFpc09iamVjdFNwZWN1bGF0aW9uKG1fc3RhdGUuZm9yTm9kZShub2RlLT5jaGlsZDEo KSkubV90eXBlKSkKLSAgICAgICAgICAgICAgICBzcGVjdWxhdGlvbkNoZWNrKEJhZFR5cGUsIEpT VmFsdWVSZWdzKHRoaXNWYWx1ZUdQUiksIG5vZGUtPmNoaWxkMSgpLCBtX2ppdC5icmFuY2hQdHIo SklUQ29tcGlsZXI6OkVxdWFsLCBKSVRDb21waWxlcjo6QWRkcmVzcyh0aGlzVmFsdWVHUFIsIEpT Q2VsbDo6c3RydWN0dXJlT2Zmc2V0KCkpLCBKSVRDb21waWxlcjo6VHJ1c3RlZEltbVB0cihtX2pp dC5nbG9iYWxEYXRhKCktPnN0cmluZ1N0cnVjdHVyZS5nZXQoKSkpKTsKKyAgICAgICAgICAgICAg ICBzcGVjdWxhdGlvbkNoZWNrKEJhZFR5cGUsIEpTVmFsdWVTb3VyY2U6OnVuYm94ZWRDZWxsKHRo aXNWYWx1ZUdQUiksIG5vZGUtPmNoaWxkMSgpLCBtX2ppdC5icmFuY2hQdHIoSklUQ29tcGlsZXI6 OkVxdWFsLCBKSVRDb21waWxlcjo6QWRkcmVzcyh0aGlzVmFsdWVHUFIsIEpTQ2VsbDo6c3RydWN0 dXJlT2Zmc2V0KCkpLCBKSVRDb21waWxlcjo6VHJ1c3RlZEltbVB0cihtX2ppdC5nbG9iYWxEYXRh KCktPnN0cmluZ1N0cnVjdHVyZS5nZXQoKSkpKTsKICAgICAgICAgICAgIAogICAgICAgICAgICAg bV9qaXQubW92ZSh0aGlzVmFsdWVHUFIsIHJlc3VsdEdQUik7CiAgICAgICAgICAgICAKQEAgLTQx MzEsMTQgKzQxMzEsMTQgQEAgdm9pZCBTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZShOb2RlKiBub2Rl KQogICAgICAgICAKICAgICBjYXNlIENoZWNrRnVuY3Rpb246IHsKICAgICAgICAgU3BlY3VsYXRl Q2VsbE9wZXJhbmQgZnVuY3Rpb24odGhpcywgbm9kZS0+Y2hpbGQxKCkpOwotICAgICAgICBzcGVj dWxhdGlvbkNoZWNrKEJhZEZ1bmN0aW9uLCBKU1ZhbHVlUmVncyhmdW5jdGlvbi5ncHIoKSksIG5v ZGUtPmNoaWxkMSgpLCBtX2ppdC5icmFuY2hXZWFrUHRyKEpJVENvbXBpbGVyOjpOb3RFcXVhbCwg ZnVuY3Rpb24uZ3ByKCksIG5vZGUtPmZ1bmN0aW9uKCkpKTsKKyAgICAgICAgc3BlY3VsYXRpb25D aGVjayhCYWRGdW5jdGlvbiwgSlNWYWx1ZVNvdXJjZTo6dW5ib3hlZENlbGwoZnVuY3Rpb24uZ3By KCkpLCBub2RlLT5jaGlsZDEoKSwgbV9qaXQuYnJhbmNoV2Vha1B0cihKSVRDb21waWxlcjo6Tm90 RXF1YWwsIGZ1bmN0aW9uLmdwcigpLCBub2RlLT5mdW5jdGlvbigpKSk7CiAgICAgICAgIG5vUmVz dWx0KG5vZGUpOwogICAgICAgICBicmVhazsKICAgICB9CiAgICAgICAgIAogICAgIGNhc2UgQ2hl Y2tFeGVjdXRhYmxlOiB7CiAgICAgICAgIFNwZWN1bGF0ZUNlbGxPcGVyYW5kIGZ1bmN0aW9uKHRo aXMsIG5vZGUtPmNoaWxkMSgpKTsKLSAgICAgICAgc3BlY3VsYXRpb25DaGVjayhCYWRFeGVjdXRh YmxlLCBKU1ZhbHVlUmVncyhmdW5jdGlvbi5ncHIoKSksIG5vZGUtPmNoaWxkMSgpLCBtX2ppdC5i cmFuY2hXZWFrUHRyKEpJVENvbXBpbGVyOjpOb3RFcXVhbCwgSklUQ29tcGlsZXI6OkFkZHJlc3Mo ZnVuY3Rpb24uZ3ByKCksIEpTRnVuY3Rpb246Om9mZnNldE9mRXhlY3V0YWJsZSgpKSwgbm9kZS0+ ZXhlY3V0YWJsZSgpKSk7CisgICAgICAgIHNwZWN1bGF0aW9uQ2hlY2soQmFkRXhlY3V0YWJsZSwg SlNWYWx1ZVNvdXJjZTo6dW5ib3hlZENlbGwoZnVuY3Rpb24uZ3ByKCkpLCBub2RlLT5jaGlsZDEo KSwgbV9qaXQuYnJhbmNoV2Vha1B0cihKSVRDb21waWxlcjo6Tm90RXF1YWwsIEpJVENvbXBpbGVy OjpBZGRyZXNzKGZ1bmN0aW9uLmdwcigpLCBKU0Z1bmN0aW9uOjpvZmZzZXRPZkV4ZWN1dGFibGUo KSksIG5vZGUtPmV4ZWN1dGFibGUoKSkpOwogICAgICAgICBub1Jlc3VsdChub2RlKTsKICAgICAg ICAgYnJlYWs7CiAgICAgfQpAQCAtNDE2NSw3ICs0MTY1LDcgQEAgdm9pZCBTcGVjdWxhdGl2ZUpJ VDo6Y29tcGlsZShOb2RlKiBub2RlKQogICAgICAgICAKICAgICAgICAgaWYgKG5vZGUtPnN0cnVj dHVyZVNldCgpLnNpemUoKSA9PSAxKSB7CiAgICAgICAgICAgICBzcGVjdWxhdGlvbkNoZWNrKAot ICAgICAgICAgICAgICAgIGV4aXRLaW5kLCBKU1ZhbHVlUmVncyhiYXNlLmdwcigpKSwgMCwKKyAg ICAgICAgICAgICAgICBleGl0S2luZCwgSlNWYWx1ZVNvdXJjZTo6dW5ib3hlZENlbGwoYmFzZS5n cHIoKSksIDAsCiAgICAgICAgICAgICAgICAgbV9qaXQuYnJhbmNoV2Vha1B0cigKICAgICAgICAg ICAgICAgICAgICAgSklUQ29tcGlsZXI6Ok5vdEVxdWFsLAogICAgICAgICAgICAgICAgICAgICBK SVRDb21waWxlcjo6QWRkcmVzcyhiYXNlLmdwcigpLCBKU0NlbGw6OnN0cnVjdHVyZU9mZnNldCgp KSwKQEAgLTQxODIsNyArNDE4Miw3IEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGUoTm9k ZSogbm9kZSkKICAgICAgICAgICAgICAgICBkb25lLmFwcGVuZChtX2ppdC5icmFuY2hXZWFrUHRy KEpJVENvbXBpbGVyOjpFcXVhbCwgc3RydWN0dXJlLmdwcigpLCBub2RlLT5zdHJ1Y3R1cmVTZXQo KVtpXSkpOwogICAgICAgICAgICAgCiAgICAgICAgICAgICBzcGVjdWxhdGlvbkNoZWNrKAotICAg ICAgICAgICAgICAgIGV4aXRLaW5kLCBKU1ZhbHVlUmVncyhiYXNlLmdwcigpKSwgMCwKKyAgICAg ICAgICAgICAgICBleGl0S2luZCwgSlNWYWx1ZVNvdXJjZTo6dW5ib3hlZENlbGwoYmFzZS5ncHIo KSksIDAsCiAgICAgICAgICAgICAgICAgbV9qaXQuYnJhbmNoV2Vha1B0cigKICAgICAgICAgICAg ICAgICAgICAgSklUQ29tcGlsZXI6Ok5vdEVxdWFsLCBzdHJ1Y3R1cmUuZ3ByKCksIG5vZGUtPnN0 cnVjdHVyZVNldCgpLmxhc3QoKSksCiAgICAgICAgICAgICAgICAgZGlyZWN0aW9uKTsK