193024 2018-12-24 16:43:14 -0800 [lldb-webkit]: Add support for pretty-printing raw bitmask types 2019-01-04 21:08:29 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Local Build All All RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=193023 InRadar P2 Normal --- 1 dbates dbates ddkilzer dino jer.noble lforschler simon.fraser webkit-bug-importer oldest_to_newest 1490733 0 dbates 2018-12-24 16:43:14 -0800 There are some types, like WebEventFlags, that must remain a plain-old enumeration as opposed to being turned into an OptionSet. We should support pretty printing such types. 1490734 1 358050 dbates 2018-12-24 17:02:10 -0800 Created attachment 358050 Patch 1490735 2 dbates 2018-12-24 17:05:02 -0800 Note that the proposed patch (attachment #358050) includes the patch for bug #193023. I am hoping that people do not disagree with the fix for bug #193023. If they do, then I will fix up this patch as applicable. 1491697 3 358050 jer.noble 2019-01-04 10:02:30 -0800 Comment on attachment 358050 Patch 👍🏻 1491762 4 358341 dbates 2019-01-04 11:21:20 -0800 Created attachment 358341 To Land 1492046 5 dbates 2019-01-04 21:03:37 -0800 Committed r239651: <https://trac.webkit.org/changeset/239651> 1492051 6 webkit-bug-importer 2019-01-04 21:08:29 -0800 <rdar://problem/47064007> 358050 2018-12-24 17:02:10 -0800 2019-01-04 11:21:19 -0800 Patch bug-193024-20181224170209.patch text/plain 10606 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5MDA5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYmIxMDhmYTVkYmMzNWJiZDgxN2NkZjlhZjQ0MmEzYjgz MTNlMDRkNi4uMmRiYWJkMTQ0NGExMDIwYTg2Mzg0MjM2ZjFiMzI2ZWExNGE5YTc0YiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDgw IEBACisyMDE4LTEyLTI0ICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAg ICAgICBbbGxkYi13ZWJraXRdOiBBZGQgc3VwcG9ydCBmb3IgcHJldHR5LXByaW50aW5nIHJhdyBi aXRtYXNrIHR5cGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xOTMwMjQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBBZGQgc3VwcG9ydCBpbmZyYXN0cnVjdHVyZSB0byBwcmV0dHktcHJpbnQgYSByYXcgYml0 bWFzayB0eXBlLiBJbmNsdWRlZCBpcyBhIHByZXR0eS1wcmludGVyCisgICAgICAgIGZvciB0aGUg Yml0bWFzayB0eXBlIFdlYkV2ZW50RmxhZ3MgYXMgYW4gZXhhbXBsZS4KKworICAgICAgICBFeHBv c2VkIGEgbmV3IGZ1bmN0aW9uIGxsZGJfd2Via2l0LmFkZFN1bW1hcnlBbmRTeW50aGV0aWNGb3Jt YXR0ZXJzRm9yUmF3Qml0bWFza1R5cGUoKQorICAgICAgICB0aGF0IGNhbiBiZSB1c2VkIHRvIHJl Z2lzdGVyIHN1bW1hcnkgYW5kIHN5bnRoZXRpYyBjaGlsZCBmb3JtYXR0ZXJzIGZvciBhIGJpdG1h c2sgdHlwZS4KKyAgICAgICAgRm9yIGV4YW1wbGUsIGNvbnNpZGVyIHRoZSBmb2xsb3dpbmcgZW51 bSBhbmQgYml0bWFzayB0eXBlZGVmczoKKworICAgICAgICB0eXBlZGVmIGVudW0geworICAgICAg ICAgICAgQSA9IDEgPDwgMCwKKyAgICAgICAgICAgIEIgPSAxIDw8IDEsCisgICAgICAgICAgICBD ID0gMSA8PCAyLAorICAgICAgICB9IFNwZWNpYWxGbGFnVmFsdWVzOworICAgICAgICB0eXBlZGVm IHVuc2lnbmVkIFNwZWNpYWxGbGFnczsKKworICAgICAgICBUbyB0ZWFjaCBsbGRiLXdlYmtpdCBo b3cgdG8gcHJldHR5IHByaW50IFNwZWNpYWxGbGFncyB0eXBlcywgYWRkIHRoZSBmb2xsb3dpbmcg Y29kZSBpbnNpZGUKKyAgICAgICAgX19sbGRiX2luaXRfbW9kdWxlKCk6CisKKyAgICAgICAgICAg IGFkZFN1bW1hcnlBbmRTeW50aGV0aWNGb3JtYXR0ZXJzRm9yUmF3Qml0bWFza1R5cGUoZGVidWdn ZXIsICJTcGVjaWFsRmxhZ3MiLCB7CisgICAgICAgICAgICAgICAgICAgIDEgPDwgMDogIkEiLAor ICAgICAgICAgICAgICAgICAgICAxIDw8IDE6ICJCIiwKKyAgICAgICAgICAgICAgICAgICAgMSA8 PCAyOiAiQyIsCisgICAgICAgICAgICB9KQorCisgICAgICAgICogbGxkYi9sbGRiX3dlYmtpdC5w eToKKyAgICAgICAgKGFkZFN1bW1hcnlBbmRTeW50aGV0aWNGb3JtYXR0ZXJzRm9yUmF3Qml0bWFz a1R5cGUpOgorICAgICAgICAoYWRkU3VtbWFyeUFuZFN5bnRoZXRpY0Zvcm1hdHRlcnNGb3JSYXdC aXRtYXNrVHlwZS5HZW5lcmF0ZWRSYXdCaXRtYXNrUHJvdmlkZXIpOgorICAgICAgICAoYWRkU3Vt bWFyeUFuZFN5bnRoZXRpY0Zvcm1hdHRlcnNGb3JSYXdCaXRtYXNrVHlwZS5yYXdfYml0bWFza19z dW1tYXJ5X3Byb3ZpZGVyKToKKyAgICAgICAgKGFkZFN1bW1hcnlBbmRTeW50aGV0aWNGb3JtYXR0 ZXJzRm9yUmF3Qml0bWFza1R5cGUubGxkYl93ZWJraXQpOgorICAgICAgICBBIGNvbnZlbmllbmNl IGZ1bmN0aW9uIHRvIGR5bmFtaWNhbGx5IGNyZWFzdGUgYSBzeW50aGV0aWMgZm9ybWF0dGVyIGNs YXNzIGFuZCBzdW1tYXJ5CisgICAgICAgIHN0cmluZyBmdW5jdGlvbiBmb3IgdGhlIHNwZWNpZmll ZCBiaXRtYXNrIHR5cGUgYW5kIGVudW1lcmF0b3IgdmFsdWUgdG8gbmFtZSBtYXAuIFRoaXMKKyAg ICAgICAgZnVuY3Rpb24gcmVnaXN0ZXIgdGhlIGR5bmFtaWNhbGx5IGNyZWF0ZWQgY2xhc3MgYW5k IGZ1bmN0aW9uIHdpdGggTExEQi4KKworICAgICAgICAoX19sbGRiX2luaXRfbW9kdWxlKToKKyAg ICAgICAgKEZsYWdFbnVtZXJhdGlvblByb3ZpZGVyKToKKyAgICAgICAgKEZsYWdFbnVtZXJhdGlv blByb3ZpZGVyLl9lbnVtZXJhdG9yX3ZhbHVlX3RvX25hbWVfbWFwKToKKyAgICAgICAgKEZsYWdF bnVtZXJhdGlvblByb3ZpZGVyLl9iaXRtYXNrKToKKyAgICAgICAgKEZsYWdFbnVtZXJhdGlvblBy b3ZpZGVyLl91cGRhdGUpOgorICAgICAgICAoRmxhZ0VudW1lcmF0aW9uUHJvdmlkZXIuaGFzX2No aWxkcmVuKToKKyAgICAgICAgKEZsYWdFbnVtZXJhdGlvblByb3ZpZGVyLm51bV9jaGlsZHJlbik6 CisgICAgICAgIChGbGFnRW51bWVyYXRpb25Qcm92aWRlci5nZXRfY2hpbGRfaW5kZXgpOgorICAg ICAgICAoRmxhZ0VudW1lcmF0aW9uUHJvdmlkZXIuZ2V0X2NoaWxkX2F0X2luZGV4KToKKyAgICAg ICAgKEZsYWdFbnVtZXJhdGlvblByb3ZpZGVyLnVwZGF0ZSk6CisgICAgICAgIEV4dHJhY3Qgb3V0 IHByb3ZpZGVyIGxvZ2ljIGZyb20gV1RGT3B0aW9uU2V0UHJvdmlkZXIgaW50byBhIGJhc2UgY2xh c3MgdGhhdCBjYW4gYmUgc2hhcmVkLgorCisgICAgICAgIChXVEZPcHRpb25TZXRQcm92aWRlcik6 CisgICAgICAgIChXVEZPcHRpb25TZXRQcm92aWRlci5fX2luaXRfXyk6CisgICAgICAgIChXVEZP cHRpb25TZXRQcm92aWRlci5fZW51bWVyYXRvcl92YWx1ZV90b19uYW1lX21hcCk6CisgICAgICAg IChXVEZPcHRpb25TZXRQcm92aWRlci5fYml0bWFzayk6CisgICAgICAgIChXVEZPcHRpb25TZXRQ cm92aWRlci5fdXBkYXRlKToKKyAgICAgICAgV3JpdGUgaW4gdGVybXMgb2YgdGhlIGJhc2UgY2xh c3MuCisKKyAgICAgICAgKFJhd0JpdG1hc2tQcm92aWRlckJhc2UpOgorICAgICAgICAoUmF3Qml0 bWFza1Byb3ZpZGVyQmFzZS5fZW51bWVyYXRvcl92YWx1ZV90b19uYW1lX21hcCk6CisgICAgICAg IChSYXdCaXRtYXNrUHJvdmlkZXJCYXNlLl9iaXRtYXNrKToKKyAgICAgICAgQWRkZWQuIEJhc2Ug c3ludGhldGljIGZvcm1hdHRlciBjbGFzcyBmb3IgYSByYXcgYml0bWFzayB0eXBlLiBEZXJpdmVk IGNsYXNzZXMgYXJlIGV4cGVjdGVkIHRvCisgICAgICAgIG92ZXJyaWRlIHRoZSBjbGFzcyB2YXJp YWJsZSBFTlVNRVJBVE9SX1ZBTFVFX1RPX05BTUVfTUFQIHdpdGggYSBkaWN0aW9uYXJ5IG9mIHRo ZSBmb3JtOgorICAgICAgICB7CisgICAgICAgICAgICAxIDw8IDA6ICJBIiwKKyAgICAgICAgICAg IDEgPDwgMTogIkIiLAorICAgICAgICAgICAgMSA8PCAyOiAiQyIsCisgICAgICAgIH0KKyAgICAg ICAgSXQgaXMgbm90IG5lY2Vzc2FyeSB0byBpbnN0YW50aWF0ZSBzdWNoIGEgZGVyaXZlZCBjbGFz cyBkaXJlY3RvcnkuIEluc3RlYWQgdXNlIHRoZSBjb252ZW5pZW5jZQorICAgICAgICBmdW5jdGlv biBhZGRTdW1tYXJ5QW5kU3ludGhldGljRm9ybWF0dGVyc0ZvclJhd0JpdG1hc2tUeXBlLgorCisg ICAgICAgIChXVEZPcHRpb25TZXRQcm92aWRlci5oYXNfY2hpbGRyZW4pOiBEZWxldGVkLgorICAg ICAgICAoV1RGT3B0aW9uU2V0UHJvdmlkZXIubnVtX2NoaWxkcmVuKTogRGVsZXRlZC4KKyAgICAg ICAgKFdURk9wdGlvblNldFByb3ZpZGVyLmdldF9jaGlsZF9pbmRleCk6IERlbGV0ZWQuCisgICAg ICAgIChXVEZPcHRpb25TZXRQcm92aWRlci5nZXRfY2hpbGRfYXRfaW5kZXgpOiBEZWxldGVkLgor ICAgICAgICAoV1RGT3B0aW9uU2V0UHJvdmlkZXIudXBkYXRlKTogRGVsZXRlZC4KKwogMjAxOC0x Mi0wNyAgQWFrYXNoIEphaW4gIDxhYWthc2hfamFpbkBhcHBsZS5jb20+CiAKICAgICAgICAgW2V3 cy1idWlsZF0gY2hlY2stcGF0Y2gtcmVsZXZhbmNlIGZhaWx1cmUgc2hvdWxkIG5vdCBtYXJrIHRo ZSBvdmVyYWxsIGJ1aWxkIGFzIGZhaWx1cmUKZGlmZiAtLWdpdCBhL1Rvb2xzL2xsZGIvbGxkYl93 ZWJraXQucHkgYi9Ub29scy9sbGRiL2xsZGJfd2Via2l0LnB5CmluZGV4IDJjNTU0NzczYWNjNDg2 YjlhZDk1MjAwM2I3NGQ5YTA1ZWJmZTNiYjguLjM2NzIyYTQyNmRmNjY5YzY0ZDYzZGI2YTQ1YWQ2 M2Y4YTc1NjkxZDggMTAwNjQ0Ci0tLSBhL1Rvb2xzL2xsZGIvbGxkYl93ZWJraXQucHkKKysrIGIv VG9vbHMvbGxkYi9sbGRiX3dlYmtpdC5weQpAQCAtMzMsNiArMzMsMjYgQEAgaW1wb3J0IGxsZGIK IGltcG9ydCBzdHJpbmcKIGltcG9ydCBzdHJ1Y3QKIAorCitkZWYgYWRkU3VtbWFyeUFuZFN5bnRo ZXRpY0Zvcm1hdHRlcnNGb3JSYXdCaXRtYXNrVHlwZShkZWJ1Z2dlciwgdHlwZV9uYW1lLCBlbnVt ZXJhdG9yX3ZhbHVlX3RvX25hbWVfbWFwKToKKyAgICBjbGFzcyBHZW5lcmF0ZWRSYXdCaXRtYXNr UHJvdmlkZXIoUmF3Qml0bWFza1Byb3ZpZGVyQmFzZSk6CisgICAgICAgIEVOVU1FUkFUT1JfVkFM VUVfVE9fTkFNRV9NQVAgPSBlbnVtZXJhdG9yX3ZhbHVlX3RvX25hbWVfbWFwLmNvcHkoKQorCisg ICAgZGVmIHJhd19iaXRtYXNrX3N1bW1hcnlfcHJvdmlkZXIodmFsb2JqLCBkaWN0KToKKyAgICAg ICAgcHJvdmlkZXIgPSBHZW5lcmF0ZWRSYXdCaXRtYXNrUHJvdmlkZXIodmFsb2JqLCBkaWN0KQor ICAgICAgICByZXR1cm4gInsgc2l6ZSA9ICVkIH0iICUgcHJvdmlkZXIuc2l6ZQorCisgICAgIyBB ZGQgdGhlIHByb3ZpZGVyIGNsYXNzIGFuZCBzdW1tYXJ5IGZ1bmN0aW9uIHRvIHRoZSBnbG9iYWwg c2NvcGUgc28gdGhhdCBMTERCCisgICAgIyBjYW4gZmluZCB0aGVtLgorICAgIHN5bnRoZXRpY19w cm92aWRlcl9jbGFzc19uYW1lID0gdHlwZV9uYW1lICsgJ1Byb3ZpZGVyJworICAgIHN1bW1hcnlf cHJvdmlkZXJfZnVuY3Rpb25fbmFtZSA9IHR5cGVfbmFtZSArICdfU3VtbWFyeVByb3ZpZGVyJwor ICAgIGdsb2JhbHMoKVtzeW50aGV0aWNfcHJvdmlkZXJfY2xhc3NfbmFtZV0gPSBHZW5lcmF0ZWRS YXdCaXRtYXNrUHJvdmlkZXIKKyAgICBnbG9iYWxzKClbc3VtbWFyeV9wcm92aWRlcl9mdW5jdGlv bl9uYW1lXSA9IHJhd19iaXRtYXNrX3N1bW1hcnlfcHJvdmlkZXIKKworICAgIGRlYnVnZ2VyLkhh bmRsZUNvbW1hbmQoJ3R5cGUgc3VtbWFyeSBhZGQgLS1leHBhbmQgLUYgbGxkYl93ZWJraXQuJXMg IiVzIicgJSAoc3VtbWFyeV9wcm92aWRlcl9mdW5jdGlvbl9uYW1lLCB0eXBlX25hbWUpKQorICAg IGRlYnVnZ2VyLkhhbmRsZUNvbW1hbmQoJ3R5cGUgc3ludGhldGljIGFkZCAlcyAtLXB5dGhvbi1j bGFzcyBsbGRiX3dlYmtpdC4lcycgJSAodHlwZV9uYW1lLCBzeW50aGV0aWNfcHJvdmlkZXJfY2xh c3NfbmFtZSkpCisKKwogZGVmIF9fbGxkYl9pbml0X21vZHVsZShkZWJ1Z2dlciwgZGljdCk6CiAg ICAgZGVidWdnZXIuSGFuZGxlQ29tbWFuZCgnY29tbWFuZCBzY3JpcHQgYWRkIC1mIGxsZGJfd2Vi a2l0LmJ0anMgYnRqcycpCiAgICAgZGVidWdnZXIuSGFuZGxlQ29tbWFuZCgndHlwZSBzdW1tYXJ5 IGFkZCAtLWV4cGFuZCAtRiBsbGRiX3dlYmtpdC5XVEZTdHJpbmdfU3VtbWFyeVByb3ZpZGVyIFdU Rjo6U3RyaW5nJykKQEAgLTcxLDYgKzkxLDE4IEBAIGRlZiBfX2xsZGJfaW5pdF9tb2R1bGUoZGVi dWdnZXIsIGRpY3QpOgogICAgIGRlYnVnZ2VyLkhhbmRsZUNvbW1hbmQoJ3R5cGUgc3ludGhldGlj IGFkZCAteCAiXldURjo6SGFzaFRhYmxlPC4rPiQiIC0tcHl0aG9uLWNsYXNzIGxsZGJfd2Via2l0 LldURkhhc2hUYWJsZVByb3ZpZGVyJykKICAgICBkZWJ1Z2dlci5IYW5kbGVDb21tYW5kKCd0eXBl IHN5bnRoZXRpYyBhZGQgLXggIl5XVEY6Ok9wdGlvblNldDwuKz4kIiAtLXB5dGhvbi1jbGFzcyBs bGRiX3dlYmtpdC5XVEZPcHRpb25TZXRQcm92aWRlcicpCiAKKyAgICBhZGRTdW1tYXJ5QW5kU3lu dGhldGljRm9ybWF0dGVyc0ZvclJhd0JpdG1hc2tUeXBlKGRlYnVnZ2VyLCAiV2ViRXZlbnRGbGFn cyIsIHsKKyAgICAgICAgMHgwMDAxMDAwMDogIldlYkV2ZW50RmxhZ01hc2tMZWZ0Q29tbWFuZEtl eSIsCisgICAgICAgIDB4MDAwMjAwMDA6ICJXZWJFdmVudEZsYWdNYXNrTGVmdFNoaWZ0S2V5IiwK KyAgICAgICAgMHgwMDA0MDAwMDogIldlYkV2ZW50RmxhZ01hc2tMZWZ0Q2Fwc0xvY2tLZXkiLAor ICAgICAgICAweDAwMDgwMDAwOiAiV2ViRXZlbnRGbGFnTWFza0xlZnRPcHRpb25LZXkiLAorICAg ICAgICAweDAwMTAwMDAwOiAiV2ViRXZlbnRGbGFnTWFza0xlZnRDb250cm9sS2V5IiwKKyAgICAg ICAgMHgwMDgwMDAwMDogIldlYkV2ZW50RmxhZ01hc2tSaWdodENvbnRyb2xLZXkiLAorICAgICAg ICAweDAwMjAwMDAwOiAiV2ViRXZlbnRGbGFnTWFza1JpZ2h0U2hpZnRLZXkiLAorICAgICAgICAw eDAwNDAwMDAwOiAiV2ViRXZlbnRGbGFnTWFza1JpZ2h0T3B0aW9uS2V5IiwKKyAgICAgICAgMHgw MTAwMDAwMDogIldlYkV2ZW50RmxhZ01hc2tSaWdodENvbW1hbmRLZXkiLAorICAgIH0pCisKIAog ZGVmIFdURlN0cmluZ19TdW1tYXJ5UHJvdmlkZXIodmFsb2JqLCBkaWN0KToKICAgICBwcm92aWRl ciA9IFdURlN0cmluZ1Byb3ZpZGVyKHZhbG9iaiwgZGljdCkKQEAgLTY5NywyMSArNzI5LDMxIEBA IGNsYXNzIFdlYkNvcmVEb2N1bWVudFByb3ZpZGVyOgogICAgICAgICByZXR1cm4gV2ViQ29yZUZy YW1lUHJvdmlkZXIoZnJhbWVfcHRyLCBkaWN0KCkpCiAKIAotY2xhc3MgV1RGT3B0aW9uU2V0UHJv dmlkZXI6CitjbGFzcyBGbGFnRW51bWVyYXRpb25Qcm92aWRlcihvYmplY3QpOgogICAgIGRlZiBf X2luaXRfXyhzZWxmLCB2YWxvYmosIGludGVybmFsX2RpY3QpOgogICAgICAgICBzZWxmLnZhbG9i aiA9IHZhbG9iagogICAgICAgICBzZWxmLnVwZGF0ZSgpCiAKKyAgICAjIFN1YmNsYXNzZXMgbXVz dCBvdmVycmlkZSB0aGlzIHRvIHJldHVybiBhIGRpY3Rpb25hcnkgdGhhdCBtYXBzIGVtdW1lcmF0 b3IgdmFsdWVzIHRvIG5hbWVzLgorICAgIGRlZiBfZW51bWVyYXRvcl92YWx1ZV90b19uYW1lX21h cChzZWxmKToKKyAgICAgICAgcGFzcworCisgICAgIyBTdWJjbGFzc2VzIG11c3Qgb3ZlcnJpZGUg dGhpcyB0byByZXR1cm4gdGhlIGJpdG1hc2suCisgICAgZGVmIF9iaXRtYXNrKHNlbGYpOgorICAg ICAgICBwYXNzCisKKyAgICAjIFN1YmNsYXNzZXMgY2FuIG92ZXJyaWRlIHRoaXMgdG8gcGVyZm9y bSBhbnkgY29tcHV0YXRpb25zIHdoZW4gTExEQiBuZWVkcyB0byByZWZyZXNoCisgICAgIyB0aGlz IHByb3ZpZGVyLgorICAgIGRlZiBfdXBkYXRlKHNlbGYpOgorICAgICAgICBwYXNzCisKICAgICBk ZWYgaGFzX2NoaWxkcmVuKHNlbGYpOgogICAgICAgICByZXR1cm4gYm9vbChzZWxmLl9lbGVtZW50 cykKIAotICAgICMgIE1ldGFkYXRhIGlzIHN0b3JlZCBhdCBpbmRpY2VzIGdyZWF0ZXIgdGhhbiBv ciBlcXVhbCB0byB0aGUgbnVtYmVyIG9mIGVsZW1lbnRzIGluIHRoZSBzZXQuCiAgICAgZGVmIG51 bV9jaGlsZHJlbihzZWxmKToKLSAgICAgICAgcmV0dXJuIGxlbihzZWxmLl9lbGVtZW50cykgKyAx CisgICAgICAgIHJldHVybiBsZW4oc2VsZi5fZWxlbWVudHMpCiAKICAgICBkZWYgZ2V0X2NoaWxk X2luZGV4KHNlbGYsIG5hbWUpOgotICAgICAgICBpZiBuYW1lID09ICdtX3N0b3JhZ2UnOgotICAg ICAgICAgICAgcmV0dXJuIHNlbGYubnVtX2NoaWxkcmVuKCkKICAgICAgICAgdHJ5OgogICAgICAg ICAgICAgcmV0dXJuIGludChuYW1lLmxzdHJpcCgnWycpLnJzdHJpcCgnXScpKQogICAgICAgICBl eGNlcHQ6CkBAIC03MjAsMjkgKzc2MiwyMyBAQCBjbGFzcyBXVEZPcHRpb25TZXRQcm92aWRlcjoK ICAgICBkZWYgZ2V0X2NoaWxkX2F0X2luZGV4KHNlbGYsIGluZGV4KToKICAgICAgICAgaWYgaW5k ZXggPCAwIG9yIG5vdCBzZWxmLnZhbG9iai5Jc1ZhbGlkKCk6CiAgICAgICAgICAgICByZXR1cm4g Tm9uZQotICAgICAgICBpZiBpbmRleCA9PSBzZWxmLm51bV9jaGlsZHJlbigpOgotICAgICAgICAg ICAgcmV0dXJuIHNlbGYuc3RvcmFnZQogICAgICAgICBpZiBpbmRleCA8IGxlbihzZWxmLl9lbGVt ZW50cyk6CiAgICAgICAgICAgICAobmFtZSwgdmFsdWUpID0gc2VsZi5fZWxlbWVudHNbaW5kZXhd CiAgICAgICAgICAgICByZXR1cm4gc2VsZi52YWxvYmouQ3JlYXRlVmFsdWVGcm9tRXhwcmVzc2lv bihuYW1lLCBzdHIodmFsdWUpKQogICAgICAgICByZXR1cm4gTm9uZQogCiAgICAgZGVmIHVwZGF0 ZShzZWxmKToKLSAgICAgICAgc2VsZi5zdG9yYWdlID0gc2VsZi52YWxvYmouR2V0Q2hpbGRNZW1i ZXJXaXRoTmFtZSgnbV9zdG9yYWdlJykgICMgTWF5IGJlIGFuIGludmFsaWQgdmFsdWUuCisgICAg ICAgIHNlbGYuX3VwZGF0ZSgpCisKICAgICAgICAgc2VsZi5fZWxlbWVudHMgPSBbXQogICAgICAg ICBzZWxmLnNpemUgPSAwCiAKLSAgICAgICAgdGVtcGxhdGVfYXJndW1lbnRfc2JUeXBlID0gc2Vs Zi52YWxvYmouR2V0VHlwZSgpLkdldFRlbXBsYXRlQXJndW1lbnRUeXBlKDApCi0gICAgICAgIGVu dW1lcmF0b3JfdmFsdWVfdG9fbmFtZV9tYXAgPSB7fQotICAgICAgICBmb3Igc2JUeXBlRW51bU1l bWJlciBpbiB0ZW1wbGF0ZV9hcmd1bWVudF9zYlR5cGUuZ2V0X2VudW1fbWVtYmVyc19hcnJheSgp OgotICAgICAgICAgICAgZW51bWVyYXRvcl92YWx1ZSA9IHNiVHlwZUVudW1NZW1iZXIuR2V0VmFs dWVBc1Vuc2lnbmVkKCkKLSAgICAgICAgICAgIGlmIGVudW1lcmF0b3JfdmFsdWUgbm90IGluIGVu dW1lcmF0b3JfdmFsdWVfdG9fbmFtZV9tYXA6Ci0gICAgICAgICAgICAgICAgZW51bWVyYXRvcl92 YWx1ZV90b19uYW1lX21hcFtlbnVtZXJhdG9yX3ZhbHVlXSA9IHNiVHlwZUVudW1NZW1iZXIuR2V0 TmFtZSgpCisgICAgICAgIGVudW1lcmF0b3JfdmFsdWVfdG9fbmFtZV9tYXAgPSBzZWxmLl9lbnVt ZXJhdG9yX3ZhbHVlX3RvX25hbWVfbWFwKCkKICAgICAgICAgaWYgbm90IGVudW1lcmF0b3JfdmFs dWVfdG9fbmFtZV9tYXA6CiAgICAgICAgICAgICByZXR1cm4KIAogICAgICAgICBiaXRtYXNrX3dp dGhfYWxsX29wdGlvbnNfc2V0ID0gc3VtKGVudW1lcmF0b3JfdmFsdWVfdG9fbmFtZV9tYXApCi0g ICAgICAgIGJpdG1hc2sgPSBzZWxmLnN0b3JhZ2UuR2V0VmFsdWVBc1Vuc2lnbmVkKDApCisgICAg ICAgIGJpdG1hc2sgPSBzZWxmLl9iaXRtYXNrKCkKICAgICAgICAgaWYgYml0bWFzayA+IGJpdG1h c2tfd2l0aF9hbGxfb3B0aW9uc19zZXQ6CiAgICAgICAgICAgICByZXR1cm4gICMgU2luY2UgdGhp cyBpcyBhbiBpbnZhbGlkIHZhbHVlLCByZXR1cm4gc28gdGhlIHJhdyBoZXggZm9ybSBpcyB3cml0 dGVuIG91dC4KIApAQCAtNzU3LDYgKzc5MywzNyBAQCBjbGFzcyBXVEZPcHRpb25TZXRQcm92aWRl cjoKICAgICAgICAgc2VsZi5zaXplID0gbGVuKGVsZW1lbnRzKQogCiAKK2NsYXNzIFdURk9wdGlv blNldFByb3ZpZGVyKEZsYWdFbnVtZXJhdGlvblByb3ZpZGVyKToKKyAgICBkZWYgX19pbml0X18o c2VsZiwgdmFsb2JqLCBpbnRlcm5hbF9kaWN0KToKKyAgICAgICAgc2VsZi5zdG9yYWdlID0gTm9u ZQorICAgICAgICBzdXBlcihXVEZPcHRpb25TZXRQcm92aWRlciwgc2VsZikuX19pbml0X18odmFs b2JqLCBpbnRlcm5hbF9kaWN0KQorCisgICAgZGVmIF9lbnVtZXJhdG9yX3ZhbHVlX3RvX25hbWVf bWFwKHNlbGYpOgorICAgICAgICB0ZW1wbGF0ZV9hcmd1bWVudF9zYlR5cGUgPSBzZWxmLnZhbG9i ai5HZXRUeXBlKCkuR2V0VGVtcGxhdGVBcmd1bWVudFR5cGUoMCkKKyAgICAgICAgZW51bWVyYXRv cl92YWx1ZV90b19uYW1lX21hcCA9IHt9CisgICAgICAgIGZvciBzYlR5cGVFbnVtTWVtYmVyIGlu IHRlbXBsYXRlX2FyZ3VtZW50X3NiVHlwZS5nZXRfZW51bV9tZW1iZXJzX2FycmF5KCk6CisgICAg ICAgICAgICBlbnVtZXJhdG9yX3ZhbHVlID0gc2JUeXBlRW51bU1lbWJlci5HZXRWYWx1ZUFzVW5z aWduZWQoKQorICAgICAgICAgICAgaWYgZW51bWVyYXRvcl92YWx1ZSBub3QgaW4gZW51bWVyYXRv cl92YWx1ZV90b19uYW1lX21hcDoKKyAgICAgICAgICAgICAgICBlbnVtZXJhdG9yX3ZhbHVlX3Rv X25hbWVfbWFwW2VudW1lcmF0b3JfdmFsdWVdID0gc2JUeXBlRW51bU1lbWJlci5HZXROYW1lKCkK KyAgICAgICAgcmV0dXJuIGVudW1lcmF0b3JfdmFsdWVfdG9fbmFtZV9tYXAKKworICAgIGRlZiBf Yml0bWFzayhzZWxmKToKKyAgICAgICAgcmV0dXJuIHNlbGYuc3RvcmFnZS5HZXRWYWx1ZUFzVW5z aWduZWQoMCkKKworICAgIGRlZiBfdXBkYXRlKHNlbGYpOgorICAgICAgICBzZWxmLnN0b3JhZ2Ug PSBzZWxmLnZhbG9iai5HZXRDaGlsZE1lbWJlcldpdGhOYW1lKCdtX3N0b3JhZ2UnKSAgIyBNYXkg YmUgYW4gaW52YWxpZCB2YWx1ZS4KKworCitjbGFzcyBSYXdCaXRtYXNrUHJvdmlkZXJCYXNlKEZs YWdFbnVtZXJhdGlvblByb3ZpZGVyKToKKyAgICBFTlVNRVJBVE9SX1ZBTFVFX1RPX05BTUVfTUFQ ID0ge30KKworICAgIGRlZiBfZW51bWVyYXRvcl92YWx1ZV90b19uYW1lX21hcChzZWxmKToKKyAg ICAgICAgcmV0dXJuIHNlbGYuRU5VTUVSQVRPUl9WQUxVRV9UT19OQU1FX01BUAorCisgICAgZGVm IF9iaXRtYXNrKHNlbGYpOgorICAgICAgICByZXR1cm4gc2VsZi52YWxvYmouR2V0VmFsdWVBc1Vu c2lnbmVkKDApCisKKwogY2xhc3MgV1RGVmVjdG9yUHJvdmlkZXI6CiAgICAgZGVmIF9faW5pdF9f KHNlbGYsIHZhbG9iaiwgaW50ZXJuYWxfZGljdCk6CiAgICAgICAgIHNlbGYudmFsb2JqID0gdmFs b2JqCg== 358341 2019-01-04 11:21:20 -0800 2019-01-04 11:21:20 -0800 To Land bug-193024-20190104112119.patch text/plain 9641 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5NjI0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYmZkYzVmMDBkNGE2YmFiYzc2Y2I4MGU1MDg5NGRmMGFh MmQ0NDY5MS4uMjU2MTNiNzMwZWVmYmRjYTE3NGZiZjRlNTgyYzcwYWI5ZDQ5M2EyYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDc5 IEBACisyMDE5LTAxLTA0ICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAg ICAgICBbbGxkYi13ZWJraXRdOiBBZGQgc3VwcG9ydCBmb3IgcHJldHR5LXByaW50aW5nIHJhdyBi aXRtYXNrIHR5cGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xOTMwMjQKKworICAgICAgICBSZXZpZXdlZCBieSBKZXIgTm9ibGUuCisKKyAgICAgICAg QWRkIHN1cHBvcnQgaW5mcmFzdHJ1Y3R1cmUgdG8gcHJldHR5LXByaW50IGEgcmF3IGJpdG1hc2sg dHlwZS4gSW5jbHVkZWQgaXMgYSBwcmV0dHktcHJpbnRlcgorICAgICAgICBmb3IgdGhlIGJpdG1h c2sgdHlwZSBXZWJFdmVudEZsYWdzIGFzIGFuIGV4YW1wbGUuCisKKyAgICAgICAgRXhwb3NlZCBh IG5ldyBmdW5jdGlvbiBsbGRiX3dlYmtpdC5hZGRTdW1tYXJ5QW5kU3ludGhldGljRm9ybWF0dGVy c0ZvclJhd0JpdG1hc2tUeXBlKCkKKyAgICAgICAgdGhhdCBjYW4gYmUgdXNlZCB0byByZWdpc3Rl ciBzdW1tYXJ5IGFuZCBzeW50aGV0aWMgY2hpbGQgZm9ybWF0dGVycyBmb3IgYSBiaXRtYXNrIHR5 cGUuCisgICAgICAgIEZvciBleGFtcGxlLCBjb25zaWRlciB0aGUgZm9sbG93aW5nIGVudW0gYW5k IGJpdG1hc2sgdHlwZWRlZnM6CisKKyAgICAgICAgdHlwZWRlZiBlbnVtIHsKKyAgICAgICAgICAg IEEgPSAxIDw8IDAsCisgICAgICAgICAgICBCID0gMSA8PCAxLAorICAgICAgICAgICAgQyA9IDEg PDwgMiwKKyAgICAgICAgfSBTcGVjaWFsRmxhZ1ZhbHVlczsKKyAgICAgICAgdHlwZWRlZiB1bnNp Z25lZCBTcGVjaWFsRmxhZ3M7CisKKyAgICAgICAgVG8gdGVhY2ggbGxkYi13ZWJraXQgaG93IHRv IHByZXR0eSBwcmludCBTcGVjaWFsRmxhZ3MgdHlwZXMsIGFkZCB0aGUgZm9sbG93aW5nIGNvZGUg aW5zaWRlCisgICAgICAgIF9fbGxkYl9pbml0X21vZHVsZSgpOgorCisgICAgICAgICAgICBhZGRT dW1tYXJ5QW5kU3ludGhldGljRm9ybWF0dGVyc0ZvclJhd0JpdG1hc2tUeXBlKGRlYnVnZ2VyLCAi U3BlY2lhbEZsYWdzIiwgeworICAgICAgICAgICAgICAgICAgICAxIDw8IDA6ICJBIiwKKyAgICAg ICAgICAgICAgICAgICAgMSA8PCAxOiAiQiIsCisgICAgICAgICAgICAgICAgICAgIDEgPDwgMjog IkMiLAorICAgICAgICAgICAgfSkKKworICAgICAgICAqIGxsZGIvbGxkYl93ZWJraXQucHk6Cisg ICAgICAgIChhZGRTdW1tYXJ5QW5kU3ludGhldGljRm9ybWF0dGVyc0ZvclJhd0JpdG1hc2tUeXBl KToKKyAgICAgICAgKGFkZFN1bW1hcnlBbmRTeW50aGV0aWNGb3JtYXR0ZXJzRm9yUmF3Qml0bWFz a1R5cGUuR2VuZXJhdGVkUmF3Qml0bWFza1Byb3ZpZGVyKToKKyAgICAgICAgKGFkZFN1bW1hcnlB bmRTeW50aGV0aWNGb3JtYXR0ZXJzRm9yUmF3Qml0bWFza1R5cGUucmF3X2JpdG1hc2tfc3VtbWFy eV9wcm92aWRlcik6CisgICAgICAgIChhZGRTdW1tYXJ5QW5kU3ludGhldGljRm9ybWF0dGVyc0Zv clJhd0JpdG1hc2tUeXBlLmxsZGJfd2Via2l0KToKKyAgICAgICAgQSBjb252ZW5pZW5jZSBmdW5j dGlvbiB0byBkeW5hbWljYWxseSBjcmVhc3RlIGEgc3ludGhldGljIGZvcm1hdHRlciBjbGFzcyBh bmQgc3VtbWFyeQorICAgICAgICBzdHJpbmcgZnVuY3Rpb24gZm9yIHRoZSBzcGVjaWZpZWQgYml0 bWFzayB0eXBlIGFuZCBlbnVtZXJhdG9yIHZhbHVlIHRvIG5hbWUgbWFwLiBUaGlzCisgICAgICAg IGZ1bmN0aW9uIHJlZ2lzdGVyIHRoZSBkeW5hbWljYWxseSBjcmVhdGVkIGNsYXNzIGFuZCBmdW5j dGlvbiB3aXRoIExMREIuCisKKyAgICAgICAgKF9fbGxkYl9pbml0X21vZHVsZSk6CisgICAgICAg IChGbGFnRW51bWVyYXRpb25Qcm92aWRlcik6CisgICAgICAgIChGbGFnRW51bWVyYXRpb25Qcm92 aWRlci5fZW51bWVyYXRvcl92YWx1ZV90b19uYW1lX21hcCk6CisgICAgICAgIChGbGFnRW51bWVy YXRpb25Qcm92aWRlci5fYml0bWFzayk6CisgICAgICAgIChGbGFnRW51bWVyYXRpb25Qcm92aWRl ci5fdXBkYXRlKToKKyAgICAgICAgKEZsYWdFbnVtZXJhdGlvblByb3ZpZGVyLmhhc19jaGlsZHJl bik6CisgICAgICAgIChGbGFnRW51bWVyYXRpb25Qcm92aWRlci5udW1fY2hpbGRyZW4pOgorICAg ICAgICAoRmxhZ0VudW1lcmF0aW9uUHJvdmlkZXIuZ2V0X2NoaWxkX2luZGV4KToKKyAgICAgICAg KEZsYWdFbnVtZXJhdGlvblByb3ZpZGVyLmdldF9jaGlsZF9hdF9pbmRleCk6CisgICAgICAgIChG bGFnRW51bWVyYXRpb25Qcm92aWRlci51cGRhdGUpOgorICAgICAgICBFeHRyYWN0IG91dCBwcm92 aWRlciBsb2dpYyBmcm9tIFdURk9wdGlvblNldFByb3ZpZGVyIGludG8gYSBiYXNlIGNsYXNzIHRo YXQgY2FuIGJlIHNoYXJlZC4KKworICAgICAgICAoV1RGT3B0aW9uU2V0UHJvdmlkZXIpOgorICAg ICAgICAoV1RGT3B0aW9uU2V0UHJvdmlkZXIuX2VudW1lcmF0b3JfdmFsdWVfdG9fbmFtZV9tYXAp OgorICAgICAgICAoV1RGT3B0aW9uU2V0UHJvdmlkZXIuX2JpdG1hc2spOgorICAgICAgICAoV1RG T3B0aW9uU2V0UHJvdmlkZXIuX3VwZGF0ZSk6CisgICAgICAgIFdyaXRlIGluIHRlcm1zIG9mIHRo ZSBiYXNlIGNsYXNzLgorCisgICAgICAgIChSYXdCaXRtYXNrUHJvdmlkZXJCYXNlKToKKyAgICAg ICAgKFJhd0JpdG1hc2tQcm92aWRlckJhc2UuX2VudW1lcmF0b3JfdmFsdWVfdG9fbmFtZV9tYXAp OgorICAgICAgICAoUmF3Qml0bWFza1Byb3ZpZGVyQmFzZS5fYml0bWFzayk6CisgICAgICAgIEFk ZGVkLiBCYXNlIHN5bnRoZXRpYyBmb3JtYXR0ZXIgY2xhc3MgZm9yIGEgcmF3IGJpdG1hc2sgdHlw ZS4gRGVyaXZlZCBjbGFzc2VzIGFyZSBleHBlY3RlZCB0bworICAgICAgICBvdmVycmlkZSB0aGUg Y2xhc3MgdmFyaWFibGUgRU5VTUVSQVRPUl9WQUxVRV9UT19OQU1FX01BUCB3aXRoIGEgZGljdGlv bmFyeSBvZiB0aGUgZm9ybToKKyAgICAgICAgeworICAgICAgICAgICAgMSA8PCAwOiAiQSIsCisg ICAgICAgICAgICAxIDw8IDE6ICJCIiwKKyAgICAgICAgICAgIDEgPDwgMjogIkMiLAorICAgICAg ICB9CisgICAgICAgIEl0IGlzIG5vdCBuZWNlc3NhcnkgdG8gaW5zdGFudGlhdGUgc3VjaCBhIGRl cml2ZWQgY2xhc3MgZGlyZWN0b3J5LiBJbnN0ZWFkIHVzZSB0aGUgY29udmVuaWVuY2UKKyAgICAg ICAgZnVuY3Rpb24gYWRkU3VtbWFyeUFuZFN5bnRoZXRpY0Zvcm1hdHRlcnNGb3JSYXdCaXRtYXNr VHlwZS4KKworICAgICAgICAoV1RGT3B0aW9uU2V0UHJvdmlkZXIuaGFzX2NoaWxkcmVuKTogRGVs ZXRlZC4KKyAgICAgICAgKFdURk9wdGlvblNldFByb3ZpZGVyLm51bV9jaGlsZHJlbik6IERlbGV0 ZWQuCisgICAgICAgIChXVEZPcHRpb25TZXRQcm92aWRlci5nZXRfY2hpbGRfaW5kZXgpOiBEZWxl dGVkLgorICAgICAgICAoV1RGT3B0aW9uU2V0UHJvdmlkZXIuZ2V0X2NoaWxkX2F0X2luZGV4KTog RGVsZXRlZC4KKyAgICAgICAgKFdURk9wdGlvblNldFByb3ZpZGVyLnVwZGF0ZSk6IERlbGV0ZWQu CisKIDIwMTktMDEtMDQgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAg ICBbUFNPTl0gQ2FsbGluZyBoaXN0b3J5LmJhY2soKSBmcm9tIGluc2lkZSB0aGUgbG9hZCBldmVu dCBoYW5kbGVyIHByZXZlbnRzIHByb2Nlc3Mtc3dhcHBpbmcKZGlmZiAtLWdpdCBhL1Rvb2xzL2xs ZGIvbGxkYl93ZWJraXQucHkgYi9Ub29scy9sbGRiL2xsZGJfd2Via2l0LnB5CmluZGV4IDQ3ZTUx ZjZhOWE3ZDNkMjk5ZmZhOWFhZDZhY2I3NGQyNmQwYjlkMjQuLjA3N2EwOTQyNWM1NDFiMjJhMWM2 MWUzNzNiZDI0N2Q3YzE4Yjg5ZjcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL2xsZGIvbGxkYl93ZWJraXQu cHkKKysrIGIvVG9vbHMvbGxkYi9sbGRiX3dlYmtpdC5weQpAQCAtMzMsNiArMzMsMjYgQEAgaW1w b3J0IGxsZGIKIGltcG9ydCBzdHJpbmcKIGltcG9ydCBzdHJ1Y3QKIAorCitkZWYgYWRkU3VtbWFy eUFuZFN5bnRoZXRpY0Zvcm1hdHRlcnNGb3JSYXdCaXRtYXNrVHlwZShkZWJ1Z2dlciwgdHlwZV9u YW1lLCBlbnVtZXJhdG9yX3ZhbHVlX3RvX25hbWVfbWFwKToKKyAgICBjbGFzcyBHZW5lcmF0ZWRS YXdCaXRtYXNrUHJvdmlkZXIoUmF3Qml0bWFza1Byb3ZpZGVyQmFzZSk6CisgICAgICAgIEVOVU1F UkFUT1JfVkFMVUVfVE9fTkFNRV9NQVAgPSBlbnVtZXJhdG9yX3ZhbHVlX3RvX25hbWVfbWFwLmNv cHkoKQorCisgICAgZGVmIHJhd19iaXRtYXNrX3N1bW1hcnlfcHJvdmlkZXIodmFsb2JqLCBkaWN0 KToKKyAgICAgICAgcHJvdmlkZXIgPSBHZW5lcmF0ZWRSYXdCaXRtYXNrUHJvdmlkZXIodmFsb2Jq LCBkaWN0KQorICAgICAgICByZXR1cm4gInsgc2l6ZSA9ICVkIH0iICUgcHJvdmlkZXIuc2l6ZQor CisgICAgIyBBZGQgdGhlIHByb3ZpZGVyIGNsYXNzIGFuZCBzdW1tYXJ5IGZ1bmN0aW9uIHRvIHRo ZSBnbG9iYWwgc2NvcGUgc28gdGhhdCBMTERCCisgICAgIyBjYW4gZmluZCB0aGVtLgorICAgIHN5 bnRoZXRpY19wcm92aWRlcl9jbGFzc19uYW1lID0gdHlwZV9uYW1lICsgJ1Byb3ZpZGVyJworICAg IHN1bW1hcnlfcHJvdmlkZXJfZnVuY3Rpb25fbmFtZSA9IHR5cGVfbmFtZSArICdfU3VtbWFyeVBy b3ZpZGVyJworICAgIGdsb2JhbHMoKVtzeW50aGV0aWNfcHJvdmlkZXJfY2xhc3NfbmFtZV0gPSBH ZW5lcmF0ZWRSYXdCaXRtYXNrUHJvdmlkZXIKKyAgICBnbG9iYWxzKClbc3VtbWFyeV9wcm92aWRl cl9mdW5jdGlvbl9uYW1lXSA9IHJhd19iaXRtYXNrX3N1bW1hcnlfcHJvdmlkZXIKKworICAgIGRl YnVnZ2VyLkhhbmRsZUNvbW1hbmQoJ3R5cGUgc3VtbWFyeSBhZGQgLS1leHBhbmQgLUYgbGxkYl93 ZWJraXQuJXMgIiVzIicgJSAoc3VtbWFyeV9wcm92aWRlcl9mdW5jdGlvbl9uYW1lLCB0eXBlX25h bWUpKQorICAgIGRlYnVnZ2VyLkhhbmRsZUNvbW1hbmQoJ3R5cGUgc3ludGhldGljIGFkZCAlcyAt LXB5dGhvbi1jbGFzcyBsbGRiX3dlYmtpdC4lcycgJSAodHlwZV9uYW1lLCBzeW50aGV0aWNfcHJv dmlkZXJfY2xhc3NfbmFtZSkpCisKKwogZGVmIF9fbGxkYl9pbml0X21vZHVsZShkZWJ1Z2dlciwg ZGljdCk6CiAgICAgZGVidWdnZXIuSGFuZGxlQ29tbWFuZCgnY29tbWFuZCBzY3JpcHQgYWRkIC1m IGxsZGJfd2Via2l0LmJ0anMgYnRqcycpCiAgICAgZGVidWdnZXIuSGFuZGxlQ29tbWFuZCgndHlw ZSBzdW1tYXJ5IGFkZCAtLWV4cGFuZCAtRiBsbGRiX3dlYmtpdC5XVEZTdHJpbmdfU3VtbWFyeVBy b3ZpZGVyIFdURjo6U3RyaW5nJykKQEAgLTcxLDYgKzkxLDE4IEBAIGRlZiBfX2xsZGJfaW5pdF9t b2R1bGUoZGVidWdnZXIsIGRpY3QpOgogICAgIGRlYnVnZ2VyLkhhbmRsZUNvbW1hbmQoJ3R5cGUg c3ludGhldGljIGFkZCAteCAiXldURjo6SGFzaFRhYmxlPC4rPiQiIC0tcHl0aG9uLWNsYXNzIGxs ZGJfd2Via2l0LldURkhhc2hUYWJsZVByb3ZpZGVyJykKICAgICBkZWJ1Z2dlci5IYW5kbGVDb21t YW5kKCd0eXBlIHN5bnRoZXRpYyBhZGQgLXggIl5XVEY6Ok9wdGlvblNldDwuKz4kIiAtLXB5dGhv bi1jbGFzcyBsbGRiX3dlYmtpdC5XVEZPcHRpb25TZXRQcm92aWRlcicpCiAKKyAgICBhZGRTdW1t YXJ5QW5kU3ludGhldGljRm9ybWF0dGVyc0ZvclJhd0JpdG1hc2tUeXBlKGRlYnVnZ2VyLCAiV2Vi RXZlbnRGbGFncyIsIHsKKyAgICAgICAgMHgwMDAxMDAwMDogIldlYkV2ZW50RmxhZ01hc2tMZWZ0 Q29tbWFuZEtleSIsCisgICAgICAgIDB4MDAwMjAwMDA6ICJXZWJFdmVudEZsYWdNYXNrTGVmdFNo aWZ0S2V5IiwKKyAgICAgICAgMHgwMDA0MDAwMDogIldlYkV2ZW50RmxhZ01hc2tMZWZ0Q2Fwc0xv Y2tLZXkiLAorICAgICAgICAweDAwMDgwMDAwOiAiV2ViRXZlbnRGbGFnTWFza0xlZnRPcHRpb25L ZXkiLAorICAgICAgICAweDAwMTAwMDAwOiAiV2ViRXZlbnRGbGFnTWFza0xlZnRDb250cm9sS2V5 IiwKKyAgICAgICAgMHgwMDgwMDAwMDogIldlYkV2ZW50RmxhZ01hc2tSaWdodENvbnRyb2xLZXki LAorICAgICAgICAweDAwMjAwMDAwOiAiV2ViRXZlbnRGbGFnTWFza1JpZ2h0U2hpZnRLZXkiLAor ICAgICAgICAweDAwNDAwMDAwOiAiV2ViRXZlbnRGbGFnTWFza1JpZ2h0T3B0aW9uS2V5IiwKKyAg ICAgICAgMHgwMTAwMDAwMDogIldlYkV2ZW50RmxhZ01hc2tSaWdodENvbW1hbmRLZXkiLAorICAg IH0pCisKIAogZGVmIFdURlN0cmluZ19TdW1tYXJ5UHJvdmlkZXIodmFsb2JqLCBkaWN0KToKICAg ICBwcm92aWRlciA9IFdURlN0cmluZ1Byb3ZpZGVyKHZhbG9iaiwgZGljdCkKQEAgLTY5NywxMSAr NzI5LDI0IEBAIGNsYXNzIFdlYkNvcmVEb2N1bWVudFByb3ZpZGVyOgogICAgICAgICByZXR1cm4g V2ViQ29yZUZyYW1lUHJvdmlkZXIoZnJhbWVfcHRyLCBkaWN0KCkpCiAKIAotY2xhc3MgV1RGT3B0 aW9uU2V0UHJvdmlkZXI6CitjbGFzcyBGbGFnRW51bWVyYXRpb25Qcm92aWRlcihvYmplY3QpOgog ICAgIGRlZiBfX2luaXRfXyhzZWxmLCB2YWxvYmosIGludGVybmFsX2RpY3QpOgogICAgICAgICBz ZWxmLnZhbG9iaiA9IHZhbG9iagogICAgICAgICBzZWxmLnVwZGF0ZSgpCiAKKyAgICAjIFN1YmNs YXNzZXMgbXVzdCBvdmVycmlkZSB0aGlzIHRvIHJldHVybiBhIGRpY3Rpb25hcnkgdGhhdCBtYXBz IGVtdW1lcmF0b3IgdmFsdWVzIHRvIG5hbWVzLgorICAgIGRlZiBfZW51bWVyYXRvcl92YWx1ZV90 b19uYW1lX21hcChzZWxmKToKKyAgICAgICAgcGFzcworCisgICAgIyBTdWJjbGFzc2VzIG11c3Qg b3ZlcnJpZGUgdGhpcyB0byByZXR1cm4gdGhlIGJpdG1hc2suCisgICAgZGVmIF9iaXRtYXNrKHNl bGYpOgorICAgICAgICBwYXNzCisKKyAgICAjIFN1YmNsYXNzZXMgY2FuIG92ZXJyaWRlIHRoaXMg dG8gcGVyZm9ybSBhbnkgY29tcHV0YXRpb25zIHdoZW4gTExEQiBuZWVkcyB0byByZWZyZXNoCisg ICAgIyB0aGlzIHByb3ZpZGVyLgorICAgIGRlZiBfdXBkYXRlKHNlbGYpOgorICAgICAgICBwYXNz CisKICAgICBkZWYgaGFzX2NoaWxkcmVuKHNlbGYpOgogICAgICAgICByZXR1cm4gYm9vbChzZWxm Ll9lbGVtZW50cykKIApAQCAtNzIzLDIxICs3NjgsMTcgQEAgY2xhc3MgV1RGT3B0aW9uU2V0UHJv dmlkZXI6CiAgICAgICAgIHJldHVybiBOb25lCiAKICAgICBkZWYgdXBkYXRlKHNlbGYpOgotICAg ICAgICBzZWxmLnN0b3JhZ2UgPSBzZWxmLnZhbG9iai5HZXRDaGlsZE1lbWJlcldpdGhOYW1lKCdt X3N0b3JhZ2UnKSAgIyBNYXkgYmUgYW4gaW52YWxpZCB2YWx1ZS4KKyAgICAgICAgc2VsZi5fdXBk YXRlKCkKKwogICAgICAgICBzZWxmLl9lbGVtZW50cyA9IFtdCiAgICAgICAgIHNlbGYuc2l6ZSA9 IDAKIAotICAgICAgICB0ZW1wbGF0ZV9hcmd1bWVudF9zYlR5cGUgPSBzZWxmLnZhbG9iai5HZXRU eXBlKCkuR2V0VGVtcGxhdGVBcmd1bWVudFR5cGUoMCkKLSAgICAgICAgZW51bWVyYXRvcl92YWx1 ZV90b19uYW1lX21hcCA9IHt9Ci0gICAgICAgIGZvciBzYlR5cGVFbnVtTWVtYmVyIGluIHRlbXBs YXRlX2FyZ3VtZW50X3NiVHlwZS5nZXRfZW51bV9tZW1iZXJzX2FycmF5KCk6Ci0gICAgICAgICAg ICBlbnVtZXJhdG9yX3ZhbHVlID0gc2JUeXBlRW51bU1lbWJlci5HZXRWYWx1ZUFzVW5zaWduZWQo KQotICAgICAgICAgICAgaWYgZW51bWVyYXRvcl92YWx1ZSBub3QgaW4gZW51bWVyYXRvcl92YWx1 ZV90b19uYW1lX21hcDoKLSAgICAgICAgICAgICAgICBlbnVtZXJhdG9yX3ZhbHVlX3RvX25hbWVf bWFwW2VudW1lcmF0b3JfdmFsdWVdID0gc2JUeXBlRW51bU1lbWJlci5HZXROYW1lKCkKKyAgICAg ICAgZW51bWVyYXRvcl92YWx1ZV90b19uYW1lX21hcCA9IHNlbGYuX2VudW1lcmF0b3JfdmFsdWVf dG9fbmFtZV9tYXAoKQogICAgICAgICBpZiBub3QgZW51bWVyYXRvcl92YWx1ZV90b19uYW1lX21h cDoKICAgICAgICAgICAgIHJldHVybgogCiAgICAgICAgIGJpdG1hc2tfd2l0aF9hbGxfb3B0aW9u c19zZXQgPSBzdW0oZW51bWVyYXRvcl92YWx1ZV90b19uYW1lX21hcCkKLSAgICAgICAgYml0bWFz ayA9IHNlbGYuc3RvcmFnZS5HZXRWYWx1ZUFzVW5zaWduZWQoMCkKKyAgICAgICAgYml0bWFzayA9 IHNlbGYuX2JpdG1hc2soKQogICAgICAgICBpZiBiaXRtYXNrID4gYml0bWFza193aXRoX2FsbF9v cHRpb25zX3NldDoKICAgICAgICAgICAgIHJldHVybiAgIyBTaW5jZSB0aGlzIGlzIGFuIGludmFs aWQgdmFsdWUsIHJldHVybiBzbyB0aGUgcmF3IGhleCBmb3JtIGlzIHdyaXR0ZW4gb3V0LgogCkBA IC03NTIsNiArNzkzLDMzIEBAIGNsYXNzIFdURk9wdGlvblNldFByb3ZpZGVyOgogICAgICAgICBz ZWxmLnNpemUgPSBsZW4oZWxlbWVudHMpCiAKIAorY2xhc3MgV1RGT3B0aW9uU2V0UHJvdmlkZXIo RmxhZ0VudW1lcmF0aW9uUHJvdmlkZXIpOgorICAgIGRlZiBfZW51bWVyYXRvcl92YWx1ZV90b19u YW1lX21hcChzZWxmKToKKyAgICAgICAgdGVtcGxhdGVfYXJndW1lbnRfc2JUeXBlID0gc2VsZi52 YWxvYmouR2V0VHlwZSgpLkdldFRlbXBsYXRlQXJndW1lbnRUeXBlKDApCisgICAgICAgIGVudW1l cmF0b3JfdmFsdWVfdG9fbmFtZV9tYXAgPSB7fQorICAgICAgICBmb3Igc2JUeXBlRW51bU1lbWJl ciBpbiB0ZW1wbGF0ZV9hcmd1bWVudF9zYlR5cGUuZ2V0X2VudW1fbWVtYmVyc19hcnJheSgpOgor ICAgICAgICAgICAgZW51bWVyYXRvcl92YWx1ZSA9IHNiVHlwZUVudW1NZW1iZXIuR2V0VmFsdWVB c1Vuc2lnbmVkKCkKKyAgICAgICAgICAgIGlmIGVudW1lcmF0b3JfdmFsdWUgbm90IGluIGVudW1l cmF0b3JfdmFsdWVfdG9fbmFtZV9tYXA6CisgICAgICAgICAgICAgICAgZW51bWVyYXRvcl92YWx1 ZV90b19uYW1lX21hcFtlbnVtZXJhdG9yX3ZhbHVlXSA9IHNiVHlwZUVudW1NZW1iZXIuR2V0TmFt ZSgpCisgICAgICAgIHJldHVybiBlbnVtZXJhdG9yX3ZhbHVlX3RvX25hbWVfbWFwCisKKyAgICBk ZWYgX2JpdG1hc2soc2VsZik6CisgICAgICAgIHJldHVybiBzZWxmLnN0b3JhZ2UuR2V0VmFsdWVB c1Vuc2lnbmVkKDApCisKKyAgICBkZWYgX3VwZGF0ZShzZWxmKToKKyAgICAgICAgc2VsZi5zdG9y YWdlID0gc2VsZi52YWxvYmouR2V0Q2hpbGRNZW1iZXJXaXRoTmFtZSgnbV9zdG9yYWdlJykgICMg TWF5IGJlIGFuIGludmFsaWQgdmFsdWUuCisKKworY2xhc3MgUmF3Qml0bWFza1Byb3ZpZGVyQmFz ZShGbGFnRW51bWVyYXRpb25Qcm92aWRlcik6CisgICAgRU5VTUVSQVRPUl9WQUxVRV9UT19OQU1F X01BUCA9IHt9CisKKyAgICBkZWYgX2VudW1lcmF0b3JfdmFsdWVfdG9fbmFtZV9tYXAoc2VsZik6 CisgICAgICAgIHJldHVybiBzZWxmLkVOVU1FUkFUT1JfVkFMVUVfVE9fTkFNRV9NQVAKKworICAg IGRlZiBfYml0bWFzayhzZWxmKToKKyAgICAgICAgcmV0dXJuIHNlbGYudmFsb2JqLkdldFZhbHVl QXNVbnNpZ25lZCgwKQorCisKIGNsYXNzIFdURlZlY3RvclByb3ZpZGVyOgogICAgIGRlZiBfX2lu aXRfXyhzZWxmLCB2YWxvYmosIGludGVybmFsX2RpY3QpOgogICAgICAgICBzZWxmLnZhbG9iaiA9 IHZhbG9iago=