202918 2019-10-13 22:53:21 -0700 Unify sources for bindings more densely 2019-10-15 14:22:39 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton commit-queue ggaren keith_miller lingcherd_ho sam simon.fraser thorton webkit-bug-importer oldest_to_newest 1579553 0 thorton 2019-10-13 22:53:21 -0700 Unify sources for bindings more densely 1579554 1 380856 thorton 2019-10-13 22:56:17 -0700 Created attachment 380856 Patch 1579555 2 thorton 2019-10-13 22:57:08 -0700 I'm going to fiddle some more with the constant, because I think we can even halve it and still get nearly the same speedup (which I don't totally understand, but seems to be the case). But feel free to review the rest of the patch besides that. 1579559 3 380858 thorton 2019-10-13 23:49:51 -0700 Created attachment 380858 Patch 1579673 4 380858 thorton 2019-10-14 10:17:17 -0700 Comment on attachment 380858 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=380858&action=review > Source/WTF/Scripts/generate-unified-source-bundles.rb:263 > + print("THORTON: #{bundleFileName()} #{bundlePrefix} #{sourceFile}\n") Whoops 1579967 5 380955 thorton 2019-10-14 20:42:56 -0700 Created attachment 380955 Patch 1579999 6 380955 commit-queue 2019-10-14 22:53:24 -0700 Comment on attachment 380955 Patch Clearing flags on attachment: 380955 Committed r251123: <https://trac.webkit.org/changeset/251123> 1580000 7 commit-queue 2019-10-14 22:53:26 -0700 All reviewed patches have been landed. Closing bug. 1580257 8 lingcherd_ho 2019-10-15 14:22:30 -0700 <rdar://problem/56280139> 380856 2019-10-13 22:56:17 -0700 2019-10-13 23:49:50 -0700 Patch bug-202918-20191013225616.patch text/plain 8254 thorton SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAyNTEwNjQpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDE5LTEwLTEzICBUaW0gSG9ydG9uICA8dGltb3Ro eV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIFVuaWZ5IHNvdXJjZXMgZm9yIGJpbmRpbmdz IG1vcmUgZGVuc2VseQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjAyOTE4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBTY3JpcHRzL2dlbmVyYXRlLXVuaWZpZWQtc291cmNlLWJ1bmRsZXMucmI6CisgICAg ICAgIEFkZCBhbiBvcHRpb24gdG8gc2VwYXJhdGUgYW5kIG1vcmUgZGVuc2VseSB1bmlmeSBzb3Vy Y2VzIHRoYXQgbWF0Y2gKKyAgICAgICAgYSBnaXZlbiBnbG9iIHBhdHRlcm4uCisKIDIwMTktMTAt MDggIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgTWFrZSBXZWJJ bnNwZWN0b3IncyByZW1vdGUgZGVidWcgRXZlbnRMb29wIGNvZGUgaW50byBSdW5Mb29wCkluZGV4 OiBTb3VyY2UvV1RGL1NjcmlwdHMvZ2VuZXJhdGUtdW5pZmllZC1zb3VyY2UtYnVuZGxlcy5yYgo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV1RGL1NjcmlwdHMvZ2VuZXJhdGUtdW5pZmllZC1zb3VyY2Ut YnVuZGxlcy5yYgkocmV2aXNpb24gMjUxMDY0KQorKysgU291cmNlL1dURi9TY3JpcHRzL2dlbmVy YXRlLXVuaWZpZWQtc291cmNlLWJ1bmRsZXMucmIJKHdvcmtpbmcgY29weSkKQEAgLTU1LDEwICs1 NSwxMiBAQCBkZWYgdXNhZ2UobWVzc2FnZSkKICAgICBwdXRzICJHZW5lcmF0aW9uIG9wdGlvbnM6 IgogICAgIHB1dHMgIi0tbWF4LWNwcC1idW5kbGUtY291bnQgICAgICAgICAgICAgICBVc2UgZ2xv YmFsIHNlcXVlbnRpYWwgbnVtYmVycyBmb3IgY3BwIGJ1bmRsZSBmaWxlbmFtZXMgYW5kIHNldCB0 aGUgbGltaXQgb24gdGhlIG51bWJlciIKICAgICBwdXRzICItLW1heC1vYmotYy1idW5kbGUtY291 bnQgICAgICAgICAgICAgVXNlIGdsb2JhbCBzZXF1ZW50aWFsIG51bWJlcnMgZm9yIE9iai1DIGJ1 bmRsZSBmaWxlbmFtZXMgYW5kIHNldCB0aGUgbGltaXQgb24gdGhlIG51bWJlciIKKyAgICBwdXRz ICItLWRlbnNlLWJ1bmRsZS1maWx0ZXIgICAgICAgICAgICAgICAgRGVuc2VseSBidW5kbGUgZmls ZXMgbWF0Y2hpbmcgdGhlIGdpdmVuIHBhdGggZ2xvYiIKICAgICBleGl0IDEKIGVuZAogCiBNQVhf QlVORExFX1NJWkUgPSA4CitNQVhfREVOU0VfQlVORExFX1NJWkUgPSA2NAogJGRlcml2ZWRTb3Vy Y2VzUGF0aCA9IG5pbAogJHVuaWZpZWRTb3VyY2VPdXRwdXRQYXRoID0gbmlsCiAkc291cmNlVHJl ZVBhdGggPSBuaWwKQEAgLTY5LDYgKzcxLDcgQEAgJGlucHV0WENGaWxlbGlzdFBhdGggPSBuaWwK ICRvdXRwdXRYQ0ZpbGVsaXN0UGF0aCA9IG5pbAogJG1heENwcEJ1bmRsZUNvdW50ID0gbmlsCiAk bWF4T2JqQ0J1bmRsZUNvdW50ID0gbmlsCiskZGVuc2VCdW5kbGVGaWx0ZXJzID0gW10KIAogZGVm IGxvZyh0ZXh0KQogICAgICRzdGRlcnIucHV0cyB0ZXh0IGlmICR2ZXJib3NlCkBAIC04NSw3ICs4 OCw4IEBAIEdldG9wdExvbmcubmV3KFsnLS1oZWxwJywgJy1oJywgR2V0b3B0TG8KICAgICAgICAg ICAgICAgIFsnLS1pbnB1dC14Y2ZpbGVsaXN0LXBhdGgnLCBHZXRvcHRMb25nOjpSRVFVSVJFRF9B UkdVTUVOVF0sCiAgICAgICAgICAgICAgICBbJy0tb3V0cHV0LXhjZmlsZWxpc3QtcGF0aCcsIEdl dG9wdExvbmc6OlJFUVVJUkVEX0FSR1VNRU5UXSwKICAgICAgICAgICAgICAgIFsnLS1tYXgtY3Bw LWJ1bmRsZS1jb3VudCcsIEdldG9wdExvbmc6OlJFUVVJUkVEX0FSR1VNRU5UXSwKLSAgICAgICAg ICAgICAgIFsnLS1tYXgtb2JqLWMtYnVuZGxlLWNvdW50JywgR2V0b3B0TG9uZzo6UkVRVUlSRURf QVJHVU1FTlRdKS5lYWNoIHsKKyAgICAgICAgICAgICAgIFsnLS1tYXgtb2JqLWMtYnVuZGxlLWNv dW50JywgR2V0b3B0TG9uZzo6UkVRVUlSRURfQVJHVU1FTlRdLAorICAgICAgICAgICAgICAgWyct LWRlbnNlLWJ1bmRsZS1maWx0ZXInLCBHZXRvcHRMb25nOjpSRVFVSVJFRF9BUkdVTUVOVF0pLmVh Y2ggewogICAgIHwgb3B0LCBhcmcgfAogICAgIGNhc2Ugb3B0CiAgICAgd2hlbiAnLS1oZWxwJwpA QCAtMTEzLDYgKzExNyw4IEBAIEdldG9wdExvbmcubmV3KFsnLS1oZWxwJywgJy1oJywgR2V0b3B0 TG8KICAgICAgICAgJG1heENwcEJ1bmRsZUNvdW50ID0gYXJnLnRvX2kKICAgICB3aGVuICctLW1h eC1vYmotYy1idW5kbGUtY291bnQnCiAgICAgICAgICRtYXhPYmpDQnVuZGxlQ291bnQgPSBhcmcu dG9faQorICAgIHdoZW4gJy0tZGVuc2UtYnVuZGxlLWZpbHRlcicKKyAgICAgICAgJGRlbnNlQnVu ZGxlRmlsdGVycy5wdXNoKGFyZykKICAgICBlbmQKIH0KIApAQCAtMTk0LDYgKzIwMCw3IEBAIGNs YXNzIEJ1bmRsZU1hbmFnZXIKICAgICAgICAgQG1heENvdW50ID0gbWF4CiAgICAgICAgIEBleHRy YUZpbGVzID0gW10KICAgICAgICAgQGN1cnJlbnREaXJlY3RvcnkgPSBuaWwKKyAgICAgICAgQGxh c3RCdW5kbGluZ1ByZWZpeCA9IG5pbAogICAgIGVuZAogCiAgICAgZGVmIHdyaXRlRmlsZShmaWxl LCB0ZXh0KQpAQCAtMjQxLDIxICsyNDgsMzQgQEAgY2xhc3MgQnVuZGxlTWFuYWdlcgogICAgIGRl ZiBhZGRGaWxlKHNvdXJjZUZpbGUpCiAgICAgICAgIHBhdGggPSBzb3VyY2VGaWxlLnBhdGgKICAg ICAgICAgcmFpc2UgIndyb25nIGV4dGVuc2lvbjogI3twYXRoLmV4dG5hbWV9IGV4cGVjdGVkICN7 QGV4dGVuc2lvbn0iIHVubGVzcyBwYXRoLmV4dG5hbWUgPT0gIi4je0BleHRlbnNpb259IgotICAg ICAgICBpZiAoVG9wTGV2ZWxEaXJlY3RvcnlGb3JQYXRoKEBjdXJyZW50RGlyZWN0b3J5KSAhPSBU b3BMZXZlbERpcmVjdG9yeUZvclBhdGgocGF0aC5kaXJuYW1lKSkKKyAgICAgICAgYnVuZGxlUHJl Zml4LCBidW5kbGVTaXplID0gQnVuZGxlUHJlZml4QW5kU2l6ZUZvclBhdGgocGF0aCkKKyAgICAg ICAgaWYgKEBsYXN0QnVuZGxpbmdQcmVmaXggIT0gYnVuZGxlUHJlZml4KQogICAgICAgICAgICAg bG9nKCJGbHVzaGluZyBiZWNhdXNlIG5ldyB0b3AgbGV2ZWwgZGlyZWN0b3J5OyBvbGQ6ICN7QGN1 cnJlbnREaXJlY3Rvcnl9LCBuZXc6ICN7cGF0aC5kaXJuYW1lfSIpCiAgICAgICAgICAgICBmbHVz aAorICAgICAgICAgICAgQGxhc3RCdW5kbGluZ1ByZWZpeCA9IGJ1bmRsZVByZWZpeAogICAgICAg ICAgICAgQGN1cnJlbnREaXJlY3RvcnkgPSBwYXRoLmRpcm5hbWUKICAgICAgICAgICAgIEBidW5k bGVDb3VudCA9IDAgdW5sZXNzIEBtYXhDb3VudAogICAgICAgICBlbmQKLSAgICAgICAgaWYgQGZp bGVDb3VudCA9PSBNQVhfQlVORExFX1NJWkUKKyAgICAgICAgaWYgQGZpbGVDb3VudCA+PSBidW5k bGVTaXplCiAgICAgICAgICAgICBsb2coIkZsdXNoaW5nIGJlY2F1c2UgbmV3IGJ1bmRsZSBpcyBm dWxsICgje0BmaWxlQ291bnR9IHNvdXJjZXMpIikKICAgICAgICAgICAgIGZsdXNoCiAgICAgICAg IGVuZAorICAgICAgICBwcmludCgiVEhPUlRPTjogI3tidW5kbGVGaWxlTmFtZSgpfSAje2J1bmRs ZVByZWZpeH0gI3tzb3VyY2VGaWxlfVxuIikKICAgICAgICAgQGN1cnJlbnRCdW5kbGVUZXh0ICs9 ICIjaW5jbHVkZSBcIiN7c291cmNlRmlsZX1cIlxuIgogICAgICAgICBAZmlsZUNvdW50ICs9IDEK ICAgICBlbmQKIGVuZAogCitkZWYgQnVuZGxlUHJlZml4QW5kU2l6ZUZvclBhdGgocGF0aCkKKyAg ICB0b3BMZXZlbERpcmVjdG9yeSA9IFRvcExldmVsRGlyZWN0b3J5Rm9yUGF0aChwYXRoLmRpcm5h bWUpCisgICAgJGRlbnNlQnVuZGxlRmlsdGVycy5lYWNoIHsgfGZpbHRlcnwKKyAgICAgICAgaWYg cGF0aC5mbm1hdGNoKGZpbHRlcikKKyAgICAgICAgICAgIHJldHVybiBmaWx0ZXIsIE1BWF9ERU5T RV9CVU5ETEVfU0laRQorICAgICAgICBlbmQKKyAgICB9CisgICAgcmV0dXJuIHRvcExldmVsRGly ZWN0b3J5LCBNQVhfQlVORExFX1NJWkUKK2VuZAorCiBkZWYgVG9wTGV2ZWxEaXJlY3RvcnlGb3JQ YXRoKHBhdGgpCiAgICAgaWYgIXBhdGgKICAgICAgICAgcmV0dXJuIG5pbApJbmRleDogU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZwkocmV2aXNpb24gMjUxMDY0KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMzQgQEAKKzIwMTktMTAtMTMgIFRpbSBIb3J0b24gIDx0aW1vdGh5 X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgVW5pZnkgc291cmNlcyBmb3IgYmluZGluZ3Mg bW9yZSBkZW5zZWx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMDI5MTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBObyBuZXcgdGVzdHMsIGp1c3QgYSBidWlsZCB0aW1lIHNwZWVkdXAuCisgICAgICAgIEZv ciBtZSwgdGhpcyBpcyBhIHJlbGlhYmxlIDE3JSBib29zdCBvbiB0aGUgV2ViQ29yZSBCdWlsZCBU aW1lIEJlbmNobWFyay4KKworICAgICAgICAqIFNjcmlwdHMvZ2VuZXJhdGUtdW5pZmllZC1zb3Vy Y2VzLnNoOgorICAgICAgICBVc2UgZGVuc2UgYnVuZGxlcyBmb3IgSlMqIGFuZCBiaW5kaW5ncy9q cy8qLgorICAgICAgICBUaGlzIHNlZW1zIGFjY2VwdGFibGUgZm9yIGEgZmV3IHJlYXNvbnM6CisK KyAgICAgICAgLSBtb3N0IG9mIHRoZSB0aW1lIGJ1aWxkaW5nIHRoZXNlIGZpbGVzIGlzIHNwZW50 IHBhcnNpbmcgdGhlIGV4YWN0CisgICAgICAgIHNhbWUgc2V0IG9mIEpTQyBoZWFkZXJzLCBiZWNh dXNlIHRoZSBnZW5lcmF0ZWQgYmluZGluZ3MgY29kZSBlbmRzCisgICAgICAgIHVwIGluY2x1ZGlu ZyB0aGUgc2FtZSBzZXQgb2YgdGhpbmdzCisKKyAgICAgICAgLSB0aGUgaW5jcmVtZW50YWwgYnVp bGQgY29zdCBvZiBidW5kbGluZyBtb3JlIGJpbmRpbmdzIHNvdXJjZXMgdG9nZXRoZXIKKyAgICAg ICAgaXMgc21hbGwsIGJlY2F1c2UgdGhlIEpTQyBoZWFkZXJzIGRvbWluYXRlIHRoZSB0aW1lCisK KyAgICAgICAgLSBmb2xrcyB3aWxsIGZyZXF1ZW50bHkgaGF2ZSB0byByZWJ1aWxkIGFsbCBvZiB0 aGUgYmluZGluZ3MgKG9uIGV2ZXJ5CisgICAgICAgIHB1bGwsIGZvciBleGFtcGxlLCBiZWNhdXNl IHRoZXkgaW5kaXJlY3RseSBpbmNsdWRlIG1vc3QgSlNDIGhlYWRlcnMpLAorICAgICAgICBidXQg cmFyZWx5IGVuZCB1cCByZWJ1aWxkaW5nIG9ubHkgYSBzaW5nbGUgb25lIChpbiBteSBleHBlcmll bmNlKQorCisgICAgICAgICogYmluZGluZ3MvanMvUmVhZGFibGVTdHJlYW1EZWZhdWx0Q29udHJv bGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpyZWFkYWJsZVN0cmVhbUNhbGxGdW5jdGlvbik6 CisgICAgICAgIChXZWJDb3JlOjpSZWFkYWJsZVN0cmVhbURlZmF1bHRDb250cm9sbGVyOjppbnZv a2UpOgorICAgICAgICAoV2ViQ29yZTo6Y2FsbEZ1bmN0aW9uKTogRGVsZXRlZC4KKyAgICAgICAg RGVkdXBsaWNhdGUgc3RhdGljIGZ1bmN0aW9ucyB0aGF0IG5vdyBnZXQgYnVuZGxlZCB0b2dldGhl ci4KKwogMjAxOS0xMC0xMyAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4K IAogICAgICAgICBTdG9wICd1c2luZyBuYW1lc3BhY2UgKk5hbWVzJyBpbiBmaWxlcyBnZW5lcmF0 ZWQgYnkgbWFrZV9uYW1lcy5wbApJbmRleDogU291cmNlL1dlYkNvcmUvU2NyaXB0cy9nZW5lcmF0 ZS11bmlmaWVkLXNvdXJjZXMuc2gKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvU2NyaXB0 cy9nZW5lcmF0ZS11bmlmaWVkLXNvdXJjZXMuc2gJKHJldmlzaW9uIDI1MTA2NCkKKysrIFNvdXJj ZS9XZWJDb3JlL1NjcmlwdHMvZ2VuZXJhdGUtdW5pZmllZC1zb3VyY2VzLnNoCSh3b3JraW5nIGNv cHkpCkBAIC0yMSw0ICsyMSw0IEBAIGlmIFsgJCMgLWVxIDAgXTsgdGhlbgogICAgIGVjaG8gIlVz aW5nIHVuaWZpZWQgc291cmNlIGxpc3QgZmlsZXM6IFNvdXJjZXMudHh0LCBTb3VyY2VzQ29jb2Eu dHh0IgogZmkKIAotL3Vzci9iaW4vZW52IHJ1YnkgIiR7QlVJTERfU0NSSVBUU19ESVJ9L2dlbmVy YXRlLXVuaWZpZWQtc291cmNlLWJ1bmRsZXMucmIiICItLWRlcml2ZWQtc291cmNlcy1wYXRoIiAi JHtCVUlMVF9QUk9EVUNUU19ESVJ9L0Rlcml2ZWRTb3VyY2VzL1dlYkNvcmUiICItLXNvdXJjZS10 cmVlLXBhdGgiICIke1NSQ1JPT1R9IiAiLS1mZWF0dXJlLWZsYWdzIiAiJHtGRUFUVVJFX0RFRklO RVN9IiAiLS1tYXgtY3BwLWJ1bmRsZS1jb3VudCIgIiR7VW5pZmllZFNvdXJjZUNwcEZpbGVDb3Vu dH0iICItLW1heC1vYmotYy1idW5kbGUtY291bnQiICIke1VuaWZpZWRTb3VyY2VNbUZpbGVDb3Vu dH0iICJTb3VyY2VzLnR4dCIgIlNvdXJjZXNDb2NvYS50eHQiICIke0FSR1NbQF19IiA+IC9kZXYv bnVsbAorL3Vzci9iaW4vZW52IHJ1YnkgIiR7QlVJTERfU0NSSVBUU19ESVJ9L2dlbmVyYXRlLXVu aWZpZWQtc291cmNlLWJ1bmRsZXMucmIiICItLWRlcml2ZWQtc291cmNlcy1wYXRoIiAiJHtCVUlM VF9QUk9EVUNUU19ESVJ9L0Rlcml2ZWRTb3VyY2VzL1dlYkNvcmUiICItLXNvdXJjZS10cmVlLXBh dGgiICIke1NSQ1JPT1R9IiAiLS1mZWF0dXJlLWZsYWdzIiAiJHtGRUFUVVJFX0RFRklORVN9IiAi LS1tYXgtY3BwLWJ1bmRsZS1jb3VudCIgIiR7VW5pZmllZFNvdXJjZUNwcEZpbGVDb3VudH0iICIt LW1heC1vYmotYy1idW5kbGUtY291bnQiICIke1VuaWZpZWRTb3VyY2VNbUZpbGVDb3VudH0iICIt LWRlbnNlLWJ1bmRsZS1maWx0ZXIiICJKUyoiICItLWRlbnNlLWJ1bmRsZS1maWx0ZXIiICJiaW5k aW5ncy9qcy8qIiAiU291cmNlcy50eHQiICJTb3VyY2VzQ29jb2EudHh0IiAiJHtBUkdTW0BdfSIg PiAvZGV2L251bGwKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1JlYWRhYmxlU3Ry ZWFtRGVmYXVsdENvbnRyb2xsZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL2pzL1JlYWRhYmxlU3RyZWFtRGVmYXVsdENvbnRyb2xsZXIuY3BwCShyZXZpc2lvbiAy NTEwNjQpCisrKyBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9SZWFkYWJsZVN0cmVhbURlZmF1 bHRDb250cm9sbGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDEsNyArNDEsNyBAQAogCiBuYW1l c3BhY2UgV2ViQ29yZSB7CiAKLXN0YXRpYyBpbmxpbmUgSlNDOjpKU1ZhbHVlIGNhbGxGdW5jdGlv bihKU0M6OkV4ZWNTdGF0ZSYgc3RhdGUsIEpTQzo6SlNWYWx1ZSBqc0Z1bmN0aW9uLCBKU0M6OkpT VmFsdWUgdGhpc1ZhbHVlLCBjb25zdCBKU0M6OkFyZ0xpc3QmIGFyZ3VtZW50cykKK3N0YXRpYyBp bmxpbmUgSlNDOjpKU1ZhbHVlIHJlYWRhYmxlU3RyZWFtQ2FsbEZ1bmN0aW9uKEpTQzo6RXhlY1N0 YXRlJiBzdGF0ZSwgSlNDOjpKU1ZhbHVlIGpzRnVuY3Rpb24sIEpTQzo6SlNWYWx1ZSB0aGlzVmFs dWUsIGNvbnN0IEpTQzo6QXJnTGlzdCYgYXJndW1lbnRzKQogewogICAgIEpTQzo6Q2FsbERhdGEg Y2FsbERhdGE7CiAgICAgYXV0byBjYWxsVHlwZSA9IEpTQzo6Z2V0Q2FsbERhdGEoc3RhdGUudm0o KSwganNGdW5jdGlvbiwgY2FsbERhdGEpOwpAQCAtNjcsNyArNjcsNyBAQCBKU0M6OkpTVmFsdWUg UmVhZGFibGVTdHJlYW1EZWZhdWx0Q29udHJvCiAgICAgYXJndW1lbnRzLmFwcGVuZChwYXJhbWV0 ZXIpOwogICAgIEFTU0VSVCghYXJndW1lbnRzLmhhc092ZXJmbG93ZWQoKSk7CiAKLSAgICByZXR1 cm4gY2FsbEZ1bmN0aW9uKHN0YXRlLCBmdW5jdGlvbiwgJm9iamVjdCwgYXJndW1lbnRzKTsKKyAg ICByZXR1cm4gcmVhZGFibGVTdHJlYW1DYWxsRnVuY3Rpb24oc3RhdGUsIGZ1bmN0aW9uLCAmb2Jq ZWN0LCBhcmd1bWVudHMpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCg== 380858 2019-10-13 23:49:51 -0700 2019-10-14 20:42:54 -0700 Patch bug-202918-20191013234951.patch text/plain 10150 thorton SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAyNTEwNjQpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDE5LTEwLTEzICBUaW0gSG9ydG9uICA8dGltb3Ro eV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIFVuaWZ5IHNvdXJjZXMgZm9yIGJpbmRpbmdz IG1vcmUgZGVuc2VseQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjAyOTE4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBTY3JpcHRzL2dlbmVyYXRlLXVuaWZpZWQtc291cmNlLWJ1bmRsZXMucmI6CisgICAg ICAgIEFkZCBhbiBvcHRpb24gdG8gc2VwYXJhdGUgYW5kIG1vcmUgZGVuc2VseSB1bmlmeSBzb3Vy Y2VzIHRoYXQgbWF0Y2gKKyAgICAgICAgYSBnaXZlbiBnbG9iIHBhdHRlcm4uCisKIDIwMTktMTAt MDggIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgTWFrZSBXZWJJ bnNwZWN0b3IncyByZW1vdGUgZGVidWcgRXZlbnRMb29wIGNvZGUgaW50byBSdW5Mb29wCkluZGV4 OiBTb3VyY2UvV1RGL1NjcmlwdHMvZ2VuZXJhdGUtdW5pZmllZC1zb3VyY2UtYnVuZGxlcy5yYgo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV1RGL1NjcmlwdHMvZ2VuZXJhdGUtdW5pZmllZC1zb3VyY2Ut YnVuZGxlcy5yYgkocmV2aXNpb24gMjUxMDY0KQorKysgU291cmNlL1dURi9TY3JpcHRzL2dlbmVy YXRlLXVuaWZpZWQtc291cmNlLWJ1bmRsZXMucmIJKHdvcmtpbmcgY29weSkKQEAgLTU1LDEwICs1 NSwxMiBAQCBkZWYgdXNhZ2UobWVzc2FnZSkKICAgICBwdXRzICJHZW5lcmF0aW9uIG9wdGlvbnM6 IgogICAgIHB1dHMgIi0tbWF4LWNwcC1idW5kbGUtY291bnQgICAgICAgICAgICAgICBVc2UgZ2xv YmFsIHNlcXVlbnRpYWwgbnVtYmVycyBmb3IgY3BwIGJ1bmRsZSBmaWxlbmFtZXMgYW5kIHNldCB0 aGUgbGltaXQgb24gdGhlIG51bWJlciIKICAgICBwdXRzICItLW1heC1vYmotYy1idW5kbGUtY291 bnQgICAgICAgICAgICAgVXNlIGdsb2JhbCBzZXF1ZW50aWFsIG51bWJlcnMgZm9yIE9iai1DIGJ1 bmRsZSBmaWxlbmFtZXMgYW5kIHNldCB0aGUgbGltaXQgb24gdGhlIG51bWJlciIKKyAgICBwdXRz ICItLWRlbnNlLWJ1bmRsZS1maWx0ZXIgICAgICAgICAgICAgICAgRGVuc2VseSBidW5kbGUgZmls ZXMgbWF0Y2hpbmcgdGhlIGdpdmVuIHBhdGggZ2xvYiIKICAgICBleGl0IDEKIGVuZAogCiBNQVhf QlVORExFX1NJWkUgPSA4CitNQVhfREVOU0VfQlVORExFX1NJWkUgPSA2NAogJGRlcml2ZWRTb3Vy Y2VzUGF0aCA9IG5pbAogJHVuaWZpZWRTb3VyY2VPdXRwdXRQYXRoID0gbmlsCiAkc291cmNlVHJl ZVBhdGggPSBuaWwKQEAgLTY5LDYgKzcxLDcgQEAgJGlucHV0WENGaWxlbGlzdFBhdGggPSBuaWwK ICRvdXRwdXRYQ0ZpbGVsaXN0UGF0aCA9IG5pbAogJG1heENwcEJ1bmRsZUNvdW50ID0gbmlsCiAk bWF4T2JqQ0J1bmRsZUNvdW50ID0gbmlsCiskZGVuc2VCdW5kbGVGaWx0ZXJzID0gW10KIAogZGVm IGxvZyh0ZXh0KQogICAgICRzdGRlcnIucHV0cyB0ZXh0IGlmICR2ZXJib3NlCkBAIC04NSw3ICs4 OCw4IEBAIEdldG9wdExvbmcubmV3KFsnLS1oZWxwJywgJy1oJywgR2V0b3B0TG8KICAgICAgICAg ICAgICAgIFsnLS1pbnB1dC14Y2ZpbGVsaXN0LXBhdGgnLCBHZXRvcHRMb25nOjpSRVFVSVJFRF9B UkdVTUVOVF0sCiAgICAgICAgICAgICAgICBbJy0tb3V0cHV0LXhjZmlsZWxpc3QtcGF0aCcsIEdl dG9wdExvbmc6OlJFUVVJUkVEX0FSR1VNRU5UXSwKICAgICAgICAgICAgICAgIFsnLS1tYXgtY3Bw LWJ1bmRsZS1jb3VudCcsIEdldG9wdExvbmc6OlJFUVVJUkVEX0FSR1VNRU5UXSwKLSAgICAgICAg ICAgICAgIFsnLS1tYXgtb2JqLWMtYnVuZGxlLWNvdW50JywgR2V0b3B0TG9uZzo6UkVRVUlSRURf QVJHVU1FTlRdKS5lYWNoIHsKKyAgICAgICAgICAgICAgIFsnLS1tYXgtb2JqLWMtYnVuZGxlLWNv dW50JywgR2V0b3B0TG9uZzo6UkVRVUlSRURfQVJHVU1FTlRdLAorICAgICAgICAgICAgICAgWyct LWRlbnNlLWJ1bmRsZS1maWx0ZXInLCBHZXRvcHRMb25nOjpSRVFVSVJFRF9BUkdVTUVOVF0pLmVh Y2ggewogICAgIHwgb3B0LCBhcmcgfAogICAgIGNhc2Ugb3B0CiAgICAgd2hlbiAnLS1oZWxwJwpA QCAtMTEzLDYgKzExNyw4IEBAIEdldG9wdExvbmcubmV3KFsnLS1oZWxwJywgJy1oJywgR2V0b3B0 TG8KICAgICAgICAgJG1heENwcEJ1bmRsZUNvdW50ID0gYXJnLnRvX2kKICAgICB3aGVuICctLW1h eC1vYmotYy1idW5kbGUtY291bnQnCiAgICAgICAgICRtYXhPYmpDQnVuZGxlQ291bnQgPSBhcmcu dG9faQorICAgIHdoZW4gJy0tZGVuc2UtYnVuZGxlLWZpbHRlcicKKyAgICAgICAgJGRlbnNlQnVu ZGxlRmlsdGVycy5wdXNoKGFyZykKICAgICBlbmQKIH0KIApAQCAtMTk0LDYgKzIwMCw3IEBAIGNs YXNzIEJ1bmRsZU1hbmFnZXIKICAgICAgICAgQG1heENvdW50ID0gbWF4CiAgICAgICAgIEBleHRy YUZpbGVzID0gW10KICAgICAgICAgQGN1cnJlbnREaXJlY3RvcnkgPSBuaWwKKyAgICAgICAgQGxh c3RCdW5kbGluZ1ByZWZpeCA9IG5pbAogICAgIGVuZAogCiAgICAgZGVmIHdyaXRlRmlsZShmaWxl LCB0ZXh0KQpAQCAtMjQxLDIxICsyNDgsMzQgQEAgY2xhc3MgQnVuZGxlTWFuYWdlcgogICAgIGRl ZiBhZGRGaWxlKHNvdXJjZUZpbGUpCiAgICAgICAgIHBhdGggPSBzb3VyY2VGaWxlLnBhdGgKICAg ICAgICAgcmFpc2UgIndyb25nIGV4dGVuc2lvbjogI3twYXRoLmV4dG5hbWV9IGV4cGVjdGVkICN7 QGV4dGVuc2lvbn0iIHVubGVzcyBwYXRoLmV4dG5hbWUgPT0gIi4je0BleHRlbnNpb259IgotICAg ICAgICBpZiAoVG9wTGV2ZWxEaXJlY3RvcnlGb3JQYXRoKEBjdXJyZW50RGlyZWN0b3J5KSAhPSBU b3BMZXZlbERpcmVjdG9yeUZvclBhdGgocGF0aC5kaXJuYW1lKSkKKyAgICAgICAgYnVuZGxlUHJl Zml4LCBidW5kbGVTaXplID0gQnVuZGxlUHJlZml4QW5kU2l6ZUZvclBhdGgocGF0aCkKKyAgICAg ICAgaWYgKEBsYXN0QnVuZGxpbmdQcmVmaXggIT0gYnVuZGxlUHJlZml4KQogICAgICAgICAgICAg bG9nKCJGbHVzaGluZyBiZWNhdXNlIG5ldyB0b3AgbGV2ZWwgZGlyZWN0b3J5OyBvbGQ6ICN7QGN1 cnJlbnREaXJlY3Rvcnl9LCBuZXc6ICN7cGF0aC5kaXJuYW1lfSIpCiAgICAgICAgICAgICBmbHVz aAorICAgICAgICAgICAgQGxhc3RCdW5kbGluZ1ByZWZpeCA9IGJ1bmRsZVByZWZpeAogICAgICAg ICAgICAgQGN1cnJlbnREaXJlY3RvcnkgPSBwYXRoLmRpcm5hbWUKICAgICAgICAgICAgIEBidW5k bGVDb3VudCA9IDAgdW5sZXNzIEBtYXhDb3VudAogICAgICAgICBlbmQKLSAgICAgICAgaWYgQGZp bGVDb3VudCA9PSBNQVhfQlVORExFX1NJWkUKKyAgICAgICAgaWYgQGZpbGVDb3VudCA+PSBidW5k bGVTaXplCiAgICAgICAgICAgICBsb2coIkZsdXNoaW5nIGJlY2F1c2UgbmV3IGJ1bmRsZSBpcyBm dWxsICgje0BmaWxlQ291bnR9IHNvdXJjZXMpIikKICAgICAgICAgICAgIGZsdXNoCiAgICAgICAg IGVuZAorICAgICAgICBwcmludCgiVEhPUlRPTjogI3tidW5kbGVGaWxlTmFtZSgpfSAje2J1bmRs ZVByZWZpeH0gI3tzb3VyY2VGaWxlfVxuIikKICAgICAgICAgQGN1cnJlbnRCdW5kbGVUZXh0ICs9 ICIjaW5jbHVkZSBcIiN7c291cmNlRmlsZX1cIlxuIgogICAgICAgICBAZmlsZUNvdW50ICs9IDEK ICAgICBlbmQKIGVuZAogCitkZWYgQnVuZGxlUHJlZml4QW5kU2l6ZUZvclBhdGgocGF0aCkKKyAg ICB0b3BMZXZlbERpcmVjdG9yeSA9IFRvcExldmVsRGlyZWN0b3J5Rm9yUGF0aChwYXRoLmRpcm5h bWUpCisgICAgJGRlbnNlQnVuZGxlRmlsdGVycy5lYWNoIHsgfGZpbHRlcnwKKyAgICAgICAgaWYg cGF0aC5mbm1hdGNoKGZpbHRlcikKKyAgICAgICAgICAgIHJldHVybiBmaWx0ZXIsIE1BWF9ERU5T RV9CVU5ETEVfU0laRQorICAgICAgICBlbmQKKyAgICB9CisgICAgcmV0dXJuIHRvcExldmVsRGly ZWN0b3J5LCBNQVhfQlVORExFX1NJWkUKK2VuZAorCiBkZWYgVG9wTGV2ZWxEaXJlY3RvcnlGb3JQ YXRoKHBhdGgpCiAgICAgaWYgIXBhdGgKICAgICAgICAgcmV0dXJuIG5pbApJbmRleDogU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZwkocmV2aXNpb24gMjUxMDY2KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsNDAgQEAKKzIwMTktMTAtMTMgIFRpbSBIb3J0b24gIDx0aW1vdGh5 X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgVW5pZnkgc291cmNlcyBmb3IgYmluZGluZ3Mg bW9yZSBkZW5zZWx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMDI5MTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBObyBuZXcgdGVzdHMsIGp1c3QgYSBidWlsZCB0aW1lIHNwZWVkdXAuCisgICAgICAgIEZv ciBtZSwgdGhpcyBpcyBhIHJlbGlhYmxlIDE3JSBib29zdCBvbiB0aGUgV2ViQ29yZSBCdWlsZCBU aW1lIEJlbmNobWFyay4KKworICAgICAgICAqIFNjcmlwdHMvZ2VuZXJhdGUtdW5pZmllZC1zb3Vy Y2VzLnNoOgorICAgICAgICBVc2UgZGVuc2UgYnVuZGxlcyBmb3IgSlMqIGFuZCBiaW5kaW5ncy9q cy8qLgorICAgICAgICBUaGlzIHNlZW1zIGFjY2VwdGFibGUgZm9yIGEgZmV3IHJlYXNvbnM6CisK KyAgICAgICAgLSBtb3N0IG9mIHRoZSB0aW1lIGJ1aWxkaW5nIHRoZXNlIGZpbGVzIGlzIHNwZW50 IHBhcnNpbmcgdGhlIGV4YWN0CisgICAgICAgIHNhbWUgc2V0IG9mIEpTQyBoZWFkZXJzLCBiZWNh dXNlIHRoZSBnZW5lcmF0ZWQgYmluZGluZ3MgY29kZSBlbmRzCisgICAgICAgIHVwIGluY2x1ZGlu ZyB0aGUgc2FtZSBzZXQgb2YgdGhpbmdzCisKKyAgICAgICAgLSB0aGUgaW5jcmVtZW50YWwgYnVp bGQgY29zdCBvZiBidW5kbGluZyBtb3JlIGJpbmRpbmdzIHNvdXJjZXMgdG9nZXRoZXIKKyAgICAg ICAgaXMgc21hbGwsIGJlY2F1c2UgdGhlIEpTQyBoZWFkZXJzIGRvbWluYXRlIHRoZSB0aW1lCisK KyAgICAgICAgLSBmb2xrcyB3aWxsIGZyZXF1ZW50bHkgaGF2ZSB0byByZWJ1aWxkIGFsbCBvZiB0 aGUgYmluZGluZ3MgKG9uIGV2ZXJ5CisgICAgICAgIHB1bGwsIGZvciBleGFtcGxlLCBiZWNhdXNl IHRoZXkgaW5kaXJlY3RseSBpbmNsdWRlIG1vc3QgSlNDIGhlYWRlcnMpLAorICAgICAgICBidXQg cmFyZWx5IGVuZCB1cCByZWJ1aWxkaW5nIG9ubHkgYSBzaW5nbGUgb25lIChpbiBteSBleHBlcmll bmNlKQorCisgICAgICAgICogYmluZGluZ3MvanMvUmVhZGFibGVTdHJlYW1EZWZhdWx0Q29udHJv bGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpyZWFkYWJsZVN0cmVhbUNhbGxGdW5jdGlvbik6 CisgICAgICAgIChXZWJDb3JlOjpSZWFkYWJsZVN0cmVhbURlZmF1bHRDb250cm9sbGVyOjppbnZv a2UpOgorICAgICAgICAoV2ViQ29yZTo6Y2FsbEZ1bmN0aW9uKTogRGVsZXRlZC4KKyAgICAgICAg RGVkdXBsaWNhdGUgc3RhdGljIGZ1bmN0aW9ucyB0aGF0IG5vdyBnZXQgYnVuZGxlZCB0b2dldGhl ci4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhL1BsYXRmb3JtQ0FMYXllci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpQbGF0Zm9ybUNBTGF5ZXI6OmN1cnJlbnRUaW1lVG9NZWRpYVRp bWUpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhL1BsYXRmb3JtQ0FMYXllci5oOgor ICAgICAgICBJbiBvbGRlciBtYWNPUyBTREtzLCBDQUJhc2UuaCBpbmNsdWRlZCBBcHBsaWNhdGlv blNlcnZpY2VzLmgsIHdoaWNoCisgICAgICAgIGNhdXNlcyBsb3RzIG9mIHRyb3VibGUuCisKIDIw MTktMTAtMTMgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAg ICAgU3RvcCAndXNpbmcgbmFtZXNwYWNlICpOYW1lcycgaW4gZmlsZXMgZ2VuZXJhdGVkIGJ5IG1h a2VfbmFtZXMucGwKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL1NjcmlwdHMvZ2VuZXJhdGUtdW5pZmll ZC1zb3VyY2VzLnNoCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL1NjcmlwdHMvZ2VuZXJh dGUtdW5pZmllZC1zb3VyY2VzLnNoCShyZXZpc2lvbiAyNTEwNjQpCisrKyBTb3VyY2UvV2ViQ29y ZS9TY3JpcHRzL2dlbmVyYXRlLXVuaWZpZWQtc291cmNlcy5zaAkod29ya2luZyBjb3B5KQpAQCAt MjEsNCArMjEsNCBAQCBpZiBbICQjIC1lcSAwIF07IHRoZW4KICAgICBlY2hvICJVc2luZyB1bmlm aWVkIHNvdXJjZSBsaXN0IGZpbGVzOiBTb3VyY2VzLnR4dCwgU291cmNlc0NvY29hLnR4dCIKIGZp CiAKLS91c3IvYmluL2VudiBydWJ5ICIke0JVSUxEX1NDUklQVFNfRElSfS9nZW5lcmF0ZS11bmlm aWVkLXNvdXJjZS1idW5kbGVzLnJiIiAiLS1kZXJpdmVkLXNvdXJjZXMtcGF0aCIgIiR7QlVJTFRf UFJPRFVDVFNfRElSfS9EZXJpdmVkU291cmNlcy9XZWJDb3JlIiAiLS1zb3VyY2UtdHJlZS1wYXRo IiAiJHtTUkNST09UfSIgIi0tZmVhdHVyZS1mbGFncyIgIiR7RkVBVFVSRV9ERUZJTkVTfSIgIi0t bWF4LWNwcC1idW5kbGUtY291bnQiICIke1VuaWZpZWRTb3VyY2VDcHBGaWxlQ291bnR9IiAiLS1t YXgtb2JqLWMtYnVuZGxlLWNvdW50IiAiJHtVbmlmaWVkU291cmNlTW1GaWxlQ291bnR9IiAiU291 cmNlcy50eHQiICJTb3VyY2VzQ29jb2EudHh0IiAiJHtBUkdTW0BdfSIgPiAvZGV2L251bGwKKy91 c3IvYmluL2VudiBydWJ5ICIke0JVSUxEX1NDUklQVFNfRElSfS9nZW5lcmF0ZS11bmlmaWVkLXNv dXJjZS1idW5kbGVzLnJiIiAiLS1kZXJpdmVkLXNvdXJjZXMtcGF0aCIgIiR7QlVJTFRfUFJPRFVD VFNfRElSfS9EZXJpdmVkU291cmNlcy9XZWJDb3JlIiAiLS1zb3VyY2UtdHJlZS1wYXRoIiAiJHtT UkNST09UfSIgIi0tZmVhdHVyZS1mbGFncyIgIiR7RkVBVFVSRV9ERUZJTkVTfSIgIi0tbWF4LWNw cC1idW5kbGUtY291bnQiICIke1VuaWZpZWRTb3VyY2VDcHBGaWxlQ291bnR9IiAiLS1tYXgtb2Jq LWMtYnVuZGxlLWNvdW50IiAiJHtVbmlmaWVkU291cmNlTW1GaWxlQ291bnR9IiAiLS1kZW5zZS1i dW5kbGUtZmlsdGVyIiAiSlMqIiAiLS1kZW5zZS1idW5kbGUtZmlsdGVyIiAiYmluZGluZ3MvanMv KiIgIlNvdXJjZXMudHh0IiAiU291cmNlc0NvY29hLnR4dCIgIiR7QVJHU1tAXX0iID4gL2Rldi9u dWxsCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9SZWFkYWJsZVN0cmVhbURlZmF1 bHRDb250cm9sbGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9q cy9SZWFkYWJsZVN0cmVhbURlZmF1bHRDb250cm9sbGVyLmNwcAkocmV2aXNpb24gMjUxMDY0KQor KysgU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvUmVhZGFibGVTdHJlYW1EZWZhdWx0Q29udHJv bGxlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQxLDcgKzQxLDcgQEAKIAogbmFtZXNwYWNlIFdl YkNvcmUgewogCi1zdGF0aWMgaW5saW5lIEpTQzo6SlNWYWx1ZSBjYWxsRnVuY3Rpb24oSlNDOjpF eGVjU3RhdGUmIHN0YXRlLCBKU0M6OkpTVmFsdWUganNGdW5jdGlvbiwgSlNDOjpKU1ZhbHVlIHRo aXNWYWx1ZSwgY29uc3QgSlNDOjpBcmdMaXN0JiBhcmd1bWVudHMpCitzdGF0aWMgaW5saW5lIEpT Qzo6SlNWYWx1ZSByZWFkYWJsZVN0cmVhbUNhbGxGdW5jdGlvbihKU0M6OkV4ZWNTdGF0ZSYgc3Rh dGUsIEpTQzo6SlNWYWx1ZSBqc0Z1bmN0aW9uLCBKU0M6OkpTVmFsdWUgdGhpc1ZhbHVlLCBjb25z dCBKU0M6OkFyZ0xpc3QmIGFyZ3VtZW50cykKIHsKICAgICBKU0M6OkNhbGxEYXRhIGNhbGxEYXRh OwogICAgIGF1dG8gY2FsbFR5cGUgPSBKU0M6OmdldENhbGxEYXRhKHN0YXRlLnZtKCksIGpzRnVu Y3Rpb24sIGNhbGxEYXRhKTsKQEAgLTY3LDcgKzY3LDcgQEAgSlNDOjpKU1ZhbHVlIFJlYWRhYmxl U3RyZWFtRGVmYXVsdENvbnRybwogICAgIGFyZ3VtZW50cy5hcHBlbmQocGFyYW1ldGVyKTsKICAg ICBBU1NFUlQoIWFyZ3VtZW50cy5oYXNPdmVyZmxvd2VkKCkpOwogCi0gICAgcmV0dXJuIGNhbGxG dW5jdGlvbihzdGF0ZSwgZnVuY3Rpb24sICZvYmplY3QsIGFyZ3VtZW50cyk7CisgICAgcmV0dXJu IHJlYWRhYmxlU3RyZWFtQ2FsbEZ1bmN0aW9uKHN0YXRlLCBmdW5jdGlvbiwgJm9iamVjdCwgYXJn dW1lbnRzKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDogU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvUGxhdGZvcm1DQUxheWVyLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9QbGF0Zm9ybUNBTGF5ZXIuY3Bw CShyZXZpc2lvbiAyNTEwNjQpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j YS9QbGF0Zm9ybUNBTGF5ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02NSw2ICs2NSwxMSBAQCBQ bGF0Zm9ybUNBTGF5ZXI6On5QbGF0Zm9ybUNBTGF5ZXIoKQogICAgIHNldE93bmVyKG51bGxwdHIp OwogfQogCitDRlRpbWVJbnRlcnZhbCBQbGF0Zm9ybUNBTGF5ZXI6OmN1cnJlbnRUaW1lVG9NZWRp YVRpbWUoTW9ub3RvbmljVGltZSB0KQoreworICAgIHJldHVybiBDQUN1cnJlbnRNZWRpYVRpbWUo KSArICh0IC0gTW9ub3RvbmljVGltZTo6bm93KCkpLnNlY29uZHMoKTsKK30KKwogYm9vbCBQbGF0 Zm9ybUNBTGF5ZXI6OmNhbkhhdmVCYWNraW5nU3RvcmUoKSBjb25zdAogewogICAgIHJldHVybiBt X2xheWVyVHlwZSA9PSBMYXllclR5cGU6OkxheWVyVHlwZVdlYkxheWVyCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9QbGF0Zm9ybUNBTGF5ZXIuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9QbGF0Zm9ybUNBTGF5ZXIu aAkocmV2aXNpb24gMjUxMDY0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2EvUGxhdGZvcm1DQUxheWVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTI3LDcgKzI3LDYgQEAKIAog I2luY2x1ZGUgIkZsb2F0Um91bmRlZFJlY3QuaCIKICNpbmNsdWRlICJHcmFwaGljc0xheWVyLmgi Ci0jaW5jbHVkZSA8UXVhcnR6Q29yZS9DQUJhc2UuaD4KICNpbmNsdWRlIDx3dGYvUmVmQ291bnRl ZC5oPgogI2luY2x1ZGUgPHd0Zi9SZXRhaW5QdHIuaD4KICNpbmNsdWRlIDx3dGYvVHlwZUNhc3Rz Lmg+CkBAIC01NSw3ICs1NCw3IEBAIGNsYXNzIFdFQkNPUkVfRVhQT1JUIFBsYXRmb3JtQ0FMYXll ciA6IHAKICAgICBmcmllbmQgY2xhc3MgUGxhdGZvcm1DQUxheWVyV2luOwogI2VuZGlmCiBwdWJs aWM6Ci0gICAgc3RhdGljIENGVGltZUludGVydmFsIGN1cnJlbnRUaW1lVG9NZWRpYVRpbWUoTW9u b3RvbmljVGltZSB0KSB7IHJldHVybiBDQUN1cnJlbnRNZWRpYVRpbWUoKSArICh0IC0gTW9ub3Rv bmljVGltZTo6bm93KCkpLnNlY29uZHMoKTsgfQorICAgIHN0YXRpYyBDRlRpbWVJbnRlcnZhbCBj dXJyZW50VGltZVRvTWVkaWFUaW1lKE1vbm90b25pY1RpbWUpOwogCiAgICAgLy8gTGF5ZXJUeXBl Um9vdExheWVyIGlzIHVzZWQgb24gc29tZSBwbGF0Zm9ybXMuIEl0IGhhcyBubyBiYWNraW5nIHN0 b3JlLCBzbyBzZXROZWVkc0Rpc3BsYXkKICAgICAvLyBzaG91bGQgbm90IGNhbGwgQ0FDRkxheWVy U2V0TmVlZHNEaXNwbGF5LCBidXQgcmF0aGVyIGp1c3Qgbm90aWZ5IHRoZSByZW5kZXJlciB0aGF0 IGl0Cg== 380955 2019-10-14 20:42:56 -0700 2019-10-14 22:53:24 -0700 Patch bug-202918-20191014204255.patch text/plain 10201 thorton SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAyNTExMTkpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDE5LTEwLTE0ICBUaW0gSG9ydG9uICA8dGltb3Ro eV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIFVuaWZ5IHNvdXJjZXMgZm9yIGJpbmRpbmdz IG1vcmUgZGVuc2VseQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjAyOTE4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgorCisgICAg ICAgICogU2NyaXB0cy9nZW5lcmF0ZS11bmlmaWVkLXNvdXJjZS1idW5kbGVzLnJiOgorICAgICAg ICBBZGQgYW4gb3B0aW9uIHRvIHNlcGFyYXRlIGFuZCBtb3JlIGRlbnNlbHkgdW5pZnkgc291cmNl cyB0aGF0IG1hdGNoCisgICAgICAgIGEgZ2l2ZW4gZ2xvYiBwYXR0ZXJuLgorCiAyMDE5LTEwLTE0 ICBLZWl0aCBSb2xsaW4gIDxrcm9sbGluQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgc29t ZSBzdXBwb3J0IGZvciA8IGlPUyAxMwpJbmRleDogU291cmNlL1dURi9TY3JpcHRzL2dlbmVyYXRl LXVuaWZpZWQtc291cmNlLWJ1bmRsZXMucmIKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dURi9TY3Jp cHRzL2dlbmVyYXRlLXVuaWZpZWQtc291cmNlLWJ1bmRsZXMucmIJKHJldmlzaW9uIDI1MTExOSkK KysrIFNvdXJjZS9XVEYvU2NyaXB0cy9nZW5lcmF0ZS11bmlmaWVkLXNvdXJjZS1idW5kbGVzLnJi CSh3b3JraW5nIGNvcHkpCkBAIC01NSwxMCArNTUsMTIgQEAgZGVmIHVzYWdlKG1lc3NhZ2UpCiAg ICAgcHV0cyAiR2VuZXJhdGlvbiBvcHRpb25zOiIKICAgICBwdXRzICItLW1heC1jcHAtYnVuZGxl LWNvdW50ICAgICAgICAgICAgICAgVXNlIGdsb2JhbCBzZXF1ZW50aWFsIG51bWJlcnMgZm9yIGNw cCBidW5kbGUgZmlsZW5hbWVzIGFuZCBzZXQgdGhlIGxpbWl0IG9uIHRoZSBudW1iZXIiCiAgICAg cHV0cyAiLS1tYXgtb2JqLWMtYnVuZGxlLWNvdW50ICAgICAgICAgICAgIFVzZSBnbG9iYWwgc2Vx dWVudGlhbCBudW1iZXJzIGZvciBPYmotQyBidW5kbGUgZmlsZW5hbWVzIGFuZCBzZXQgdGhlIGxp bWl0IG9uIHRoZSBudW1iZXIiCisgICAgcHV0cyAiLS1kZW5zZS1idW5kbGUtZmlsdGVyICAgICAg ICAgICAgICAgIERlbnNlbHkgYnVuZGxlIGZpbGVzIG1hdGNoaW5nIHRoZSBnaXZlbiBwYXRoIGds b2IiCiAgICAgZXhpdCAxCiBlbmQKIAogTUFYX0JVTkRMRV9TSVpFID0gOAorTUFYX0RFTlNFX0JV TkRMRV9TSVpFID0gNjQKICRkZXJpdmVkU291cmNlc1BhdGggPSBuaWwKICR1bmlmaWVkU291cmNl T3V0cHV0UGF0aCA9IG5pbAogJHNvdXJjZVRyZWVQYXRoID0gbmlsCkBAIC02OSw2ICs3MSw3IEBA ICRpbnB1dFhDRmlsZWxpc3RQYXRoID0gbmlsCiAkb3V0cHV0WENGaWxlbGlzdFBhdGggPSBuaWwK ICRtYXhDcHBCdW5kbGVDb3VudCA9IG5pbAogJG1heE9iakNCdW5kbGVDb3VudCA9IG5pbAorJGRl bnNlQnVuZGxlRmlsdGVycyA9IFtdCiAKIGRlZiBsb2codGV4dCkKICAgICAkc3RkZXJyLnB1dHMg dGV4dCBpZiAkdmVyYm9zZQpAQCAtODUsNyArODgsOCBAQCBHZXRvcHRMb25nLm5ldyhbJy0taGVs cCcsICctaCcsIEdldG9wdExvCiAgICAgICAgICAgICAgICBbJy0taW5wdXQteGNmaWxlbGlzdC1w YXRoJywgR2V0b3B0TG9uZzo6UkVRVUlSRURfQVJHVU1FTlRdLAogICAgICAgICAgICAgICAgWyct LW91dHB1dC14Y2ZpbGVsaXN0LXBhdGgnLCBHZXRvcHRMb25nOjpSRVFVSVJFRF9BUkdVTUVOVF0s CiAgICAgICAgICAgICAgICBbJy0tbWF4LWNwcC1idW5kbGUtY291bnQnLCBHZXRvcHRMb25nOjpS RVFVSVJFRF9BUkdVTUVOVF0sCi0gICAgICAgICAgICAgICBbJy0tbWF4LW9iai1jLWJ1bmRsZS1j b3VudCcsIEdldG9wdExvbmc6OlJFUVVJUkVEX0FSR1VNRU5UXSkuZWFjaCB7CisgICAgICAgICAg ICAgICBbJy0tbWF4LW9iai1jLWJ1bmRsZS1jb3VudCcsIEdldG9wdExvbmc6OlJFUVVJUkVEX0FS R1VNRU5UXSwKKyAgICAgICAgICAgICAgIFsnLS1kZW5zZS1idW5kbGUtZmlsdGVyJywgR2V0b3B0 TG9uZzo6UkVRVUlSRURfQVJHVU1FTlRdKS5lYWNoIHsKICAgICB8IG9wdCwgYXJnIHwKICAgICBj YXNlIG9wdAogICAgIHdoZW4gJy0taGVscCcKQEAgLTExMyw2ICsxMTcsOCBAQCBHZXRvcHRMb25n Lm5ldyhbJy0taGVscCcsICctaCcsIEdldG9wdExvCiAgICAgICAgICRtYXhDcHBCdW5kbGVDb3Vu dCA9IGFyZy50b19pCiAgICAgd2hlbiAnLS1tYXgtb2JqLWMtYnVuZGxlLWNvdW50JwogICAgICAg ICAkbWF4T2JqQ0J1bmRsZUNvdW50ID0gYXJnLnRvX2kKKyAgICB3aGVuICctLWRlbnNlLWJ1bmRs ZS1maWx0ZXInCisgICAgICAgICRkZW5zZUJ1bmRsZUZpbHRlcnMucHVzaChhcmcpCiAgICAgZW5k CiB9CiAKQEAgLTE5NCw2ICsyMDAsNyBAQCBjbGFzcyBCdW5kbGVNYW5hZ2VyCiAgICAgICAgIEBt YXhDb3VudCA9IG1heAogICAgICAgICBAZXh0cmFGaWxlcyA9IFtdCiAgICAgICAgIEBjdXJyZW50 RGlyZWN0b3J5ID0gbmlsCisgICAgICAgIEBsYXN0QnVuZGxpbmdQcmVmaXggPSBuaWwKICAgICBl bmQKIAogICAgIGRlZiB3cml0ZUZpbGUoZmlsZSwgdGV4dCkKQEAgLTI0MSwxMyArMjQ4LDE1IEBA IGNsYXNzIEJ1bmRsZU1hbmFnZXIKICAgICBkZWYgYWRkRmlsZShzb3VyY2VGaWxlKQogICAgICAg ICBwYXRoID0gc291cmNlRmlsZS5wYXRoCiAgICAgICAgIHJhaXNlICJ3cm9uZyBleHRlbnNpb246 ICN7cGF0aC5leHRuYW1lfSBleHBlY3RlZCAje0BleHRlbnNpb259IiB1bmxlc3MgcGF0aC5leHRu YW1lID09ICIuI3tAZXh0ZW5zaW9ufSIKLSAgICAgICAgaWYgKFRvcExldmVsRGlyZWN0b3J5Rm9y UGF0aChAY3VycmVudERpcmVjdG9yeSkgIT0gVG9wTGV2ZWxEaXJlY3RvcnlGb3JQYXRoKHBhdGgu ZGlybmFtZSkpCisgICAgICAgIGJ1bmRsZVByZWZpeCwgYnVuZGxlU2l6ZSA9IEJ1bmRsZVByZWZp eEFuZFNpemVGb3JQYXRoKHBhdGgpCisgICAgICAgIGlmIChAbGFzdEJ1bmRsaW5nUHJlZml4ICE9 IGJ1bmRsZVByZWZpeCkKICAgICAgICAgICAgIGxvZygiRmx1c2hpbmcgYmVjYXVzZSBuZXcgdG9w IGxldmVsIGRpcmVjdG9yeTsgb2xkOiAje0BjdXJyZW50RGlyZWN0b3J5fSwgbmV3OiAje3BhdGgu ZGlybmFtZX0iKQogICAgICAgICAgICAgZmx1c2gKKyAgICAgICAgICAgIEBsYXN0QnVuZGxpbmdQ cmVmaXggPSBidW5kbGVQcmVmaXgKICAgICAgICAgICAgIEBjdXJyZW50RGlyZWN0b3J5ID0gcGF0 aC5kaXJuYW1lCiAgICAgICAgICAgICBAYnVuZGxlQ291bnQgPSAwIHVubGVzcyBAbWF4Q291bnQK ICAgICAgICAgZW5kCi0gICAgICAgIGlmIEBmaWxlQ291bnQgPT0gTUFYX0JVTkRMRV9TSVpFCisg ICAgICAgIGlmIEBmaWxlQ291bnQgPj0gYnVuZGxlU2l6ZQogICAgICAgICAgICAgbG9nKCJGbHVz aGluZyBiZWNhdXNlIG5ldyBidW5kbGUgaXMgZnVsbCAoI3tAZmlsZUNvdW50fSBzb3VyY2VzKSIp CiAgICAgICAgICAgICBmbHVzaAogICAgICAgICBlbmQKQEAgLTI1Niw2ICsyNjUsMTYgQEAgY2xh c3MgQnVuZGxlTWFuYWdlcgogICAgIGVuZAogZW5kCiAKK2RlZiBCdW5kbGVQcmVmaXhBbmRTaXpl Rm9yUGF0aChwYXRoKQorICAgIHRvcExldmVsRGlyZWN0b3J5ID0gVG9wTGV2ZWxEaXJlY3RvcnlG b3JQYXRoKHBhdGguZGlybmFtZSkKKyAgICAkZGVuc2VCdW5kbGVGaWx0ZXJzLmVhY2ggeyB8Zmls dGVyfAorICAgICAgICBpZiBwYXRoLmZubWF0Y2goZmlsdGVyKQorICAgICAgICAgICAgcmV0dXJu IGZpbHRlciwgTUFYX0RFTlNFX0JVTkRMRV9TSVpFCisgICAgICAgIGVuZAorICAgIH0KKyAgICBy ZXR1cm4gdG9wTGV2ZWxEaXJlY3RvcnksIE1BWF9CVU5ETEVfU0laRQorZW5kCisKIGRlZiBUb3BM ZXZlbERpcmVjdG9yeUZvclBhdGgocGF0aCkKICAgICBpZiAhcGF0aAogICAgICAgICByZXR1cm4g bmlsCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTExMTkpCisrKyBTb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSw0MCBAQAorMjAxOS0xMC0xNCAgVGlt IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KKworICAgICAgICBVbmlmeSBzb3Vy Y2VzIGZvciBiaW5kaW5ncyBtb3JlIGRlbnNlbHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMjkxOAorCisgICAgICAgIFJldmlld2VkIGJ5IFNpbW9u IEZyYXNlci4KKworICAgICAgICBObyBuZXcgdGVzdHMsIGp1c3QgYSBidWlsZCB0aW1lIHNwZWVk dXAuCisgICAgICAgIEZvciBtZSwgdGhpcyBpcyBhIHJlbGlhYmxlIDE3JSBib29zdCBvbiB0aGUg V2ViQ29yZSBCdWlsZCBUaW1lIEJlbmNobWFyay4KKworICAgICAgICAqIFNjcmlwdHMvZ2VuZXJh dGUtdW5pZmllZC1zb3VyY2VzLnNoOgorICAgICAgICBVc2UgZGVuc2UgYnVuZGxlcyBmb3IgSlMq IGFuZCBiaW5kaW5ncy9qcy8qLgorICAgICAgICBUaGlzIHNlZW1zIGFjY2VwdGFibGUgZm9yIGEg ZmV3IHJlYXNvbnM6CisKKyAgICAgICAgLSBtb3N0IG9mIHRoZSB0aW1lIGJ1aWxkaW5nIHRoZXNl IGZpbGVzIGlzIHNwZW50IHBhcnNpbmcgdGhlIGV4YWN0CisgICAgICAgIHNhbWUgc2V0IG9mIEpT QyBoZWFkZXJzLCBiZWNhdXNlIHRoZSBnZW5lcmF0ZWQgYmluZGluZ3MgY29kZSBlbmRzCisgICAg ICAgIHVwIGluY2x1ZGluZyB0aGUgc2FtZSBzZXQgb2YgdGhpbmdzCisKKyAgICAgICAgLSB0aGUg aW5jcmVtZW50YWwgYnVpbGQgY29zdCBvZiBidW5kbGluZyBtb3JlIGJpbmRpbmdzIHNvdXJjZXMg dG9nZXRoZXIKKyAgICAgICAgaXMgc21hbGwsIGJlY2F1c2UgdGhlIEpTQyBoZWFkZXJzIGRvbWlu YXRlIHRoZSB0aW1lCisKKyAgICAgICAgLSBmb2xrcyB3aWxsIGZyZXF1ZW50bHkgaGF2ZSB0byBy ZWJ1aWxkIGFsbCBvZiB0aGUgYmluZGluZ3MgKG9uIGV2ZXJ5CisgICAgICAgIHB1bGwsIGZvciBl eGFtcGxlLCBiZWNhdXNlIHRoZXkgaW5kaXJlY3RseSBpbmNsdWRlIG1vc3QgSlNDIGhlYWRlcnMp LAorICAgICAgICBidXQgcmFyZWx5IGVuZCB1cCByZWJ1aWxkaW5nIG9ubHkgYSBzaW5nbGUgb25l IChpbiBteSBleHBlcmllbmNlKQorCisgICAgICAgICogYmluZGluZ3MvanMvUmVhZGFibGVTdHJl YW1EZWZhdWx0Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpyZWFkYWJsZVN0cmVh bUNhbGxGdW5jdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpSZWFkYWJsZVN0cmVhbURlZmF1bHRD b250cm9sbGVyOjppbnZva2UpOgorICAgICAgICAoV2ViQ29yZTo6Y2FsbEZ1bmN0aW9uKTogRGVs ZXRlZC4KKyAgICAgICAgRGVkdXBsaWNhdGUgc3RhdGljIGZ1bmN0aW9ucyB0aGF0IG5vdyBnZXQg YnVuZGxlZCB0b2dldGhlci4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhL1BsYXRm b3JtQ0FMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQbGF0Zm9ybUNBTGF5ZXI6OmN1cnJl bnRUaW1lVG9NZWRpYVRpbWUpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhL1BsYXRm b3JtQ0FMYXllci5oOgorICAgICAgICBJbiBvbGRlciBtYWNPUyBTREtzLCBDQUJhc2UuaCBpbmNs dWRlZCBBcHBsaWNhdGlvblNlcnZpY2VzLmgsIHdoaWNoCisgICAgICAgIGNhdXNlcyBsb3RzIG9m IHRyb3VibGUuCisKIDIwMTktMTAtMTQgIFNhaWQgQWJvdS1IYWxsYXdhICA8c2Fib3VoYWxsYXdh QGFwcGxlLmNvbT4KIAogICAgICAgICBPdXRzZXRzIGZvciByZWZlcmVuY2VkIFNWRyBmaWx0ZXJz IGFyZSBhbHdheXMgemVybwpJbmRleDogU291cmNlL1dlYkNvcmUvU2NyaXB0cy9nZW5lcmF0ZS11 bmlmaWVkLXNvdXJjZXMuc2gKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvU2NyaXB0cy9n ZW5lcmF0ZS11bmlmaWVkLXNvdXJjZXMuc2gJKHJldmlzaW9uIDI1MTExOSkKKysrIFNvdXJjZS9X ZWJDb3JlL1NjcmlwdHMvZ2VuZXJhdGUtdW5pZmllZC1zb3VyY2VzLnNoCSh3b3JraW5nIGNvcHkp CkBAIC0yMSw0ICsyMSw0IEBAIGlmIFsgJCMgLWVxIDAgXTsgdGhlbgogICAgIGVjaG8gIlVzaW5n IHVuaWZpZWQgc291cmNlIGxpc3QgZmlsZXM6IFNvdXJjZXMudHh0LCBTb3VyY2VzQ29jb2EudHh0 IgogZmkKIAotL3Vzci9iaW4vZW52IHJ1YnkgIiR7QlVJTERfU0NSSVBUU19ESVJ9L2dlbmVyYXRl LXVuaWZpZWQtc291cmNlLWJ1bmRsZXMucmIiICItLWRlcml2ZWQtc291cmNlcy1wYXRoIiAiJHtC VUlMVF9QUk9EVUNUU19ESVJ9L0Rlcml2ZWRTb3VyY2VzL1dlYkNvcmUiICItLXNvdXJjZS10cmVl LXBhdGgiICIke1NSQ1JPT1R9IiAiLS1mZWF0dXJlLWZsYWdzIiAiJHtGRUFUVVJFX0RFRklORVN9 IiAiLS1tYXgtY3BwLWJ1bmRsZS1jb3VudCIgIiR7VW5pZmllZFNvdXJjZUNwcEZpbGVDb3VudH0i ICItLW1heC1vYmotYy1idW5kbGUtY291bnQiICIke1VuaWZpZWRTb3VyY2VNbUZpbGVDb3VudH0i ICJTb3VyY2VzLnR4dCIgIlNvdXJjZXNDb2NvYS50eHQiICIke0FSR1NbQF19IiA+IC9kZXYvbnVs bAorL3Vzci9iaW4vZW52IHJ1YnkgIiR7QlVJTERfU0NSSVBUU19ESVJ9L2dlbmVyYXRlLXVuaWZp ZWQtc291cmNlLWJ1bmRsZXMucmIiICItLWRlcml2ZWQtc291cmNlcy1wYXRoIiAiJHtCVUlMVF9Q Uk9EVUNUU19ESVJ9L0Rlcml2ZWRTb3VyY2VzL1dlYkNvcmUiICItLXNvdXJjZS10cmVlLXBhdGgi ICIke1NSQ1JPT1R9IiAiLS1mZWF0dXJlLWZsYWdzIiAiJHtGRUFUVVJFX0RFRklORVN9IiAiLS1t YXgtY3BwLWJ1bmRsZS1jb3VudCIgIiR7VW5pZmllZFNvdXJjZUNwcEZpbGVDb3VudH0iICItLW1h eC1vYmotYy1idW5kbGUtY291bnQiICIke1VuaWZpZWRTb3VyY2VNbUZpbGVDb3VudH0iICItLWRl bnNlLWJ1bmRsZS1maWx0ZXIiICJKUyoiICItLWRlbnNlLWJ1bmRsZS1maWx0ZXIiICJiaW5kaW5n cy9qcy8qIiAiU291cmNlcy50eHQiICJTb3VyY2VzQ29jb2EudHh0IiAiJHtBUkdTW0BdfSIgPiAv ZGV2L251bGwKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1JlYWRhYmxlU3RyZWFt RGVmYXVsdENvbnRyb2xsZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL2pzL1JlYWRhYmxlU3RyZWFtRGVmYXVsdENvbnRyb2xsZXIuY3BwCShyZXZpc2lvbiAyNTEx MTkpCisrKyBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9SZWFkYWJsZVN0cmVhbURlZmF1bHRD b250cm9sbGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDEsNyArNDEsNyBAQAogCiBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAKLXN0YXRpYyBpbmxpbmUgSlNDOjpKU1ZhbHVlIGNhbGxGdW5jdGlvbihK U0M6OkV4ZWNTdGF0ZSYgc3RhdGUsIEpTQzo6SlNWYWx1ZSBqc0Z1bmN0aW9uLCBKU0M6OkpTVmFs dWUgdGhpc1ZhbHVlLCBjb25zdCBKU0M6OkFyZ0xpc3QmIGFyZ3VtZW50cykKK3N0YXRpYyBpbmxp bmUgSlNDOjpKU1ZhbHVlIHJlYWRhYmxlU3RyZWFtQ2FsbEZ1bmN0aW9uKEpTQzo6RXhlY1N0YXRl JiBzdGF0ZSwgSlNDOjpKU1ZhbHVlIGpzRnVuY3Rpb24sIEpTQzo6SlNWYWx1ZSB0aGlzVmFsdWUs IGNvbnN0IEpTQzo6QXJnTGlzdCYgYXJndW1lbnRzKQogewogICAgIEpTQzo6Q2FsbERhdGEgY2Fs bERhdGE7CiAgICAgYXV0byBjYWxsVHlwZSA9IEpTQzo6Z2V0Q2FsbERhdGEoc3RhdGUudm0oKSwg anNGdW5jdGlvbiwgY2FsbERhdGEpOwpAQCAtNjcsNyArNjcsNyBAQCBKU0M6OkpTVmFsdWUgUmVh ZGFibGVTdHJlYW1EZWZhdWx0Q29udHJvCiAgICAgYXJndW1lbnRzLmFwcGVuZChwYXJhbWV0ZXIp OwogICAgIEFTU0VSVCghYXJndW1lbnRzLmhhc092ZXJmbG93ZWQoKSk7CiAKLSAgICByZXR1cm4g Y2FsbEZ1bmN0aW9uKHN0YXRlLCBmdW5jdGlvbiwgJm9iamVjdCwgYXJndW1lbnRzKTsKKyAgICBy ZXR1cm4gcmVhZGFibGVTdHJlYW1DYWxsRnVuY3Rpb24oc3RhdGUsIGZ1bmN0aW9uLCAmb2JqZWN0 LCBhcmd1bWVudHMpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9QbGF0Zm9ybUNBTGF5ZXIuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL1BsYXRmb3JtQ0FMYXll ci5jcHAJKHJldmlzaW9uIDI1MTExOSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2NhL1BsYXRmb3JtQ0FMYXllci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMzLDYgKzMzLDcg QEAKICNpbmNsdWRlICJQbGF0Zm9ybUNBTGF5ZXJDbGllbnQuaCIKICNpbmNsdWRlIDxDb3JlRm91 bmRhdGlvbi9Db3JlRm91bmRhdGlvbi5oPgogI2luY2x1ZGUgPENvcmVUZXh0L0NvcmVUZXh0Lmg+ CisjaW5jbHVkZSA8UXVhcnR6Q29yZS9DQUJhc2UuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9UZXh0 U3RyZWFtLmg+CiAKICNpZiBQTEFURk9STShXSU4pCkBAIC02NSw2ICs2NiwxMSBAQCBQbGF0Zm9y bUNBTGF5ZXI6On5QbGF0Zm9ybUNBTGF5ZXIoKQogICAgIHNldE93bmVyKG51bGxwdHIpOwogfQog CitDRlRpbWVJbnRlcnZhbCBQbGF0Zm9ybUNBTGF5ZXI6OmN1cnJlbnRUaW1lVG9NZWRpYVRpbWUo TW9ub3RvbmljVGltZSB0KQoreworICAgIHJldHVybiBDQUN1cnJlbnRNZWRpYVRpbWUoKSArICh0 IC0gTW9ub3RvbmljVGltZTo6bm93KCkpLnNlY29uZHMoKTsKK30KKwogYm9vbCBQbGF0Zm9ybUNB TGF5ZXI6OmNhbkhhdmVCYWNraW5nU3RvcmUoKSBjb25zdAogewogICAgIHJldHVybiBtX2xheWVy VHlwZSA9PSBMYXllclR5cGU6OkxheWVyVHlwZVdlYkxheWVyCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9QbGF0Zm9ybUNBTGF5ZXIuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9QbGF0Zm9ybUNBTGF5ZXIuaAkocmV2 aXNpb24gMjUxMTE5KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvUGxh dGZvcm1DQUxheWVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTI3LDcgKzI3LDYgQEAKIAogI2luY2x1 ZGUgIkZsb2F0Um91bmRlZFJlY3QuaCIKICNpbmNsdWRlICJHcmFwaGljc0xheWVyLmgiCi0jaW5j bHVkZSA8UXVhcnR6Q29yZS9DQUJhc2UuaD4KICNpbmNsdWRlIDx3dGYvUmVmQ291bnRlZC5oPgog I2luY2x1ZGUgPHd0Zi9SZXRhaW5QdHIuaD4KICNpbmNsdWRlIDx3dGYvVHlwZUNhc3RzLmg+CkBA IC01NSw3ICs1NCw3IEBAIGNsYXNzIFdFQkNPUkVfRVhQT1JUIFBsYXRmb3JtQ0FMYXllciA6IHAK ICAgICBmcmllbmQgY2xhc3MgUGxhdGZvcm1DQUxheWVyV2luOwogI2VuZGlmCiBwdWJsaWM6Ci0g ICAgc3RhdGljIENGVGltZUludGVydmFsIGN1cnJlbnRUaW1lVG9NZWRpYVRpbWUoTW9ub3Rvbmlj VGltZSB0KSB7IHJldHVybiBDQUN1cnJlbnRNZWRpYVRpbWUoKSArICh0IC0gTW9ub3RvbmljVGlt ZTo6bm93KCkpLnNlY29uZHMoKTsgfQorICAgIHN0YXRpYyBDRlRpbWVJbnRlcnZhbCBjdXJyZW50 VGltZVRvTWVkaWFUaW1lKE1vbm90b25pY1RpbWUpOwogCiAgICAgLy8gTGF5ZXJUeXBlUm9vdExh eWVyIGlzIHVzZWQgb24gc29tZSBwbGF0Zm9ybXMuIEl0IGhhcyBubyBiYWNraW5nIHN0b3JlLCBz byBzZXROZWVkc0Rpc3BsYXkKICAgICAvLyBzaG91bGQgbm90IGNhbGwgQ0FDRkxheWVyU2V0TmVl ZHNEaXNwbGF5LCBidXQgcmF0aGVyIGp1c3Qgbm90aWZ5IHRoZSByZW5kZXJlciB0aGF0IGl0Cg==