149879 2015-10-07 11:10:37 -0700 JIT::emitGetGlobalProperty/emitPutGlobalProperty are only called from one place 2015-10-07 12:07:57 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build All All RESOLVED FIXED P2 Normal --- 149852 1 fpizlo fpizlo barraclough benjamin commit-queue ggaren mark.lam mhahnenb msaboff nrotem oliver saam sam oldest_to_newest 1131333 0 fpizlo 2015-10-07 11:10:37 -0700 They should be inlined. 1131335 1 262616 fpizlo 2015-10-07 11:12:48 -0700 Created attachment 262616 the patch 1131336 2 262616 saam 2015-10-07 11:14:21 -0700 Comment on attachment 262616 the patch lgtm 1131337 3 commit-queue 2015-10-07 11:14:30 -0700 Attachment 262616 did not pass style-queue: ERROR: Source/JavaScriptCore/jit/JITPropertyAccess.cpp:785: Non-label code inside switch statements should be indented. [whitespace/indent] [4] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1131339 4 fpizlo 2015-10-07 11:18:25 -0700 I've got build fixes for everything locally. 1131342 5 fpizlo 2015-10-07 11:27:37 -0700 Landed in http://trac.webkit.org/changeset/190675 The version of this that I ladned had the fix for 64-bit. 1131359 6 fpizlo 2015-10-07 12:07:57 -0700 Landed in http://trac.webkit.org/changeset/190675 262616 2015-10-07 11:12:48 -0700 2015-10-07 11:14:21 -0700 the patch blah.patch text/plain 12001 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTkwNjczKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBA CisyMDE1LTEwLTA3ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg SklUOjplbWl0R2V0R2xvYmFsUHJvcGVydHkvZW1pdFB1dEdsb2JhbFByb3BlcnR5IGFyZSBvbmx5 IGNhbGxlZCBmcm9tIG9uZSBwbGFjZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTQ5ODc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVG8gc2ltcGxpZnkgbXkgd29yayB0byBpbnNlcnQgYmFycmllcnMgb24g bG9hZHMgb2YgdGhlIGJ1dHRlcmZseSwgSSB3YW50IHRvIHJlZHVjZSB0aGUgYW1vdW50CisgICAg ICAgIG9mIGFic3RyYWN0aW9uIHdlIGhhdmUgYXJvdW5kIGNvZGUgdGhhdCBsb2FkcyB0aGUgYnV0 dGVyZmx5LgorCisgICAgICAgICogaml0L0pJVC5oOgorICAgICAgICAqIGppdC9KSVRQcm9wZXJ0 eUFjY2Vzcy5jcHA6CisgICAgICAgIChKU0M6OkpJVDo6ZW1pdExvYWRXaXRoU3RydWN0dXJlQ2hl Y2spOgorICAgICAgICAoSlNDOjpKSVQ6OmVtaXRHZXRWYXJGcm9tUG9pbnRlcik6CisgICAgICAg IChKU0M6OkpJVDo6ZW1pdF9vcF9nZXRfZnJvbV9zY29wZSk6CisgICAgICAgIChKU0M6OkpJVDo6 ZW1pdFNsb3dfb3BfZ2V0X2Zyb21fc2NvcGUpOgorICAgICAgICAoSlNDOjpKSVQ6OmVtaXRQdXRH bG9iYWxWYXJpYWJsZSk6CisgICAgICAgIChKU0M6OkpJVDo6ZW1pdF9vcF9wdXRfdG9fc2NvcGUp OgorICAgICAgICAoSlNDOjpKSVQ6OmVtaXRHZXRHbG9iYWxQcm9wZXJ0eSk6IERlbGV0ZWQuCisg ICAgICAgIChKU0M6OkpJVDo6ZW1pdFB1dEdsb2JhbFByb3BlcnR5KTogRGVsZXRlZC4KKyAgICAg ICAgKiBqaXQvSklUUHJvcGVydHlBY2Nlc3MzMl82NC5jcHA6CisgICAgICAgIChKU0M6OkpJVDo6 ZW1pdExvYWRXaXRoU3RydWN0dXJlQ2hlY2spOgorICAgICAgICAoSlNDOjpKSVQ6OmVtaXRHZXRW YXJGcm9tUG9pbnRlcik6CisgICAgICAgIChKU0M6OkpJVDo6ZW1pdF9vcF9nZXRfZnJvbV9zY29w ZSk6CisgICAgICAgIChKU0M6OkpJVDo6ZW1pdFNsb3dfb3BfZ2V0X2Zyb21fc2NvcGUpOgorICAg ICAgICAoSlNDOjpKSVQ6OmVtaXRQdXRHbG9iYWxWYXJpYWJsZSk6CisgICAgICAgIChKU0M6OkpJ VDo6ZW1pdF9vcF9wdXRfdG9fc2NvcGUpOgorICAgICAgICAoSlNDOjpKSVQ6OmVtaXRHZXRHbG9i YWxQcm9wZXJ0eSk6IERlbGV0ZWQuCisgICAgICAgIChKU0M6OkpJVDo6ZW1pdFB1dEdsb2JhbFBy b3BlcnR5KTogRGVsZXRlZC4KKwogMjAxNS0xMC0wNyAgRmlsaXAgUGl6bG8gIDxmcGl6bG9AYXBw bGUuY29tPgogCiAgICAgICAgIEpJVDo6Y29tcGlsZUdldERpcmVjdE9mZnNldCBpcyB1c2VsZXNz CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVC5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklULmgJKHJldmlzaW9uIDE5MDY3MykKKysrIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklULmgJKHdvcmtpbmcgY29weSkKQEAgLTY2OCw3ICs2Njgs NiBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAgdm9pZCBlbWl0VmFySW5qZWN0aW9uQ2hlY2so Ym9vbCBuZWVkc1ZhckluamVjdGlvbkNoZWNrcyk7CiAgICAgICAgIHZvaWQgZW1pdFJlc29sdmVD bG9zdXJlKGludCBkc3QsIGludCBzY29wZSwgYm9vbCBuZWVkc1ZhckluamVjdGlvbkNoZWNrcywg dW5zaWduZWQgZGVwdGgpOwogICAgICAgICB2b2lkIGVtaXRMb2FkV2l0aFN0cnVjdHVyZUNoZWNr KGludCBzY29wZSwgU3RydWN0dXJlKiogc3RydWN0dXJlU2xvdCk7Ci0gICAgICAgIHZvaWQgZW1p dEdldEdsb2JhbFByb3BlcnR5KHVpbnRwdHJfdCogb3BlcmFuZFNsb3QpOwogI2lmIFVTRShKU1ZB TFVFNjQpCiAgICAgICAgIHZvaWQgZW1pdEdldFZhckZyb21Qb2ludGVyKEpTVmFsdWUqIG9wZXJh bmQsIEdQUlJlZyk7CiAgICAgICAgIHZvaWQgZW1pdEdldFZhckZyb21JbmRpcmVjdFBvaW50ZXIo SlNWYWx1ZSoqIG9wZXJhbmQsIEdQUlJlZyk7CkBAIC02NzcsNyArNjc2LDYgQEAgbmFtZXNwYWNl IEpTQyB7CiAgICAgICAgIHZvaWQgZW1pdEdldFZhckZyb21Qb2ludGVyKEpTVmFsdWUqIG9wZXJh bmQsIEdQUlJlZyB0YWcsIEdQUlJlZyBwYXlsb2FkKTsKICNlbmRpZgogICAgICAgICB2b2lkIGVt aXRHZXRDbG9zdXJlVmFyKGludCBzY29wZSwgdWludHB0cl90IG9wZXJhbmQpOwotICAgICAgICB2 b2lkIGVtaXRQdXRHbG9iYWxQcm9wZXJ0eSh1aW50cHRyX3QqIG9wZXJhbmRTbG90LCBpbnQgdmFs dWUpOwogICAgICAgICB2b2lkIGVtaXROb3RpZnlXcml0ZShXYXRjaHBvaW50U2V0Kik7CiAgICAg ICAgIHZvaWQgZW1pdE5vdGlmeVdyaXRlKEdQUlJlZyBwb2ludGVyVG9TZXQpOwogICAgICAgICB2 b2lkIGVtaXRQdXRHbG9iYWxWYXJpYWJsZShKU1ZhbHVlKiBvcGVyYW5kLCBpbnQgdmFsdWUsIFdh dGNocG9pbnRTZXQqKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUUHJvcGVy dHlBY2Nlc3MzMl82NC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2pp dC9KSVRQcm9wZXJ0eUFjY2VzczMyXzY0LmNwcAkocmV2aXNpb24gMTkwNjczKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL2ppdC9KSVRQcm9wZXJ0eUFjY2VzczMyXzY0LmNwcAkod29ya2luZyBj b3B5KQpAQCAtNzgwLDI2ICs3ODAsNiBAQCB2b2lkIEpJVDo6ZW1pdExvYWRXaXRoU3RydWN0dXJl Q2hlY2soaW50CiAgICAgYWRkU2xvd0Nhc2UoYnJhbmNoUHRyKE5vdEVxdWFsLCBBZGRyZXNzKHJl Z1QwLCBKU0NlbGw6OnN0cnVjdHVyZUlET2Zmc2V0KCkpLCByZWdUMikpOwogfQogCi12b2lkIEpJ VDo6ZW1pdEdldEdsb2JhbFByb3BlcnR5KHVpbnRwdHJfdCogb3BlcmFuZFNsb3QpCi17Ci0gICAg R1BSUmVnIGJhc2UgPSByZWdUMjsKLSAgICBHUFJSZWcgcmVzdWx0VGFnID0gcmVnVDE7Ci0gICAg R1BSUmVnIHJlc3VsdFBheWxvYWQgPSByZWdUMDsKLSAgICBHUFJSZWcgb2Zmc2V0ID0gcmVnVDM7 Ci0gICAgCi0gICAgbW92ZShyZWdUMCwgYmFzZSk7Ci0gICAgbG9hZDMyKG9wZXJhbmRTbG90LCBv ZmZzZXQpOwotICAgIGlmICghQVNTRVJUX0RJU0FCTEVEKSB7Ci0gICAgICAgIEp1bXAgaXNPdXRP ZkxpbmUgPSBicmFuY2gzMihHcmVhdGVyVGhhbk9yRXF1YWwsIG9mZnNldCwgVHJ1c3RlZEltbTMy KGZpcnN0T3V0T2ZMaW5lT2Zmc2V0KSk7Ci0gICAgICAgIGFib3J0V2l0aFJlYXNvbihKSVRPZmZz ZXRJc05vdE91dE9mTGluZSk7Ci0gICAgICAgIGlzT3V0T2ZMaW5lLmxpbmsodGhpcyk7Ci0gICAg fQotICAgIGxvYWRQdHIoQWRkcmVzcyhiYXNlLCBKU09iamVjdDo6YnV0dGVyZmx5T2Zmc2V0KCkp LCBiYXNlKTsKLSAgICBuZWczMihvZmZzZXQpOwotICAgIGxvYWQzMihCYXNlSW5kZXgoYmFzZSwg b2Zmc2V0LCBUaW1lc0VpZ2h0LCBPQkpFQ1RfT0ZGU0VUT0YoSlNWYWx1ZSwgdS5hc0JpdHMucGF5 bG9hZCkgKyAoZmlyc3RPdXRPZkxpbmVPZmZzZXQgLSAyKSAqIHNpemVvZihFbmNvZGVkSlNWYWx1 ZSkpLCByZXN1bHRQYXlsb2FkKTsKLSAgICBsb2FkMzIoQmFzZUluZGV4KGJhc2UsIG9mZnNldCwg VGltZXNFaWdodCwgT0JKRUNUX09GRlNFVE9GKEpTVmFsdWUsIHUuYXNCaXRzLnRhZykgKyAoZmly c3RPdXRPZkxpbmVPZmZzZXQgLSAyKSAqIHNpemVvZihFbmNvZGVkSlNWYWx1ZSkpLCByZXN1bHRU YWcpOwotfQotCiB2b2lkIEpJVDo6ZW1pdEdldFZhckZyb21Qb2ludGVyKEpTVmFsdWUqIG9wZXJh bmQsIEdQUlJlZyB0YWcsIEdQUlJlZyBwYXlsb2FkKQogewogICAgIHVpbnRwdHJfdCByYXdBZGRy ZXNzID0gYml0d2lzZV9jYXN0PHVpbnRwdHJfdD4ob3BlcmFuZCk7CkBAIC04MzEsMTAgKzgxMSwy NiBAQCB2b2lkIEpJVDo6ZW1pdF9vcF9nZXRfZnJvbV9zY29wZShJbnN0cnVjCiAgICAgYXV0byBl bWl0Q29kZSA9IFsmXSAoUmVzb2x2ZVR5cGUgcmVzb2x2ZVR5cGUsIGJvb2wgaW5kaXJlY3RMb2Fk Rm9yT3BlcmFuZCkgewogICAgICAgICBzd2l0Y2ggKHJlc29sdmVUeXBlKSB7CiAgICAgICAgIGNh c2UgR2xvYmFsUHJvcGVydHk6Ci0gICAgICAgIGNhc2UgR2xvYmFsUHJvcGVydHlXaXRoVmFySW5q ZWN0aW9uQ2hlY2tzOgorICAgICAgICBjYXNlIEdsb2JhbFByb3BlcnR5V2l0aFZhckluamVjdGlv bkNoZWNrczogewogICAgICAgICAgICAgZW1pdExvYWRXaXRoU3RydWN0dXJlQ2hlY2soc2NvcGUs IHN0cnVjdHVyZVNsb3QpOyAvLyBTdHJ1Y3R1cmUgY2hlY2sgY292ZXJzIHZhciBpbmplY3Rpb24u Ci0gICAgICAgICAgICBlbWl0R2V0R2xvYmFsUHJvcGVydHkob3BlcmFuZFNsb3QpOworICAgICAg ICAgICAgR1BSUmVnIGJhc2UgPSByZWdUMjsKKyAgICAgICAgICAgIEdQUlJlZyByZXN1bHRUYWcg PSByZWdUMTsKKyAgICAgICAgICAgIEdQUlJlZyByZXN1bHRQYXlsb2FkID0gcmVnVDA7CisgICAg ICAgICAgICBHUFJSZWcgb2Zmc2V0ID0gcmVnVDM7CisgICAgICAgICAgICAKKyAgICAgICAgICAg IG1vdmUocmVnVDAsIGJhc2UpOworICAgICAgICAgICAgbG9hZDMyKG9wZXJhbmRTbG90LCBvZmZz ZXQpOworICAgICAgICAgICAgaWYgKCFBU1NFUlRfRElTQUJMRUQpIHsKKyAgICAgICAgICAgICAg ICBKdW1wIGlzT3V0T2ZMaW5lID0gYnJhbmNoMzIoR3JlYXRlclRoYW5PckVxdWFsLCBvZmZzZXQs IFRydXN0ZWRJbW0zMihmaXJzdE91dE9mTGluZU9mZnNldCkpOworICAgICAgICAgICAgICAgIGFi b3J0V2l0aFJlYXNvbihKSVRPZmZzZXRJc05vdE91dE9mTGluZSk7CisgICAgICAgICAgICAgICAg aXNPdXRPZkxpbmUubGluayh0aGlzKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGxvYWRQ dHIoQWRkcmVzcyhiYXNlLCBKU09iamVjdDo6YnV0dGVyZmx5T2Zmc2V0KCkpLCBiYXNlKTsKKyAg ICAgICAgICAgIG5lZzMyKG9mZnNldCk7CisgICAgICAgICAgICBsb2FkMzIoQmFzZUluZGV4KGJh c2UsIG9mZnNldCwgVGltZXNFaWdodCwgT0JKRUNUX09GRlNFVE9GKEpTVmFsdWUsIHUuYXNCaXRz LnBheWxvYWQpICsgKGZpcnN0T3V0T2ZMaW5lT2Zmc2V0IC0gMikgKiBzaXplb2YoRW5jb2RlZEpT VmFsdWUpKSwgcmVzdWx0UGF5bG9hZCk7CisgICAgICAgICAgICBsb2FkMzIoQmFzZUluZGV4KGJh c2UsIG9mZnNldCwgVGltZXNFaWdodCwgT0JKRUNUX09GRlNFVE9GKEpTVmFsdWUsIHUuYXNCaXRz LnRhZykgKyAoZmlyc3RPdXRPZkxpbmVPZmZzZXQgLSAyKSAqIHNpemVvZihFbmNvZGVkSlNWYWx1 ZSkpLCByZXN1bHRUYWcpOwogICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KICAgICAgICAg Y2FzZSBHbG9iYWxWYXI6CiAgICAgICAgIGNhc2UgR2xvYmFsVmFyV2l0aFZhckluamVjdGlvbkNo ZWNrczoKICAgICAgICAgY2FzZSBHbG9iYWxMZXhpY2FsVmFyOgpAQCAtOTI2LDE3ICs5MjIsNiBA QCB2b2lkIEpJVDo6ZW1pdFNsb3dfb3BfZ2V0X2Zyb21fc2NvcGUoSW5zCiAgICAgY2FsbE9wZXJh dGlvbihXaXRoUHJvZmlsZSwgb3BlcmF0aW9uR2V0RnJvbVNjb3BlLCBkc3QsIGN1cnJlbnRJbnN0 cnVjdGlvbik7CiB9CiAKLXZvaWQgSklUOjplbWl0UHV0R2xvYmFsUHJvcGVydHkodWludHB0cl90 KiBvcGVyYW5kU2xvdCwgaW50IHZhbHVlKQotewotICAgIGVtaXRMb2FkKHZhbHVlLCByZWdUMywg cmVnVDIpOwotICAgIAotICAgIGxvYWRQdHIoQWRkcmVzcyhyZWdUMCwgSlNPYmplY3Q6OmJ1dHRl cmZseU9mZnNldCgpKSwgcmVnVDApOwotICAgIGxvYWRQdHIob3BlcmFuZFNsb3QsIHJlZ1QxKTsK LSAgICBuZWdQdHIocmVnVDEpOwotICAgIHN0b3JlMzIocmVnVDMsIEJhc2VJbmRleChyZWdUMCwg cmVnVDEsIFRpbWVzRWlnaHQsIChmaXJzdE91dE9mTGluZU9mZnNldCAtIDIpICogc2l6ZW9mKEVu Y29kZWRKU1ZhbHVlKSArIE9CSkVDVF9PRkZTRVRPRihFbmNvZGVkVmFsdWVEZXNjcmlwdG9yLCBh c0JpdHMudGFnKSkpOwotICAgIHN0b3JlMzIocmVnVDIsIEJhc2VJbmRleChyZWdUMCwgcmVnVDEs IFRpbWVzRWlnaHQsIChmaXJzdE91dE9mTGluZU9mZnNldCAtIDIpICogc2l6ZW9mKEVuY29kZWRK U1ZhbHVlKSArIE9CSkVDVF9PRkZTRVRPRihFbmNvZGVkVmFsdWVEZXNjcmlwdG9yLCBhc0JpdHMu cGF5bG9hZCkpKTsKLX0KLQogdm9pZCBKSVQ6OmVtaXRQdXRHbG9iYWxWYXJpYWJsZShKU1ZhbHVl KiBvcGVyYW5kLCBpbnQgdmFsdWUsIFdhdGNocG9pbnRTZXQqIHNldCkKIHsKICAgICBlbWl0TG9h ZCh2YWx1ZSwgcmVnVDEsIHJlZ1QwKTsKQEAgLTk3NywxMSArOTYyLDE4IEBAIHZvaWQgSklUOjpl bWl0X29wX3B1dF90b19zY29wZShJbnN0cnVjdGkKICAgICBhdXRvIGVtaXRDb2RlID0gWyZdIChS ZXNvbHZlVHlwZSByZXNvbHZlVHlwZSwgYm9vbCBpbmRpcmVjdExvYWRGb3JPcGVyYW5kKSB7CiAg ICAgICAgIHN3aXRjaCAocmVzb2x2ZVR5cGUpIHsKICAgICAgICAgY2FzZSBHbG9iYWxQcm9wZXJ0 eToKLSAgICAgICAgY2FzZSBHbG9iYWxQcm9wZXJ0eVdpdGhWYXJJbmplY3Rpb25DaGVja3M6Cisg ICAgICAgIGNhc2UgR2xvYmFsUHJvcGVydHlXaXRoVmFySW5qZWN0aW9uQ2hlY2tzOiB7CiAgICAg ICAgICAgICBlbWl0V3JpdGVCYXJyaWVyKG1fY29kZUJsb2NrLT5nbG9iYWxPYmplY3QoKSwgdmFs dWUsIFNob3VsZEZpbHRlclZhbHVlKTsKICAgICAgICAgICAgIGVtaXRMb2FkV2l0aFN0cnVjdHVy ZUNoZWNrKHNjb3BlLCBzdHJ1Y3R1cmVTbG90KTsgLy8gU3RydWN0dXJlIGNoZWNrIGNvdmVycyB2 YXIgaW5qZWN0aW9uLgotICAgICAgICAgICAgZW1pdFB1dEdsb2JhbFByb3BlcnR5KG9wZXJhbmRT bG90LCB2YWx1ZSk7CisgICAgICAgICAgICBlbWl0TG9hZCh2YWx1ZSwgcmVnVDMsIHJlZ1QyKTsK KyAgICAgICAgICAgIAorICAgICAgICAgICAgbG9hZFB0cihBZGRyZXNzKHJlZ1QwLCBKU09iamVj dDo6YnV0dGVyZmx5T2Zmc2V0KCkpLCByZWdUMCk7CisgICAgICAgICAgICBsb2FkUHRyKG9wZXJh bmRTbG90LCByZWdUMSk7CisgICAgICAgICAgICBuZWdQdHIocmVnVDEpOworICAgICAgICAgICAg c3RvcmUzMihyZWdUMywgQmFzZUluZGV4KHJlZ1QwLCByZWdUMSwgVGltZXNFaWdodCwgKGZpcnN0 T3V0T2ZMaW5lT2Zmc2V0IC0gMikgKiBzaXplb2YoRW5jb2RlZEpTVmFsdWUpICsgT0JKRUNUX09G RlNFVE9GKEVuY29kZWRWYWx1ZURlc2NyaXB0b3IsIGFzQml0cy50YWcpKSk7CisgICAgICAgICAg ICBzdG9yZTMyKHJlZ1QyLCBCYXNlSW5kZXgocmVnVDAsIHJlZ1QxLCBUaW1lc0VpZ2h0LCAoZmly c3RPdXRPZkxpbmVPZmZzZXQgLSAyKSAqIHNpemVvZihFbmNvZGVkSlNWYWx1ZSkgKyBPQkpFQ1Rf T0ZGU0VUT0YoRW5jb2RlZFZhbHVlRGVzY3JpcHRvciwgYXNCaXRzLnBheWxvYWQpKSk7CiAgICAg ICAgICAgICBicmVhazsKKyAgICAgICAgfQogICAgICAgICBjYXNlIEdsb2JhbFZhcjoKICAgICAg ICAgY2FzZSBHbG9iYWxWYXJXaXRoVmFySW5qZWN0aW9uQ2hlY2tzOgogICAgICAgICBjYXNlIEds b2JhbExleGljYWxWYXI6CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVFByb3Bl cnR5QWNjZXNzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJ VFByb3BlcnR5QWNjZXNzLmNwcAkocmV2aXNpb24gMTkwNjczKQorKysgU291cmNlL0phdmFTY3Jp cHRDb3JlL2ppdC9KSVRQcm9wZXJ0eUFjY2Vzcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTc1NCwy NSArNzU0LDYgQEAgdm9pZCBKSVQ6OmVtaXRMb2FkV2l0aFN0cnVjdHVyZUNoZWNrKGludAogICAg IGFkZFNsb3dDYXNlKGJyYW5jaDMyKE5vdEVxdWFsLCBBZGRyZXNzKHJlZ1QwLCBKU0NlbGw6OnN0 cnVjdHVyZUlET2Zmc2V0KCkpLCByZWdUMSkpOwogfQogCi12b2lkIEpJVDo6ZW1pdEdldEdsb2Jh bFByb3BlcnR5KHVpbnRwdHJfdCogb3BlcmFuZFNsb3QpCi17Ci0gICAgR1BSUmVnIGJhc2UgPSBy ZWdUMDsKLSAgICBHUFJSZWcgcmVzdWx0ID0gcmVnVDA7Ci0gICAgR1BSUmVnIG9mZnNldCA9IHJl Z1QxOwotICAgIEdQUlJlZyBzY3JhdGNoID0gcmVnVDI7Ci0gICAgCi0gICAgbG9hZDMyKG9wZXJh bmRTbG90LCBvZmZzZXQpOwotICAgIGlmICghQVNTRVJUX0RJU0FCTEVEKSB7Ci0gICAgICAgIEp1 bXAgaXNPdXRPZkxpbmUgPSBicmFuY2gzMihHcmVhdGVyVGhhbk9yRXF1YWwsIG9mZnNldCwgVHJ1 c3RlZEltbTMyKGZpcnN0T3V0T2ZMaW5lT2Zmc2V0KSk7Ci0gICAgICAgIGFib3J0V2l0aFJlYXNv bihKSVRPZmZzZXRJc05vdE91dE9mTGluZSk7Ci0gICAgICAgIGlzT3V0T2ZMaW5lLmxpbmsodGhp cyk7Ci0gICAgfQotICAgIGxvYWRQdHIoQWRkcmVzcyhiYXNlLCBKU09iamVjdDo6YnV0dGVyZmx5 T2Zmc2V0KCkpLCBzY3JhdGNoKTsKLSAgICBuZWczMihvZmZzZXQpOwotICAgIHNpZ25FeHRlbmQz MlRvUHRyKG9mZnNldCwgb2Zmc2V0KTsKLSAgICBsb2FkNjQoQmFzZUluZGV4KHNjcmF0Y2gsIG9m ZnNldCwgVGltZXNFaWdodCwgKGZpcnN0T3V0T2ZMaW5lT2Zmc2V0IC0gMikgKiBzaXplb2YoRW5j b2RlZEpTVmFsdWUpKSwgcmVzdWx0KTsKLX0KLQogdm9pZCBKSVQ6OmVtaXRHZXRWYXJGcm9tUG9p bnRlcihKU1ZhbHVlKiBvcGVyYW5kLCBHUFJSZWcgcmVnKQogewogICAgIGxvYWRQdHIob3BlcmFu ZCwgcmVnKTsKQEAgLTgwMSwxMCArNzgyLDI1IEBAIHZvaWQgSklUOjplbWl0X29wX2dldF9mcm9t X3Njb3BlKEluc3RydWMKICAgICBhdXRvIGVtaXRDb2RlID0gWyZdIChSZXNvbHZlVHlwZSByZXNv bHZlVHlwZSwgYm9vbCBpbmRpcmVjdExvYWRGb3JPcGVyYW5kKSB7CiAgICAgICAgIHN3aXRjaCAo cmVzb2x2ZVR5cGUpIHsKICAgICAgICAgY2FzZSBHbG9iYWxQcm9wZXJ0eToKLSAgICAgICAgY2Fz ZSBHbG9iYWxQcm9wZXJ0eVdpdGhWYXJJbmplY3Rpb25DaGVja3M6CisgICAgICAgIGNhc2UgR2xv YmFsUHJvcGVydHlXaXRoVmFySW5qZWN0aW9uQ2hlY2tzIHsKICAgICAgICAgICAgIGVtaXRMb2Fk V2l0aFN0cnVjdHVyZUNoZWNrKHNjb3BlLCBzdHJ1Y3R1cmVTbG90KTsgLy8gU3RydWN0dXJlIGNo ZWNrIGNvdmVycyB2YXIgaW5qZWN0aW9uLgotICAgICAgICAgICAgZW1pdEdldEdsb2JhbFByb3Bl cnR5KG9wZXJhbmRTbG90KTsKKyAgICAgICAgICAgIEdQUlJlZyBiYXNlID0gcmVnVDA7CisgICAg ICAgICAgICBHUFJSZWcgcmVzdWx0ID0gcmVnVDA7CisgICAgICAgICAgICBHUFJSZWcgb2Zmc2V0 ID0gcmVnVDE7CisgICAgICAgICAgICBHUFJSZWcgc2NyYXRjaCA9IHJlZ1QyOworICAgICAgICAg ICAgCisgICAgICAgICAgICBsb2FkMzIob3BlcmFuZFNsb3QsIG9mZnNldCk7CisgICAgICAgICAg ICBpZiAoIUFTU0VSVF9ESVNBQkxFRCkgeworICAgICAgICAgICAgICAgIEp1bXAgaXNPdXRPZkxp bmUgPSBicmFuY2gzMihHcmVhdGVyVGhhbk9yRXF1YWwsIG9mZnNldCwgVHJ1c3RlZEltbTMyKGZp cnN0T3V0T2ZMaW5lT2Zmc2V0KSk7CisgICAgICAgICAgICAgICAgYWJvcnRXaXRoUmVhc29uKEpJ VE9mZnNldElzTm90T3V0T2ZMaW5lKTsKKyAgICAgICAgICAgICAgICBpc091dE9mTGluZS5saW5r KHRoaXMpOworICAgICAgICAgICAgfQorICAgICAgICAgICAgbG9hZFB0cihBZGRyZXNzKGJhc2Us IEpTT2JqZWN0OjpidXR0ZXJmbHlPZmZzZXQoKSksIHNjcmF0Y2gpOworICAgICAgICAgICAgbmVn MzIob2Zmc2V0KTsKKyAgICAgICAgICAgIHNpZ25FeHRlbmQzMlRvUHRyKG9mZnNldCwgb2Zmc2V0 KTsKKyAgICAgICAgICAgIGxvYWQ2NChCYXNlSW5kZXgoc2NyYXRjaCwgb2Zmc2V0LCBUaW1lc0Vp Z2h0LCAoZmlyc3RPdXRPZkxpbmVPZmZzZXQgLSAyKSAqIHNpemVvZihFbmNvZGVkSlNWYWx1ZSkp LCByZXN1bHQpOwogICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KICAgICAgICAgY2FzZSBH bG9iYWxWYXI6CiAgICAgICAgIGNhc2UgR2xvYmFsVmFyV2l0aFZhckluamVjdGlvbkNoZWNrczoK ICAgICAgICAgY2FzZSBHbG9iYWxMZXhpY2FsVmFyOgpAQCAtOTAxLDE2ICs4OTcsNiBAQCB2b2lk IEpJVDo6ZW1pdFNsb3dfb3BfZ2V0X2Zyb21fc2NvcGUoSW5zCiAgICAgY2FsbE9wZXJhdGlvbihX aXRoUHJvZmlsZSwgb3BlcmF0aW9uR2V0RnJvbVNjb3BlLCBkc3QsIGN1cnJlbnRJbnN0cnVjdGlv bik7CiB9CiAKLXZvaWQgSklUOjplbWl0UHV0R2xvYmFsUHJvcGVydHkodWludHB0cl90KiBvcGVy YW5kU2xvdCwgaW50IHZhbHVlKQotewotICAgIGVtaXRHZXRWaXJ0dWFsUmVnaXN0ZXIodmFsdWUs IHJlZ1QyKTsKLQotICAgIGxvYWRQdHIoQWRkcmVzcyhyZWdUMCwgSlNPYmplY3Q6OmJ1dHRlcmZs eU9mZnNldCgpKSwgcmVnVDApOwotICAgIGxvYWRQdHIob3BlcmFuZFNsb3QsIHJlZ1QxKTsKLSAg ICBuZWdQdHIocmVnVDEpOwotICAgIHN0b3JlUHRyKHJlZ1QyLCBCYXNlSW5kZXgocmVnVDAsIHJl Z1QxLCBUaW1lc0VpZ2h0LCAoZmlyc3RPdXRPZkxpbmVPZmZzZXQgLSAyKSAqIHNpemVvZihFbmNv ZGVkSlNWYWx1ZSkpKTsKLX0KLQogdm9pZCBKSVQ6OmVtaXRQdXRHbG9iYWxWYXJpYWJsZShKU1Zh bHVlKiBvcGVyYW5kLCBpbnQgdmFsdWUsIFdhdGNocG9pbnRTZXQqIHNldCkKIHsKICAgICBlbWl0 R2V0VmlydHVhbFJlZ2lzdGVyKHZhbHVlLCByZWdUMCk7CkBAIC05NDYsMTEgKzkzMiwxNyBAQCB2 b2lkIEpJVDo6ZW1pdF9vcF9wdXRfdG9fc2NvcGUoSW5zdHJ1Y3RpCiAgICAgYXV0byBlbWl0Q29k ZSA9IFsmXSAoUmVzb2x2ZVR5cGUgcmVzb2x2ZVR5cGUsIGJvb2wgaW5kaXJlY3RMb2FkRm9yT3Bl cmFuZCkgewogICAgICAgICBzd2l0Y2ggKHJlc29sdmVUeXBlKSB7CiAgICAgICAgIGNhc2UgR2xv YmFsUHJvcGVydHk6Ci0gICAgICAgIGNhc2UgR2xvYmFsUHJvcGVydHlXaXRoVmFySW5qZWN0aW9u Q2hlY2tzOgorICAgICAgICBjYXNlIEdsb2JhbFByb3BlcnR5V2l0aFZhckluamVjdGlvbkNoZWNr czogewogICAgICAgICAgICAgZW1pdFdyaXRlQmFycmllcihtX2NvZGVCbG9jay0+Z2xvYmFsT2Jq ZWN0KCksIHZhbHVlLCBTaG91bGRGaWx0ZXJWYWx1ZSk7CiAgICAgICAgICAgICBlbWl0TG9hZFdp dGhTdHJ1Y3R1cmVDaGVjayhzY29wZSwgc3RydWN0dXJlU2xvdCk7IC8vIFN0cnVjdHVyZSBjaGVj ayBjb3ZlcnMgdmFyIGluamVjdGlvbi4KLSAgICAgICAgICAgIGVtaXRQdXRHbG9iYWxQcm9wZXJ0 eShvcGVyYW5kU2xvdCwgdmFsdWUpOworICAgICAgICAgICAgZW1pdEdldFZpcnR1YWxSZWdpc3Rl cih2YWx1ZSwgcmVnVDIpOworICAgICAgICAgICAgCisgICAgICAgICAgICBsb2FkUHRyKEFkZHJl c3MocmVnVDAsIEpTT2JqZWN0OjpidXR0ZXJmbHlPZmZzZXQoKSksIHJlZ1QwKTsKKyAgICAgICAg ICAgIGxvYWRQdHIob3BlcmFuZFNsb3QsIHJlZ1QxKTsKKyAgICAgICAgICAgIG5lZ1B0cihyZWdU MSk7CisgICAgICAgICAgICBzdG9yZVB0cihyZWdUMiwgQmFzZUluZGV4KHJlZ1QwLCByZWdUMSwg VGltZXNFaWdodCwgKGZpcnN0T3V0T2ZMaW5lT2Zmc2V0IC0gMikgKiBzaXplb2YoRW5jb2RlZEpT VmFsdWUpKSk7CiAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQogICAgICAgICBjYXNlIEds b2JhbFZhcjoKICAgICAgICAgY2FzZSBHbG9iYWxWYXJXaXRoVmFySW5qZWN0aW9uQ2hlY2tzOgog ICAgICAgICBjYXNlIEdsb2JhbExleGljYWxWYXI6Cg==