185365 2018-05-06 13:43:22 -0700 InPlaceAbstractState::beginBasicBlock shouldn't have to clear any abstract values 2018-05-08 14:49:46 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 fpizlo fpizlo benjamin cdumez cmarcelo dbates ews-watchlist keith_miller mark.lam msaboff ryanhaddad saam webkit-bug-importer oldest_to_newest 1421158 0 fpizlo 2018-05-06 13:43:22 -0700 Patch forthcoming. 1421159 1 339690 fpizlo 2018-05-06 13:47:01 -0700 Created attachment 339690 the patch 1421160 2 ews-watchlist 2018-05-06 13:49:11 -0700 Attachment 339690 did not pass style-queue: ERROR: Source/JavaScriptCore/dfg/DFGGraph.h:87: _edgeIndex is incorrectly named. Don't use underscores in your identifier names. [readability/naming/underscores] [4] ERROR: Source/JavaScriptCore/dfg/DFGGraph.h:88: _edge is incorrectly named. Don't use underscores in your identifier names. [readability/naming/underscores] [4] Total errors found: 2 in 13 files If any of these errors are false positives, please file a bug against check-webkit-style. 1421467 3 339690 saam 2018-05-07 15:31:32 -0700 Comment on attachment 339690 the patch View in context: https://bugs.webkit.org/attachment.cgi?id=339690&action=review r=me > Source/WTF/wtf/TinyPtrSet.h:30 > +#include <wtf/DataLog.h> no need for this. > Tools/ChangeLog:8 > + Make it possible to measure compile times. nice! 1421527 4 fpizlo 2018-05-07 17:07:44 -0700 Landed in https://trac.webkit.org/changeset/231468/webkit 1421535 5 webkit-bug-importer 2018-05-07 17:12:03 -0700 <rdar://problem/40043054> 1421543 6 ryanhaddad 2018-05-07 17:17:15 -0700 This change broke the CLoop build: /Volumes/Data/slave/highsierra-cloop-debug/build/Source/JavaScriptCore/jsc.cpp:1816:37: error: use of undeclared identifier 'JIT' return JSValue::encode(jsNumber(JIT::totalCompileTime().milliseconds())); https://build.webkit.org/builders/Apple%20High%20Sierra%20LLINT%20CLoop%20%28BuildAndTest%29/builds/5711 1421796 7 ryanhaddad 2018-05-08 10:53:00 -0700 Reverted r231468 for reason: Broke the CLoop build Committed r231492: <https://trac.webkit.org/changeset/231492> 1421956 8 fpizlo 2018-05-08 14:49:46 -0700 Landed in https://trac.webkit.org/changeset/231514/webkit 339690 2018-05-06 13:47:01 -0700 2018-05-07 15:31:32 -0700 the patch blah.patch text/plain 23834 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjMxNDAwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ2IEBA CisyMDE4LTA1LTA2ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg SW5QbGFjZUFic3RyYWN0U3RhdGU6OmJlZ2luQmFzaWNCbG9jayBzaG91bGRuJ3QgaGF2ZSB0byBj bGVhciBhbnkgYWJzdHJhY3QgdmFsdWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xODUzNjUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKyAgICAgICAgCisgICAgICAgIFRoaXMgcGF0Y2ggZG9lcyB0aHJlZSB0aGluZ3MgdG8g aW1wcm92ZSBjb21waWxlIHRpbWVzOgorICAgICAgICAKKyAgICAgICAgLSBGaXhlcyBzb21lIGlu bGluaW5nIGdvb2ZzLgorICAgICAgICAKKyAgICAgICAgLSBBZGRzIHRoZSBhYmlsaXR5IHRvIG1l YXN1cmUgY29tcGlsZSB0aW1lcyB3aXRoIHJ1bi1qc2MtYmVuY2htYXJrcy4KKyAgICAgICAgCisg ICAgICAgIC0gRHJhbWF0aWNhbGx5IGltcHJvdmVzIHRoZSBwZXJmb3JtYW5jZSBvZiBJblBsYWNl QWJzdHJhY3RTdGF0ZTo6YmVnaW5CYXNpY0Jsb2NrIGJ5IHJlbW92aW5nIHRoZQorICAgICAgICAg IGNvZGUgdGhhdCBjbGVhcnMgYWJzdHJhY3QgdmFsdWVzLiBJdCB0dXJucyBvdXQgdGhhdCBvbiBj b25zdGFudCBmb2xkaW5nICJuZWVkZWQiIHRoaXMsIGluIHRoZQorICAgICAgICAgIHNlbnNlIHRo YXQgdGhpcyB3YXMgdGhlIG9ubHkgdGhpbmcgcHJvdGVjdGluZyBpdCBmcm9tIGxvYWRpbmcgdGhl IGFic3RyYWN0IHZhbHVlIG9mIGEgbm8tcmVzdWx0CisgICAgICAgICAgbm9kZSBhbmQgdGhlbiBj b25jbHVkaW5nIHRoYXQgYmVjYXVzZSBpdCBoYWQgYSBub24tZW1wdHkgbV92YWx1ZSwgaXQgY291 bGQgYmUgY29uc3RhbnQtZm9sZGVkLgorICAgICAgICAgIEFueSBub2RlIHRoYXQgcHJvZHVjZXMg YSByZXN1bHQgd2lsbCBleHBsaWNpdGx5IHNldCBpdHMgYWJzdHJhY3QgdmFsdWUsIHNvIHRoaXMg cHJvYmxlbSBjYW4KKyAgICAgICAgICBhbHNvIGJlIGd1YXJkZWQgYnkganVzdCBoYXZpbmcgY29u c3RhbnQgZm9sZGluZyBjaGVjayBpZiB0aGUgbm9kZSBpdCB3YW50cyB0byBmb2xkIHJldHVybnMg YW55CisgICAgICAgICAgcmVzdWx0LgorICAgICAgICAKKyAgICAgICAgU29saWQgMC45NiUgY29t cGlsZSB0aW1lIHNwZWVkLXVwIGFjcm9zcyBTdW5TcGlkZXItQ29tcGlsZVRpbWUgYW5kIFY4U3Bp ZGVyLUNvbXBpbGVUaW1lLgorCisgICAgICAgICogZGZnL0RGR0Fic3RyYWN0SW50ZXJwcmV0ZXJJ bmxpbmVzLmg6CisgICAgICAgIChKU0M6OkRGRzo6QWJzdHJhY3RJbnRlcnByZXRlcjxBYnN0cmFj dFN0YXRlVHlwZT46OmV4ZWN1dGVFZmZlY3RzKToKKyAgICAgICAgKiBkZmcvREZHQWJzdHJhY3RW YWx1ZS5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6QWJzdHJhY3RWYWx1ZTo6c2V0KToKKyAgICAg ICAgKiBkZmcvREZHQWJzdHJhY3RWYWx1ZS5oOgorICAgICAgICAoSlNDOjpERkc6OkFic3RyYWN0 VmFsdWU6Om1lcmdlKToKKyAgICAgICAgKiBkZmcvREZHQ29uc3RhbnRGb2xkaW5nUGhhc2UuY3Bw OgorICAgICAgICAoSlNDOjpERkc6OkNvbnN0YW50Rm9sZGluZ1BoYXNlOjpmb2xkQ29uc3RhbnRz KToKKyAgICAgICAgKiBkZmcvREZHR3JhcGguaDoKKyAgICAgICAgKEpTQzo6REZHOjpHcmFwaDo6 ZG9Ub0NoaWxkcmVuV2l0aE5vZGUpOgorICAgICAgICAoSlNDOjpERkc6OkdyYXBoOjpkb1RvQ2hp bGRyZW4pOgorICAgICAgICAqIGRmZy9ERkdJblBsYWNlQWJzdHJhY3RTdGF0ZS5jcHA6CisgICAg ICAgIChKU0M6OkRGRzo6SW5QbGFjZUFic3RyYWN0U3RhdGU6OmJlZ2luQmFzaWNCbG9jayk6Cisg ICAgICAgICogaml0L0pJVC5jcHA6CisgICAgICAgIChKU0M6OkpJVDo6dG90YWxDb21waWxlVGlt ZSk6CisgICAgICAgICogaml0L0pJVC5oOgorICAgICAgICAqIGpzYy5jcHA6CisgICAgICAgIChH bG9iYWxPYmplY3Q6OmZpbmlzaENyZWF0aW9uKToKKyAgICAgICAgKGZ1bmN0aW9uVG90YWxDb21w aWxlVGltZSk6CisKIDIwMTgtMDUtMDUgIEZpbGlwIFBpemxvICA8ZnBpemxvQGFwcGxlLmNvbT4K IAogICAgICAgICBERkcgQ0ZBIHBoYXNlIHNob3VsZCBvbmx5IGRvIGNsb2JiZXIgYXNzZXJ0cyBp biBkZWJ1ZwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2pzYy5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2pzYy5jcHAJKHJldmlzaW9uIDIzMTM5OSkKKysrIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9qc2MuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNDcsNiArMzQ3 LDcgQEAgc3RhdGljIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgZnVuYwogc3RhdGljIEVu Y29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgZnVuY3Rpb25GbGFzaEhlYXBBY2Nlc3MoRXhlY1N0 YXRlKik7CiBzdGF0aWMgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBmdW5jdGlvbkRpc2Fi bGVSaWNoU291cmNlSW5mbyhFeGVjU3RhdGUqKTsKIHN0YXRpYyBFbmNvZGVkSlNWYWx1ZSBKU0Nf SE9TVF9DQUxMIGZ1bmN0aW9uTWFsbG9jSW5BTG9vcChFeGVjU3RhdGUqKTsKK3N0YXRpYyBFbmNv ZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGZ1bmN0aW9uVG90YWxDb21waWxlVGltZShFeGVjU3Rh dGUqKTsKIAogc3RydWN0IFNjcmlwdCB7CiAgICAgZW51bSBjbGFzcyBTdHJpY3RNb2RlIHsKQEAg LTYwNiw2ICs2MDcsNyBAQCBwcm90ZWN0ZWQ6CiAKICAgICAgICAgYWRkRnVuY3Rpb24odm0sICJk aXNhYmxlUmljaFNvdXJjZUluZm8iLCBmdW5jdGlvbkRpc2FibGVSaWNoU291cmNlSW5mbywgMCk7 CiAgICAgICAgIGFkZEZ1bmN0aW9uKHZtLCAibWFsbG9jSW5BTG9vcCIsIGZ1bmN0aW9uTWFsbG9j SW5BTG9vcCwgMCk7CisgICAgICAgIGFkZEZ1bmN0aW9uKHZtLCAidG90YWxDb21waWxlVGltZSIs IGZ1bmN0aW9uVG90YWxDb21waWxlVGltZSwgMCk7CiAgICAgfQogICAgIAogICAgIHZvaWQgYWRk RnVuY3Rpb24oVk0mIHZtLCBKU09iamVjdCogb2JqZWN0LCBjb25zdCBjaGFyKiBuYW1lLCBOYXRp dmVGdW5jdGlvbiBmdW5jdGlvbiwgdW5zaWduZWQgYXJndW1lbnRzKQpAQCAtMTgwOSw2ICsxODEx LDExIEBAIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgZnVuY3Rpb25NYWwKICAgICByZXR1 cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzVW5kZWZpbmVkKCkpOwogfQogCitFbmNvZGVkSlNWYWx1ZSBK U0NfSE9TVF9DQUxMIGZ1bmN0aW9uVG90YWxDb21waWxlVGltZShFeGVjU3RhdGUqKQoreworICAg IHJldHVybiBKU1ZhbHVlOjplbmNvZGUoanNOdW1iZXIoSklUOjp0b3RhbENvbXBpbGVUaW1lKCku bWlsbGlzZWNvbmRzKCkpKTsKK30KKwogdGVtcGxhdGU8dHlwZW5hbWUgVmFsdWVUeXBlPgogdHlw ZW5hbWUgc3RkOjplbmFibGVfaWY8IXN0ZDo6aXNfZnVuZGFtZW50YWw8VmFsdWVUeXBlPjo6dmFs dWU+Ojp0eXBlIGFkZE9wdGlvbihWTSYsIEpTT2JqZWN0KiwgSWRlbnRpZmllciwgVmFsdWVUeXBl KSB7IH0KIApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdBYnN0cmFjdEludGVy cHJldGVySW5saW5lcy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcv REZHQWJzdHJhY3RJbnRlcnByZXRlcklubGluZXMuaAkocmV2aXNpb24gMjMxMzk5KQorKysgU291 cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdBYnN0cmFjdEludGVycHJldGVySW5saW5lcy5oCSh3 b3JraW5nIGNvcHkpCkBAIC0zNDEwLDggKzM0MTAsNiBAQCBib29sIEFic3RyYWN0SW50ZXJwcmV0 ZXI8QWJzdHJhY3RTdGF0ZVR5CiAgICAgY2FzZSBDaGVja1RyYXBzOgogICAgIGNhc2UgTG9nU2hh ZG93Q2hpY2tlblByb2xvZ3VlOgogICAgIGNhc2UgTG9nU2hhZG93Q2hpY2tlblRhaWw6Ci0gICAg ICAgIGJyZWFrOwotCiAgICAgY2FzZSBQcm9maWxlVHlwZToKICAgICBjYXNlIFByb2ZpbGVDb250 cm9sRmxvdzoKICAgICBjYXNlIFBoYW50b206CkBAIC0zNDIxLDYgKzM0MTksMTAgQEAgYm9vbCBB YnN0cmFjdEludGVycHJldGVyPEFic3RyYWN0U3RhdGVUeQogICAgIGNhc2UgQ2hlY2tUeXBlSW5m b0ZsYWdzOgogICAgIGNhc2UgU3VwZXJTYW1wbGVyQmVnaW46CiAgICAgY2FzZSBTdXBlclNhbXBs ZXJFbmQ6CisgICAgY2FzZSBDaGVja1RpZXJVcEFuZE9TUkVudGVyOgorICAgIGNhc2UgTG9vcEhp bnQ6CisgICAgY2FzZSBab21iaWVIaW50OgorICAgIGNhc2UgRXhpdE9LOgogICAgICAgICBicmVh azsKIAogICAgIGNhc2UgUGFyc2VJbnQ6IHsKQEAgLTM0ODMsMTAgKzM0ODUsNiBAQCBib29sIEFi c3RyYWN0SW50ZXJwcmV0ZXI8QWJzdHJhY3RTdGF0ZVR5CiAgICAgICAgIGJyZWFrOwogICAgIH0K ICAgICAgICAgCi0gICAgY2FzZSBDaGVja1RpZXJVcEFuZE9TUkVudGVyOgotICAgIGNhc2UgTG9v cEhpbnQ6Ci0gICAgY2FzZSBab21iaWVIaW50OgotICAgIGNhc2UgRXhpdE9LOgogICAgICAgICBi cmVhazsKIAogICAgIGNhc2UgVW5yZWFjaGFibGU6CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENv cmUvZGZnL0RGR0Fic3RyYWN0VmFsdWUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9kZmcvREZHQWJzdHJhY3RWYWx1ZS5jcHAJKHJldmlzaW9uIDIzMTM5OSkKKysrIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQWJzdHJhY3RWYWx1ZS5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTUzLDkgKzUzLDkgQEAgdm9pZCBBYnN0cmFjdFZhbHVlOjpzZXQoR3JhcGgmIGdyYXBo LCBjbwogICAgIGlmICghIXZhbHVlICYmIHZhbHVlLnZhbHVlKCkuaXNDZWxsKCkpIHsKICAgICAg ICAgU3RydWN0dXJlKiBzdHJ1Y3R1cmUgPSB2YWx1ZS5zdHJ1Y3R1cmUoKTsKICAgICAgICAgU3Ry dWN0dXJlUmVnaXN0cmF0aW9uUmVzdWx0IHJlc3VsdDsKLSAgICAgICAgUmVnaXN0ZXJlZFN0cnVj dHVyZSBSZWdpc3RlcmVkU3RydWN0dXJlID0gZ3JhcGgucmVnaXN0ZXJTdHJ1Y3R1cmUoc3RydWN0 dXJlLCByZXN1bHQpOworICAgICAgICBSZWdpc3RlcmVkU3RydWN0dXJlIHJlZ2lzdGVyZWRTdHJ1 Y3R1cmUgPSBncmFwaC5yZWdpc3RlclN0cnVjdHVyZShzdHJ1Y3R1cmUsIHJlc3VsdCk7CiAgICAg ICAgIGlmIChyZXN1bHQgPT0gU3RydWN0dXJlUmVnaXN0ZXJlZEFuZFdhdGNoZWQpIHsKLSAgICAg ICAgICAgIG1fc3RydWN0dXJlID0gUmVnaXN0ZXJlZFN0cnVjdHVyZTsKKyAgICAgICAgICAgIG1f c3RydWN0dXJlID0gcmVnaXN0ZXJlZFN0cnVjdHVyZTsKICAgICAgICAgICAgIGlmIChjbG9iYmVy U3RhdGUgPT0gU3RydWN0dXJlc0FyZUNsb2JiZXJlZCkgewogICAgICAgICAgICAgICAgIG1fYXJy YXlNb2RlcyA9IEFMTF9BUlJBWV9NT0RFUzsKICAgICAgICAgICAgICAgICBtX3N0cnVjdHVyZS5j bG9iYmVyKCk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0Fic3RyYWN0VmFs dWUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0Fic3RyYWN0 VmFsdWUuaAkocmV2aXNpb24gMjMxMzk5KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9E RkdBYnN0cmFjdFZhbHVlLmgJKHdvcmtpbmcgY29weSkKQEAgLTI0Myw3ICsyNDMsNyBAQCBzdHJ1 Y3QgQWJzdHJhY3RWYWx1ZSB7CiAgICAgICAgIHJldHVybiAhKCp0aGlzID09IG90aGVyKTsKICAg ICB9CiAgICAgCi0gICAgYm9vbCBtZXJnZShjb25zdCBBYnN0cmFjdFZhbHVlJiBvdGhlcikKKyAg ICBBTFdBWVNfSU5MSU5FIGJvb2wgbWVyZ2UoY29uc3QgQWJzdHJhY3RWYWx1ZSYgb3RoZXIpCiAg ICAgewogICAgICAgICBpZiAob3RoZXIuaXNDbGVhcigpKQogICAgICAgICAgICAgcmV0dXJuIGZh bHNlOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdDb25zdGFudEZvbGRpbmdQ aGFzZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdDb25z dGFudEZvbGRpbmdQaGFzZS5jcHAJKHJldmlzaW9uIDIzMTM5OSkKKysrIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9kZmcvREZHQ29uc3RhbnRGb2xkaW5nUGhhc2UuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC04NTIsNyArODUyLDcgQEAgcHJpdmF0ZToKICAgICAgICAgICAgICAgICAvLyBhYm91dCBzdWNo IHRoaW5ncy4KICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIH0KLSAgICAgICAg ICAgIGlmICghbm9kZS0+c2hvdWxkR2VuZXJhdGUoKSB8fCBtX3N0YXRlLmRpZENsb2JiZXIoKSB8 fCBub2RlLT5oYXNDb25zdGFudCgpKQorICAgICAgICAgICAgaWYgKCFub2RlLT5zaG91bGRHZW5l cmF0ZSgpIHx8IG1fc3RhdGUuZGlkQ2xvYmJlcigpIHx8IG5vZGUtPmhhc0NvbnN0YW50KCkgfHwg IW5vZGUtPnJlc3VsdCgpKQogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAg CiAgICAgICAgICAgICAvLyBJbnRlcmVzdGluZyBmYWN0OiB0aGlzIGZyZWV6aW5nIHRoYXQgd2Ug ZG8gcmlnaHQgaGVyZSBtYXkgdHVybiBhbiBmcmFnaWxlIHZhbHVlIGludG8KSW5kZXg6IFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHR3JhcGguaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvZGZnL0RGR0dyYXBoLmgJKHJldmlzaW9uIDIzMTM5OSkKKysrIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9kZmcvREZHR3JhcGguaAkod29ya2luZyBjb3B5KQpAQCAtODQsMjMgKzg0 LDEyIEBAIHVzaW5nIFNTQU5hdHVyYWxMb29wcyA9IE5hdHVyYWxMb29wczxTU0EKICAgICAgICAg ICAgICAgICAgICAgdGhpbmdUb0RvKF9ub2RlLCAoZ3JhcGgpLm1fdmFyQXJnQ2hpbGRyZW5bX2No aWxkSWR4XSk7IFwKICAgICAgICAgICAgIH0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKICAgICAgICAgfSBlbHNlIHsgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICAgICAg ICAgIGlmICghX25vZGUtPmNoaWxkMSgpKSB7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIFwKLSAgICAgICAgICAgICAgICBBU1NFUlQoICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICAgICAgICAgICAgICAgICAgIV9ub2RlLT5j aGlsZDIoKSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICAgICAgICAg ICAgICAgICAgJiYgIV9ub2RlLT5jaGlsZDMoKSk7ICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIFwKLSAgICAgICAgICAgICAgICBicmVhazsgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIFwKKyAgICAgICAgICAgIGZvciAodW5zaWduZWQgX2VkZ2VJ bmRleCA9IDA7IF9lZGdlSW5kZXggPCBBZGphY2VuY3lMaXN0OjpTaXplOyBfZWRnZUluZGV4Kysp IHsgXAorICAgICAgICAgICAgICAgIEVkZ2UmIF9lZGdlID0gX25vZGUtPmNoaWxkcmVuLmNoaWxk KF9lZGdlSW5kZXgpOyAgICAgICAgXAorICAgICAgICAgICAgICAgIGlmICghX2VkZ2UpICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAorICAgICAgICAgICAgICAg ICAgICBicmVhazsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg XAorICAgICAgICAgICAgICAgIHRoaW5nVG9Ebyhfbm9kZSwgX2VkZ2UpOyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgXAogICAgICAgICAgICAgfSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAotICAgICAgICAgICAgdGhpbmdU b0RvKF9ub2RlLCBfbm9kZS0+Y2hpbGQxKCkpOyAgICAgICAgICAgICAgICAgICAgICAgICAgXAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgXAotICAgICAgICAgICAgaWYgKCFfbm9kZS0+Y2hpbGQyKCkpIHsgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAotICAgICAgICAgICAgICAgIEFTU0VS VCghX25vZGUtPmNoaWxkMygpKTsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAotICAg ICAgICAgICAgICAgIGJyZWFrOyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgXAotICAgICAgICAgICAgfSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAotICAgICAgICAgICAgdGhpbmdUb0RvKF9u b2RlLCBfbm9kZS0+Y2hpbGQyKCkpOyAgICAgICAgICAgICAgICAgICAgICAgICAgXAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgXAotICAgICAgICAgICAgaWYgKCFfbm9kZS0+Y2hpbGQzKCkpICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgXAotICAgICAgICAgICAgICAgIGJyZWFrOyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAotICAgICAgICAg ICAgdGhpbmdUb0RvKF9ub2RlLCBfbm9kZS0+Y2hpbGQzKCkpOyAgICAgICAgICAgICAgICAgICAg ICAgICAgXAogICAgICAgICB9ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgXAogICAgIH0gd2hpbGUgKGZhbHNlKQogCkBAIC03MTks MTMgKzcwOCwxMyBAQCBwdWJsaWM6CiAgICAgfQogICAgIAogICAgIHRlbXBsYXRlPHR5cGVuYW1l IENoaWxkRnVuY3Rvcj4KLSAgICB2b2lkIGRvVG9DaGlsZHJlbldpdGhOb2RlKE5vZGUqIG5vZGUs IGNvbnN0IENoaWxkRnVuY3RvciYgZnVuY3RvcikKKyAgICBBTFdBWVNfSU5MSU5FIHZvaWQgZG9U b0NoaWxkcmVuV2l0aE5vZGUoTm9kZSogbm9kZSwgY29uc3QgQ2hpbGRGdW5jdG9yJiBmdW5jdG9y KQogICAgIHsKICAgICAgICAgREZHX05PREVfRE9fVE9fQ0hJTERSRU4oKnRoaXMsIG5vZGUsIGZ1 bmN0b3IpOwogICAgIH0KICAgICAKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBDaGlsZEZ1bmN0b3I+ Ci0gICAgdm9pZCBkb1RvQ2hpbGRyZW4oTm9kZSogbm9kZSwgY29uc3QgQ2hpbGRGdW5jdG9yJiBm dW5jdG9yKQorICAgIEFMV0FZU19JTkxJTkUgdm9pZCBkb1RvQ2hpbGRyZW4oTm9kZSogbm9kZSwg Y29uc3QgQ2hpbGRGdW5jdG9yJiBmdW5jdG9yKQogICAgIHsKICAgICAgICAgZG9Ub0NoaWxkcmVu V2l0aE5vZGUoCiAgICAgICAgICAgICBub2RlLApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3Jl L2RmZy9ERkdJblBsYWNlQWJzdHJhY3RTdGF0ZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0ph dmFTY3JpcHRDb3JlL2RmZy9ERkdJblBsYWNlQWJzdHJhY3RTdGF0ZS5jcHAJKHJldmlzaW9uIDIz MTM5OSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHSW5QbGFjZUFic3RyYWN0U3Rh dGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02MCwxMyArNjAsNiBAQCB2b2lkIEluUGxhY2VBYnN0 cmFjdFN0YXRlOjpiZWdpbkJhc2ljQmxvCiAgICAgQVNTRVJUKGJhc2ljQmxvY2stPnZhcmlhYmxl c0F0SGVhZC5udW1iZXJPZkxvY2FscygpID09IGJhc2ljQmxvY2stPnZhcmlhYmxlc0F0VGFpbC5u dW1iZXJPZkxvY2FscygpKTsKIAogICAgIG1fYWJzdHJhY3RWYWx1ZXMucmVzaXplKCk7Ci0gICAg Ci0gICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBiYXNpY0Jsb2NrLT5zaXplKCk7IGkrKykgewot ICAgICAgICBOb2RlRmxvd1Byb2plY3Rpb246OmZvckVhY2goCi0gICAgICAgICAgICBiYXNpY0Js b2NrLT5hdChpKSwgWyZdIChOb2RlRmxvd1Byb2plY3Rpb24gbm9kZVByb2plY3Rpb24pIHsKLSAg ICAgICAgICAgICAgICBmb3JOb2RlKG5vZGVQcm9qZWN0aW9uKS5jbGVhcigpOwotICAgICAgICAg ICAgfSk7Ci0gICAgfQogCiAgICAgbV92YXJpYWJsZXMgPSBiYXNpY0Jsb2NrLT52YWx1ZXNBdEhl YWQ7CiAgICAgCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVC5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVQuY3BwCShyZXZpc2lvbiAyMzEz OTkpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTEwMTMsNiArMTAxMywxMSBAQCBIYXNoTWFwPENTdHJpbmcsIFNlY29uZHM+IEpJVDo6Y29t cGlsZVRpCiAgICAgcmV0dXJuIHJlc3VsdDsKIH0KIAorU2Vjb25kcyBKSVQ6OnRvdGFsQ29tcGls ZVRpbWUoKQoreworICAgIHJldHVybiB0b3RhbEJhc2VsaW5lQ29tcGlsZVRpbWUgKyB0b3RhbERG R0NvbXBpbGVUaW1lICsgdG90YWxGVExDb21waWxlVGltZTsKK30KKwogfSAvLyBuYW1lc3BhY2Ug SlNDCiAKICNlbmRpZiAvLyBFTkFCTEUoSklUKQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3Jl L2ppdC9KSVQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVC5o CShyZXZpc2lvbiAyMzEzOTkpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVC5oCSh3 b3JraW5nIGNvcHkpCkBAIC0yNTAsNiArMjUwLDcgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAg IHN0YXRpYyBpbnQgc3RhY2tQb2ludGVyT2Zmc2V0Rm9yKENvZGVCbG9jayopOwogCiAgICAgICAg IEpTX0VYUE9SVF9QUklWQVRFIHN0YXRpYyBIYXNoTWFwPENTdHJpbmcsIFNlY29uZHM+IGNvbXBp bGVUaW1lU3RhdHMoKTsKKyAgICAgICAgSlNfRVhQT1JUX1BSSVZBVEUgc3RhdGljIFNlY29uZHMg dG90YWxDb21waWxlVGltZSgpOwogCiAgICAgcHJpdmF0ZToKICAgICAgICAgdm9pZCBwcml2YXRl Q29tcGlsZU1haW5QYXNzKCk7CkluZGV4OiBTb3VyY2UvV1RGL0NoYW5nZUxvZwo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV1RGL0NoYW5nZUxvZwkocmV2aXNpb24gMjMxMzk5KQorKysgU291cmNlL1dU Ri9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxOCBAQAorMjAxOC0wNS0wNiAg RmlsaXAgUGl6bG8gIDxmcGl6bG9AYXBwbGUuY29tPgorCisgICAgICAgIEluUGxhY2VBYnN0cmFj dFN0YXRlOjpiZWdpbkJhc2ljQmxvY2sgc2hvdWxkbid0IGhhdmUgdG8gY2xlYXIgYW55IGFic3Ry YWN0IHZhbHVlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTg1MzY1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAg IAorICAgICAgICBGaXggc29tZSBpbmxpbmluZyBnb29mLXVwcy4KKworICAgICAgICAqIHd0Zi9U aW55UHRyU2V0Lmg6CisgICAgICAgIChXVEY6OlRpbnlQdHJTZXQ6OmFkZCk6CisgICAgICAgIChX VEY6OlRpbnlQdHJTZXQ6Om1lcmdlKToKKyAgICAgICAgKFdURjo6VGlueVB0clNldDo6YWRkT3V0 T2ZMaW5lKToKKyAgICAgICAgKFdURjo6VGlueVB0clNldDo6bWVyZ2VPdGhlck91dE9mTGluZSk6 CisKIDIwMTgtMDUtMDQgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAK ICAgICAgICAgU2hpZnQgdG8gYSBsb3dlci1sZXZlbCBmcmFtZXdvcmsgZm9yIHNpbXBsaWZ5aW5n IFVSTHMKSW5kZXg6IFNvdXJjZS9XVEYvd3RmL1RpbnlQdHJTZXQuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV1RGL3d0Zi9UaW55UHRyU2V0LmgJKHJldmlzaW9uIDIzMTM5OSkKKysrIFNvdXJjZS9X VEYvd3RmL1RpbnlQdHJTZXQuaAkod29ya2luZyBjb3B5KQpAQCAtMjcsNiArMjcsNyBAQAogI2Rl ZmluZSBUaW55UHRyU2V0X2gKIAogI2luY2x1ZGUgPHd0Zi9Bc3NlcnRpb25zLmg+CisjaW5jbHVk ZSA8d3RmL0RhdGFMb2cuaD4KICNpbmNsdWRlIDx3dGYvRmFzdE1hbGxvYy5oPgogCiBuYW1lc3Bh Y2UgSlNDIHsgbmFtZXNwYWNlIERGRyB7CkBAIC0xMDMsNyArMTA0LDcgQEAgcHVibGljOgogICAg IH0KICAgICAKICAgICAvLyBSZXR1cm5zIHRydWUgaWYgdGhlIHZhbHVlIHdhcyBhZGRlZCwgb3Ig ZmFsc2UgaWYgdGhlIHZhbHVlIHdhcyBhbHJlYWR5IHRoZXJlLgotICAgIGJvb2wgYWRkKFQgdmFs dWUpCisgICAgQUxXQVlTX0lOTElORSBib29sIGFkZChUIHZhbHVlKQogICAgIHsKICAgICAgICAg QVNTRVJUKHZhbHVlKTsKICAgICAgICAgaWYgKGlzVGhpbigpKSB7CkBAIC0xNTYsNyArMTU3LDcg QEAgcHVibGljOgogICAgICAgICByZXR1cm4gY29udGFpbnNPdXRPZkxpbmUodmFsdWUpOwogICAg IH0KICAgICAKLSAgICBib29sIG1lcmdlKGNvbnN0IFRpbnlQdHJTZXQmIG90aGVyKQorICAgIEFM V0FZU19JTkxJTkUgYm9vbCBtZXJnZShjb25zdCBUaW55UHRyU2V0JiBvdGhlcikKICAgICB7CiAg ICAgICAgIGlmIChvdGhlci5pc1RoaW4oKSkgewogICAgICAgICAgICAgaWYgKG90aGVyLnNpbmds ZUVudHJ5KCkpCkBAIC0xNjQsMjUgKzE2NSw3IEBAIHB1YmxpYzoKICAgICAgICAgICAgIHJldHVy biBmYWxzZTsKICAgICAgICAgfQogICAgICAgICAKLSAgICAgICAgT3V0T2ZMaW5lTGlzdCogbGlz dCA9IG90aGVyLmxpc3QoKTsKLSAgICAgICAgaWYgKGxpc3QtPm1fbGVuZ3RoID49IDIpIHsKLSAg ICAgICAgICAgIGlmIChpc1RoaW4oKSkgewotICAgICAgICAgICAgICAgIE91dE9mTGluZUxpc3Qq IG15TmV3TGlzdCA9IE91dE9mTGluZUxpc3Q6OmNyZWF0ZSgKLSAgICAgICAgICAgICAgICAgICAg bGlzdC0+bV9sZW5ndGggKyAhIXNpbmdsZUVudHJ5KCkpOwotICAgICAgICAgICAgICAgIGlmIChz aW5nbGVFbnRyeSgpKSB7Ci0gICAgICAgICAgICAgICAgICAgIG15TmV3TGlzdC0+bV9sZW5ndGgg PSAxOwotICAgICAgICAgICAgICAgICAgICBteU5ld0xpc3QtPmxpc3QoKVswXSA9IHNpbmdsZUVu dHJ5KCk7Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgIHNldChteU5ld0xpc3Qp OwotICAgICAgICAgICAgfQotICAgICAgICAgICAgYm9vbCBjaGFuZ2VkID0gZmFsc2U7Ci0gICAg ICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbGlzdC0+bV9sZW5ndGg7ICsraSkKLSAg ICAgICAgICAgICAgICBjaGFuZ2VkIHw9IGFkZE91dE9mTGluZShsaXN0LT5saXN0KClbaV0pOwot ICAgICAgICAgICAgcmV0dXJuIGNoYW5nZWQ7Ci0gICAgICAgIH0KLSAgICAgICAgCi0gICAgICAg IEFTU0VSVChsaXN0LT5tX2xlbmd0aCk7Ci0gICAgICAgIHJldHVybiBhZGQobGlzdC0+bGlzdCgp WzBdKTsKKyAgICAgICAgcmV0dXJuIG1lcmdlT3RoZXJPdXRPZkxpbmUob3RoZXIpOwogICAgIH0K ICAgICAKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBGdW5jdG9yPgpAQCAtMzc5LDcgKzM2Miw3IEBA IHByaXZhdGU6CiAKICAgICBzdGF0aWMgY29uc3QgdW5zaWduZWQgZGVmYXVsdFN0YXJ0aW5nU2l6 ZSA9IDQ7CiAgICAgCi0gICAgYm9vbCBhZGRPdXRPZkxpbmUoVCB2YWx1ZSkKKyAgICBORVZFUl9J TkxJTkUgYm9vbCBhZGRPdXRPZkxpbmUoVCB2YWx1ZSkKICAgICB7CiAgICAgICAgIE91dE9mTGlu ZUxpc3QqIGxpc3QgPSB0aGlzLT5saXN0KCk7CiAgICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7 IGkgPCBsaXN0LT5tX2xlbmd0aDsgKytpKSB7CkBAIC00MDIsNiArMzg1LDI5IEBAIHByaXZhdGU6 CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KICAgICAKKyAgICBORVZFUl9JTkxJTkUgYm9v bCBtZXJnZU90aGVyT3V0T2ZMaW5lKGNvbnN0IFRpbnlQdHJTZXQmIG90aGVyKQorICAgIHsKKyAg ICAgICAgT3V0T2ZMaW5lTGlzdCogbGlzdCA9IG90aGVyLmxpc3QoKTsKKyAgICAgICAgaWYgKGxp c3QtPm1fbGVuZ3RoID49IDIpIHsKKyAgICAgICAgICAgIGlmIChpc1RoaW4oKSkgeworICAgICAg ICAgICAgICAgIE91dE9mTGluZUxpc3QqIG15TmV3TGlzdCA9IE91dE9mTGluZUxpc3Q6OmNyZWF0 ZSgKKyAgICAgICAgICAgICAgICAgICAgbGlzdC0+bV9sZW5ndGggKyAhIXNpbmdsZUVudHJ5KCkp OworICAgICAgICAgICAgICAgIGlmIChzaW5nbGVFbnRyeSgpKSB7CisgICAgICAgICAgICAgICAg ICAgIG15TmV3TGlzdC0+bV9sZW5ndGggPSAxOworICAgICAgICAgICAgICAgICAgICBteU5ld0xp c3QtPmxpc3QoKVswXSA9IHNpbmdsZUVudHJ5KCk7CisgICAgICAgICAgICAgICAgfQorICAgICAg ICAgICAgICAgIHNldChteU5ld0xpc3QpOworICAgICAgICAgICAgfQorICAgICAgICAgICAgYm9v bCBjaGFuZ2VkID0gZmFsc2U7CisgICAgICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwg bGlzdC0+bV9sZW5ndGg7ICsraSkKKyAgICAgICAgICAgICAgICBjaGFuZ2VkIHw9IGFkZE91dE9m TGluZShsaXN0LT5saXN0KClbaV0pOworICAgICAgICAgICAgcmV0dXJuIGNoYW5nZWQ7CisgICAg ICAgIH0KKyAgICAgICAgCisgICAgICAgIEFTU0VSVChsaXN0LT5tX2xlbmd0aCk7CisgICAgICAg IHJldHVybiBhZGQobGlzdC0+bGlzdCgpWzBdKTsKKyAgICB9CisgICAgCiAgICAgYm9vbCBjb250 YWluc091dE9mTGluZShUIHZhbHVlKSBjb25zdAogICAgIHsKICAgICAgICAgT3V0T2ZMaW5lTGlz dCogbGlzdCA9IHRoaXMtPmxpc3QoKTsKSW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzMTQwMCkKKysrIFRvb2xzL0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDE4LTA1LTA2ICBGaWxpcCBQaXps byAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAgSW5QbGFjZUFic3RyYWN0U3RhdGU6OmJl Z2luQmFzaWNCbG9jayBzaG91bGRuJ3QgaGF2ZSB0byBjbGVhciBhbnkgYWJzdHJhY3QgdmFsdWVz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODUzNjUK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAg IE1ha2UgaXQgcG9zc2libGUgdG8gbWVhc3VyZSBjb21waWxlIHRpbWVzLgorCisgICAgICAgICog U2NyaXB0cy9ydW4tanNjLWJlbmNobWFya3M6CisKIDIwMTgtMDUtMDQgIFdlbnNvbiBIc2llaCAg PHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gTXVsdGlwbGUgbGlua3Mg aW4gTWFpbCBhcmUgZHJvcHBlZCBpbiBhIHNpbmdsZSBsaW5lLCBhbmQgYXJlIGRpZmZpY3VsdCB0 byB0ZWxsIGFwYXJ0CkluZGV4OiBUb29scy9TY3JpcHRzL3J1bi1qc2MtYmVuY2htYXJrcwo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3J1bi1qc2MtYmVuY2htYXJrcwkocmV2aXNpb24gMjMx Mzk5KQorKysgVG9vbHMvU2NyaXB0cy9ydW4tanNjLWJlbmNobWFya3MJKHdvcmtpbmcgY29weSkK QEAgLTEsNiArMSw2IEBACiAjIS91c3IvYmluL2VudiBydWJ5CiAKLSMgQ29weXJpZ2h0IChDKSAy MDExLTIwMTUgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorIyBDb3B5cmlnaHQgKEMp IDIwMTEtMjAxOCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAjCiAjIFJlZGlzdHJp YnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91 dAogIyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93 aW5nIGNvbmRpdGlvbnMKQEAgLTIxNiw4ICsyMTYsMTAgQEAgJHdhcm11cD0xCiAkb3V0ZXI9NAog JHF1YW50dW09MTAwMAogJGluY2x1ZGVTdW5TcGlkZXI9dHJ1ZQorJGluY2x1ZGVTdW5TcGlkZXJD b21waWxlVGltZT10cnVlCiAkaW5jbHVkZUxvbmdTcGlkZXI9ZmFsc2UKICRpbmNsdWRlVjg9dHJ1 ZQorJGluY2x1ZGVWOENvbXBpbGVUaW1lPXRydWUKICRpbmNsdWRlS3Jha2VuPXRydWUKICRpbmNs dWRlSlNCZW5jaD10cnVlCiAkaW5jbHVkZU1pY3JvYmVuY2htYXJrcz10cnVlCkBAIC0zMTEsNyAr MzEzLDExIEBAIGRlZiB1c2FnZQogICBwdXRzICItLWRvbnQtY29weS12bXMgICAgICBEb24ndCBj b3B5IFZNcyBldmVuIHdoZW4gZG9pbmcgYSByZW1vdGUgYmVuY2htYXJraW5nIHJ1bjsiCiAgIHB1 dHMgIiAgICAgICAgICAgICAgICAgICAgIGluc3RlYWQgYXNzdW1lIHRoYXQgdGhleSBhcmUgYWxy ZWFkeSB0aGVyZS4iCiAgIHB1dHMgIi0tc3Vuc3BpZGVyICAgICAgICAgIE9ubHkgcnVuIFN1blNw aWRlci4iCi0gIHB1dHMgIi0tdjgtc3BpZGVyICAgICAgICAgIE9ubHkgcnVuIFY4LiIKKyAgcHV0 cyAiLS1zdW5zcGlkZXItY29tcGlsZS10aW1lIgorICBwdXRzICIgICAgICAgICAgICAgICAgICAg ICBPbmx5IHJ1biB0aGUgU3VuU3BpZGVyIGNvbXBpbGUgdGltZSBiZW5jaG1hcmsuIgorICBwdXRz ICItLXY4LXNwaWRlciAgICAgICAgICBPbmx5IHJ1biBTdW5TcGlkZXItc3R5bGUgVjguIgorICBw dXRzICItLXY4LXNwaWRlci1jb21waWxlLXRpbWUiCisgIHB1dHMgIiAgICAgICAgICAgICAgICAg ICAgIE9ubHkgcnVuIHRoZSBTdW5TcGlkZXItc3R5bGUgVjggY29tcGlsZSB0aW1lIGJlbmNobWFy ay4iCiAgIHB1dHMgIi0ta3Jha2VuICAgICAgICAgICAgIE9ubHkgcnVuIEtyYWtlbi4iCiAgIHB1 dHMgIi0tanMtYmVuY2ggICAgICAgICAgIE9ubHkgcnVuIEpTQmVuY2guIgogICBwdXRzICItLW1p Y3JvYmVuY2htYXJrcyAgICBPbmx5IHJ1biBtaWNyb2JlbmNobWFya3MuIgpAQCAtODU2LDYgKzg2 MiwyMCBAQCBjbGFzcyBTaW5nbGVGaWxlQ3VzdG9tVGltZWRCZW5jaG1hcmtQYXJhCiAgIGVuZAog ZW5kCiAKKyMgQmVuY2htYXJrIHRoYXQgY29uc2lzdHMgb2YgYSBzaW5nbGUgZmlsZSBhbmQgbXVz dCBiZSBsb2FkZWQgaW4gaXRzIG93biBnbG9iYWwgb2JqZWN0IGVhY2gKKyMgdGltZSAoaS5lLiBy dW4oKSksIGFuZCByZXR1cm5zIHRoZSB0aW1lIHNwZW50IGNvbXBpbGluZworY2xhc3MgU2luZ2xl RmlsZUNvbXBpbGVUaW1lQmVuY2htYXJrUGFyYW1ldGVycworICBhdHRyX3JlYWRlciA6YmVuY2hQ YXRoCisgIAorICBkZWYgaW5pdGlhbGl6ZShiZW5jaFBhdGgpCisgICAgQGJlbmNoUGF0aCA9IGJl bmNoUGF0aAorICBlbmQKKyAgCisgIGRlZiBraW5kCisgICAgOnNpbmdsZUZpbGVDb21waWxlVGlt ZUJlbmNobWFyaworICBlbmQKK2VuZAorCiAjIEJlbmNobWFyayB0aGF0IGNvbnNpc3RzIG9mIG9u ZSBvciBtb3JlIGRhdGEgZmlsZXMgdGhhdCBzaG91bGQgYmUgbG9hZGVkIGdsb2JhbGx5LCBmb2xs b3dlZAogIyBieSBhIGNvbW1hbmQgdG8gcnVuIHRoZSBiZW5jaG1hcmsuCiBjbGFzcyBNdWx0aUZp bGVUaW1lZEJlbmNobWFya1BhcmFtZXRlcnMKQEAgLTk5OSw2ICsxMDE5LDIzIEBAIGRlZiBlbWl0 QmVuY2hSdW5Db2RlRmlsZShuYW1lLCBwbGFuLCBiZW4KICAgICAgICAgICBkb3VibGVQdXRzKCRz dGRlcnIsZmlsZSwicHJpbnQoXCIje25hbWV9OiAje3BsYW4udm19OiAje3BsYW4uaXRlcmF0aW9u fTogI3tpbm5lckluZGV4fTogVGltZTogXCIrX19iZW5jaGVyX3J1bigje2JlbmNoUGFyYW1zLmJl bmNoUGF0aC5pbnNwZWN0fSkpOyIpCiAgICAgICAgICAgZG91YmxlUHV0cygkc3RkZXJyLGZpbGUs ImdjKCk7IikgdW5sZXNzIHBsYW4udm0uc2hvdWxkTWVhc3VyZUdDCiAgICAgICAgIH0KKyAgICAg IGVsc2lmIGJlbmNoUGFyYW1zLmtpbmQgPT0gOnNpbmdsZUZpbGVDb21waWxlVGltZUJlbmNobWFy aworICAgICAgICBkb3VibGVQdXRzKCRzdGRlcnIsZmlsZSwiZnVuY3Rpb24gX19iZW5jaGVyX3J1 bihfX2JlbmNoZXJfd2hhdCkgeyIpCisgICAgICAgIGRvdWJsZVB1dHMoJHN0ZGVycixmaWxlLCIg ICB2YXIgX19jb21waWxlVGltZUJlZm9yZSA9IHRvdGFsQ29tcGlsZVRpbWUoKTsiKQorICAgICAg ICAkcmVydW4udGltZXMgeworICAgICAgICAgIGRvdWJsZVB1dHMoJHN0ZGVycixmaWxlLCIgICBy dW4oX19iZW5jaGVyX3doYXQpOyIpCisgICAgICAgIH0KKyAgICAgICAgZG91YmxlUHV0cygkc3Rk ZXJyLGZpbGUsIiAgIHJldHVybiB0b3RhbENvbXBpbGVUaW1lKCkgLSBfX2NvbXBpbGVUaW1lQmVm b3JlOyIpCisgICAgICAgIGRvdWJsZVB1dHMoJHN0ZGVycixmaWxlLCJ9IikKKyAgICAgICAgJHdh cm11cC50aW1lcyB7CisgICAgICAgICAgZG91YmxlUHV0cygkc3RkZXJyLGZpbGUsIl9fYmVuY2hl cl9ydW4oI3tiZW5jaFBhcmFtcy5iZW5jaFBhdGguaW5zcGVjdH0pIikKKyAgICAgICAgICBkb3Vi bGVQdXRzKCRzdGRlcnIsZmlsZSwiZ2MoKTsiKSB1bmxlc3MgcGxhbi52bS5zaG91bGRNZWFzdXJl R0MKKyAgICAgICAgfQorICAgICAgICAkaW5uZXIudGltZXMgeworICAgICAgICAgIHwgaW5uZXJJ bmRleCB8CisgICAgICAgICAgZG91YmxlUHV0cygkc3RkZXJyLGZpbGUsInByaW50KFwiI3tuYW1l fTogI3twbGFuLnZtfTogI3twbGFuLml0ZXJhdGlvbn06ICN7aW5uZXJJbmRleH06IFRpbWU6IFwi K19fYmVuY2hlcl9ydW4oI3tiZW5jaFBhcmFtcy5iZW5jaFBhdGguaW5zcGVjdH0pKTsiKQorICAg ICAgICAgIGRvdWJsZVB1dHMoJHN0ZGVycixmaWxlLCJnYygpOyIpIHVubGVzcyBwbGFuLnZtLnNo b3VsZE1lYXN1cmVHQworICAgICAgICB9CiAgICAgICBlbHNlCiAgICAgICAgIHJhaXNlIHVubGVz cyBiZW5jaFBhcmFtcy5raW5kID09IDpzaW5nbGVGaWxlVGltZWRCZW5jaG1hcmsKICAgICAgICAg ZG91YmxlUHV0cygkc3RkZXJyLGZpbGUsImZ1bmN0aW9uIF9fYmVuY2hlcl9ydW4oX19iZW5jaGVy X3doYXQpIHsiKQpAQCAtMTUzOSw2ICsxNTc2LDEwIEBAIG1vZHVsZSBCZW5jaG1hcmsKICAgICAg ICJ4I3t3ZWlnaHR9ICIKICAgICBlbmQKICAgZW5kCisgIAorICBkZWYgZW52aXJvbm1lbnQKKyAg ICB7fQorICBlbmQKIGVuZAogCiBjbGFzcyBTdW5TcGlkZXJCZW5jaG1hcmsKQEAgLTE2NDEsNiAr MTY4MiwyMyBAQCBjbGFzcyBDdXN0b21UaW1lZEJlbmNobWFyawogICBlbmQKIGVuZAogCitjbGFz cyBDb21waWxlVGltZUJlbmNobWFyaworICBpbmNsdWRlIEJlbmNobWFyaworICAKKyAgZGVmIGlu aXRpYWxpemUobmFtZSwgZnVsbFBhdGgpCisgICAgQG5hbWUgPSBuYW1lCisgICAgQGZ1bGxQYXRo ID0gZnVsbFBhdGgKKyAgZW5kCisgIAorICBkZWYgZW1pdFJ1bkNvZGUocGxhbikKKyAgICBlbWl0 QmVuY2hSdW5Db2RlKGZ1bGxuYW1lLCBwbGFuLCBTaW5nbGVGaWxlQ29tcGlsZVRpbWVCZW5jaG1h cmtQYXJhbWV0ZXJzLm5ldyhlbnN1cmVGaWxlKCJDb21waWxlVGltZS0je0BuYW1lfSIsIEBmdWxs UGF0aCkpKQorICBlbmQKKyAgCisgIGRlZiBlbnZpcm9ubWVudAorICAgIHsiSlNDX3VzZUNvbmN1 cnJlbnRKSVQiID0+ICJmYWxzZSIsICJKU0NfcmVwb3J0VG90YWxDb21waWxlVGltZXMiID0+ICJ0 cnVlIn0KKyAgZW5kCitlbmQKKwogY2xhc3MgS3Jha2VuQmVuY2htYXJrCiAgIGluY2x1ZGUgQmVu Y2htYXJrCiAgIApAQCAtMjAzOCw3ICsyMDk2LDEyIEBAIGNsYXNzIEJlbmNoUnVuUGxhbgogICBl bmQKICAKICAgZGVmIGVudmlyb25tZW50Ci0gICAgQGVudmlyb25tZW50CisgICAgcmVzdWx0ID0g QGVudmlyb25tZW50LmNsb25lCisgICAgYmVuY2htYXJrLmVudmlyb25tZW50LmVhY2hfcGFpciB7 CisgICAgICB8IGtleSwgdmFsdWUgfAorICAgICAgcmVzdWx0W2tleV0gPSB2YWx1ZQorICAgIH0K KyAgICByZXN1bHQKICAgZW5kCiAgCiAgIGRlZiBwcmVmaXgKQEAgLTI3MjIsOCArMjc4NSwxMCBA QCBiZWdpbgogICBkZWYgcmVzZXRCZW5jaE9wdGlvbnNJZk5lY2Vzc2FyeQogICAgIHVubGVzcyAk c2F3QmVuY2hPcHRpb25zCiAgICAgICAkaW5jbHVkZVN1blNwaWRlciA9IGZhbHNlCisgICAgICAk aW5jbHVkZVN1blNwaWRlckNvbXBpbGVUaW1lID0gZmFsc2UKICAgICAgICRpbmNsdWRlTG9uZ1Nw aWRlciA9IGZhbHNlCiAgICAgICAkaW5jbHVkZVY4ID0gZmFsc2UKKyAgICAgICRpbmNsdWRlVjhD b21waWxlVGltZSA9IGZhbHNlCiAgICAgICAkaW5jbHVkZUtyYWtlbiA9IGZhbHNlCiAgICAgICAk aW5jbHVkZUpTQmVuY2ggPSBmYWxzZQogICAgICAgJGluY2x1ZGVNaWNyb2JlbmNobWFya3MgPSBm YWxzZQpAQCAtMjc0OCw4ICsyODEzLDEwIEBAIGJlZ2luCiAgICAgICAgICAgICAgICAgIFsnLS1t aW5pbXVtJywgR2V0b3B0TG9uZzo6UkVRVUlSRURfQVJHVU1FTlRdLAogICAgICAgICAgICAgICAg ICBbJy0tdGltaW5nLW1vZGUnLCBHZXRvcHRMb25nOjpSRVFVSVJFRF9BUkdVTUVOVF0sCiAgICAg ICAgICAgICAgICAgIFsnLS1zdW5zcGlkZXInLCBHZXRvcHRMb25nOjpOT19BUkdVTUVOVF0sCisg ICAgICAgICAgICAgICAgIFsnLS1zdW5zcGlkZXItY29tcGlsZS10aW1lJywgR2V0b3B0TG9uZzo6 Tk9fQVJHVU1FTlRdLAogICAgICAgICAgICAgICAgICBbJy0tbG9uZ3NwaWRlcicsIEdldG9wdExv bmc6Ok5PX0FSR1VNRU5UXSwKICAgICAgICAgICAgICAgICAgWyctLXY4LXNwaWRlcicsIEdldG9w dExvbmc6Ok5PX0FSR1VNRU5UXSwKKyAgICAgICAgICAgICAgICAgWyctLXY4LXNwaWRlci1jb21w aWxlLXRpbWUnLCBHZXRvcHRMb25nOjpOT19BUkdVTUVOVF0sCiAgICAgICAgICAgICAgICAgIFsn LS1rcmFrZW4nLCBHZXRvcHRMb25nOjpOT19BUkdVTUVOVF0sCiAgICAgICAgICAgICAgICAgIFsn LS1qcy1iZW5jaCcsIEdldG9wdExvbmc6Ok5PX0FSR1VNRU5UXSwKICAgICAgICAgICAgICAgICAg WyctLW1pY3JvYmVuY2htYXJrcycsIEdldG9wdExvbmc6Ok5PX0FSR1VNRU5UXSwKQEAgLTI4Mjgs MTIgKzI4OTUsMTggQEAgYmVnaW4KICAgICB3aGVuICctLXN1bnNwaWRlcicKICAgICAgIHJlc2V0 QmVuY2hPcHRpb25zSWZOZWNlc3NhcnkKICAgICAgICRpbmNsdWRlU3VuU3BpZGVyID0gdHJ1ZQor ICAgIHdoZW4gJy0tc3Vuc3BpZGVyLWNvbXBpbGUtdGltZScKKyAgICAgIHJlc2V0QmVuY2hPcHRp b25zSWZOZWNlc3NhcnkKKyAgICAgICRpbmNsdWRlU3VuU3BpZGVyQ29tcGlsZVRpbWUgPSB0cnVl CiAgICAgd2hlbiAnLS1sb25nc3BpZGVyJwogICAgICAgcmVzZXRCZW5jaE9wdGlvbnNJZk5lY2Vz c2FyeQogICAgICAgJGluY2x1ZGVMb25nU3BpZGVyID0gdHJ1ZQogICAgIHdoZW4gJy0tdjgtc3Bp ZGVyJwogICAgICAgcmVzZXRCZW5jaE9wdGlvbnNJZk5lY2Vzc2FyeQogICAgICAgJGluY2x1ZGVW OCA9IHRydWUKKyAgICB3aGVuICctLXY4LXNwaWRlci1jb21waWxlLXRpbWUnCisgICAgICByZXNl dEJlbmNoT3B0aW9uc0lmTmVjZXNzYXJ5CisgICAgICAkaW5jbHVkZVY4Q29tcGlsZVRpbWUgPSB0 cnVlCiAgICAgd2hlbiAnLS1rcmFrZW4nCiAgICAgICByZXNldEJlbmNoT3B0aW9uc0lmTmVjZXNz YXJ5CiAgICAgICAkaW5jbHVkZUtyYWtlbiA9IHRydWUKQEAgLTMwMDIsNiArMzA3NSw3IEBAIGJl Z2luCiAgIH0KICAgCiAgIFNVTlNQSURFUiA9IEJlbmNobWFya1N1aXRlLm5ldygiU3VuU3BpZGVy IiwgOmFyaXRobWV0aWNNZWFuLCAwKQorICBTVU5TUElERVJfQ09NUElMRV9USU1FID0gQmVuY2ht YXJrU3VpdGUubmV3KCJTdW5TcGlkZXItQ29tcGlsZVRpbWUiLCA6YXJpdGhtZXRpY01lYW4sIDAp CiAgIFdBUk1VUCA9IEJlbmNobWFya1N1aXRlLm5ldygiV0FSTVVQIiwgOmFyaXRobWV0aWNNZWFu LCAwKQogICBbIjNkLWN1YmUiLCAiM2QtbW9ycGgiLCAiM2QtcmF5dHJhY2UiLCAiYWNjZXNzLWJp bmFyeS10cmVlcyIsCiAgICAiYWNjZXNzLWZhbm5rdWNoIiwgImFjY2Vzcy1uYm9keSIsICJhY2Nl c3MtbnNpZXZlIiwKQEAgLTMwMTMsNiArMzA4Nyw3IEBAIGJlZ2luCiAgICAic3RyaW5nLXVucGFj ay1jb2RlIiwgInN0cmluZy12YWxpZGF0ZS1pbnB1dCJdLmVhY2ggewogICAgIHwgbmFtZSB8CiAg ICAgU1VOU1BJREVSLmFkZCBTdW5TcGlkZXJCZW5jaG1hcmsubmV3KG5hbWUpCisgICAgU1VOU1BJ REVSX0NPTVBJTEVfVElNRS5hZGQgQ29tcGlsZVRpbWVCZW5jaG1hcmsubmV3KG5hbWUsICIje1NV TlNQSURFUl9QQVRIfS8je25hbWV9LmpzIikKICAgICBXQVJNVVAuYWRkSWdub3JpbmdQYXR0ZXJu IFN1blNwaWRlckJlbmNobWFyay5uZXcobmFtZSkKICAgfQogCkBAIC0zMDI5LDEwICszMTA0LDEy IEBAIGJlZ2luCiAgIH0KIAogICBWOCA9IEJlbmNobWFya1N1aXRlLm5ldygiVjhTcGlkZXIiLCA6 Z2VvbWV0cmljTWVhbiwgMCkKKyAgVjhfQ09NUElMRV9USU1FID0gQmVuY2htYXJrU3VpdGUubmV3 KCJWOFNwaWRlci1Db21waWxlVGltZSIsIDpnZW9tZXRyaWNNZWFuLCAwKQogICBbImNyeXB0byIs ICJkZWx0YWJsdWUiLCAiZWFybGV5LWJveWVyIiwgInJheXRyYWNlIiwKICAgICJyZWdleHAiLCAi cmljaGFyZHMiLCAic3BsYXkiXS5lYWNoIHsKICAgICB8IG5hbWUgfAogICAgIFY4LmFkZCBWOEJl bmNobWFyay5uZXcobmFtZSkKKyAgICBWOF9DT01QSUxFX1RJTUUuYWRkIENvbXBpbGVUaW1lQmVu Y2htYXJrLm5ldyhuYW1lLCAiI3tWOF9QQVRIfS92OC0je25hbWV9LmpzIikKICAgfQogCiAgIE9D VEFORSA9IEJlbmNobWFya1N1aXRlLm5ldygiT2N0YW5lIiwgOmdlb21ldHJpY01lYW4sIDEpCkBA IC0zMTkzLDYgKzMyNzAsMTAgQEAgYmVnaW4KICAgICAkc3VpdGVzIDw8IFNVTlNQSURFUgogICBl bmQKICAgCisgIGlmICRpbmNsdWRlU3VuU3BpZGVyQ29tcGlsZVRpbWUgYW5kIG5vdCBTVU5TUElE RVJfQ09NUElMRV9USU1FLmVtcHR5PworICAgICRzdWl0ZXMgPDwgU1VOU1BJREVSX0NPTVBJTEVf VElNRQorICBlbmQKKyAgCiAgIGlmICRpbmNsdWRlTG9uZ1NwaWRlciBhbmQgbm90IExPTkdTUElE RVIuZW1wdHk/CiAgICAgJHN1aXRlcyA8PCBMT05HU1BJREVSCiAgIGVuZApAQCAtMzIwMSw2ICsz MjgyLDEwIEBAIGJlZ2luCiAgICAgJHN1aXRlcyA8PCBWOAogICBlbmQKICAgCisgIGlmICRpbmNs dWRlVjhDb21waWxlVGltZSBhbmQgbm90IFY4X0NPTVBJTEVfVElNRS5lbXB0eT8KKyAgICAkc3Vp dGVzIDw8IFY4X0NPTVBJTEVfVElNRQorICBlbmQKKyAgCiAgIGlmICRpbmNsdWRlT2N0YW5lIGFu ZCBub3QgT0NUQU5FLmVtcHR5PwogICAgIGlmIE9DVEFORV9QQVRICiAgICAgICAkc3VpdGVzIDw8 IE9DVEFORQo=