203495 2019-10-28 11:35:03 -0700 Add pretty printer for CompactPointerTuple 2019-10-30 15:22:16 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 dbates dbates benjamin cdumez cmarcelo ews-watchlist jer.noble webkit-bug-importer ysuzuki oldest_to_newest 1584506 0 dbates 2019-10-28 11:35:03 -0700 Add a LLDB pretty printer for CompactPointerTuple. 1584525 1 382091 dbates 2019-10-28 11:46:02 -0700 Created attachment 382091 Patch and unit tests 1584527 2 dbates 2019-10-28 11:47:33 -0700 Now we will print something like: (WTF::CompactPointerTuple<WTF::String *, unsigned char>) $0 = { type = 7 } { [0] = 0x00007ffeefbff220 { length = 8, contents = 'résumé' } [1] = 7 } for aCompactPointerTuple defined like this: String aString { "résumé" }; CompactPointerTuple<String*, uint8_t> aCompactPointerTuple { &aString, 7 }; 1585570 3 382091 dbates 2019-10-30 15:21:12 -0700 Comment on attachment 382091 Patch and unit tests Clearing flags on attachment: 382091 Committed r251813: <https://trac.webkit.org/changeset/251813> 1585571 4 dbates 2019-10-30 15:21:15 -0700 All reviewed patches have been landed. Closing bug. 1585573 5 webkit-bug-importer 2019-10-30 15:22:16 -0700 <rdar://problem/56760637> 382091 2019-10-28 11:46:02 -0700 2019-10-30 15:21:12 -0700 Patch and unit tests bug-203495-20191028114601.patch text/plain 14950 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ5MDQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGZlNzk1N2M0MGQzMGVlZTVmYjMzOTE4 N2VmYWNmNmZhOTlkMGRiNGYuLjBjYzhkMzQyMzA5ZTIyMjMzZGZmZDY0YWVlNjlmNGQ2Y2QzZGFi ODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTktMTAtMjggIERhbmllbCBCYXRlcyAgPGRhYmF0 ZXNAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBwcmV0dHkgcHJpbnRlciBmb3IgQ29tcGFjdFBv aW50ZXJUdXBsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjAzNDk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgI2luY2x1ZGUgPHd0Zi9GYXN0TWFsbG9jLmg+IGZvciB0aGUgZGVmaW5pdGlvbiBvZiBXVEZf TUFLRV9GQVNUX0FMTE9DQVRFRC4KKworICAgICAgICAqIHd0Zi9Db21wYWN0UG9pbnRlclR1cGxl Lmg6CisKIDIwMTktMDgtMjIgIEFuZHkgRXN0ZXMgIDxhZXN0ZXNAYXBwbGUuY29tPgogCiAgICAg ICAgIFt3YXRjaE9TXSBEaXNhYmxlIENvbnRlbnQgRmlsdGVyaW5nIGluIHRoZSBzaW11bGF0b3Ig YnVpbGQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL0NvbXBhY3RQb2ludGVyVHVwbGUuaCBi L1NvdXJjZS9XVEYvd3RmL0NvbXBhY3RQb2ludGVyVHVwbGUuaAppbmRleCBhN2ZmNzNlZWU1YWFk YWU3NjcxNjZlMGE1YzgyNGQ2OGQwYmZiZGVjLi5iOGYyMDFlYTA5NjU4OWI5MmZmNTA2YzY0ZjA5 OWI4ZDk1Y2JiZTJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9Db21wYWN0UG9pbnRlclR1 cGxlLmgKKysrIGIvU291cmNlL1dURi93dGYvQ29tcGFjdFBvaW50ZXJUdXBsZS5oCkBAIC0yNiw2 ICsyNiw3IEBACiAjcHJhZ21hIG9uY2UKIAogI2luY2x1ZGUgPHR5cGVfdHJhaXRzPgorI2luY2x1 ZGUgPHd0Zi9GYXN0TWFsbG9jLmg+CiAjaW5jbHVkZSA8d3RmL1N0ZExpYkV4dHJhcy5oPgogCiBu YW1lc3BhY2UgV1RGIHsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5n ZUxvZwppbmRleCA4ZjUxYWU1NWZhODFhODQ1YzBmNmU0ZWIyMmNjNTk2NjIxMmEzMDY3Li4xOGFk YmFkODIyYTUwNzY1YzJlN2IyZTY0MmZlNzVlNWMxZWY1NjI0IDEwMDY0NAotLS0gYS9Ub29scy9D aGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNTQgQEAKKzIwMTktMTAt MjggIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBwcmV0 dHkgcHJpbnRlciBmb3IgQ29tcGFjdFBvaW50ZXJUdXBsZQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAzNDk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSBpdCBlYXN5IHRvIHNlZSB0aGUgc3RhdGUg b2YgYSBDb21wYWN0UG9pbnRlclR1cGxlLiBOb3cgd2Ugd2lsbCBwcmludCBzb21ldGhpbmcgbGlr ZToKKworICAgICAgICAgICAgICAgIChXVEY6OkNvbXBhY3RQb2ludGVyVHVwbGU8V1RGOjpTdHJp bmcgKiwgdW5zaWduZWQgY2hhcj4pICQwID0geyB0eXBlID0gNyB9IHsKKyAgICAgICAgICAgICAg ICAgIFswXSA9IDB4MDAwMDdmZmVlZmJmZjIyMCB7IGxlbmd0aCA9IDgsIGNvbnRlbnRzID0gJ3LD qXN1bcOpJyB9CisgICAgICAgICAgICAgICAgICBbMV0gPSA3CisgICAgICAgICAgICAgICAgfQor CisgICAgICAgIGZvciBhQ29tcGFjdFBvaW50ZXJUdXBsZSBkZWZpbmVkIGxpa2UgdGhpczoKKwor ICAgICAgICAgICAgICAgIFN0cmluZyBhU3RyaW5nIHsgInLDqXN1bcOpIiB9OworICAgICAgICAg ICAgICAgIENvbXBhY3RQb2ludGVyVHVwbGU8U3RyaW5nKiwgdWludDhfdD4gYUNvbXBhY3RQb2lu dGVyVHVwbGUgeyAmYVN0cmluZywgNyB9OworCisgICAgICAgICogbGxkYi9sbGRiV2ViS2l0VGVz dGVyL21haW4uY3BwOgorICAgICAgICAodGVzdFN1bW1hcnlQcm92aWRlcnMpOgorICAgICAgICAq IGxsZGIvbGxkYl93ZWJraXQucHk6CisgICAgICAgIChfX2xsZGJfaW5pdF9tb2R1bGUpOgorICAg ICAgICAoX19sbGRiX2luaXRfbW9kdWxlLmxsZGJfd2Via2l0KToKKyAgICAgICAgKFdURkNvbXBh Y3RQb2ludGVyVHVwbGVfU3VtbWFyeVByb3ZpZGVyKToKKyAgICAgICAgKFdURkNvbXBhY3RQb2lu dGVyVHVwbGVQcm92aWRlcik6CisgICAgICAgIChXVEZDb21wYWN0UG9pbnRlclR1cGxlUHJvdmlk ZXIuX19pbml0X18pOgorCisgICAgICAgIChXVEZDb21wYWN0UG9pbnRlclR1cGxlUHJvdmlkZXIu dHlwZV9hc19zdHJpbmcpOgorICAgICAgICAoV1RGQ29tcGFjdFBvaW50ZXJUdXBsZVByb3ZpZGVy LmlzX2h1bWFuX3JlYWRhYmxlX3R5cGUpOgorICAgICAgICBUaGUgbWFqb3JpdHkgb2YgdGhlIHRp bWUgQ29tcGFjdFBvaW50ZXJUdXBsZSB3aWxsIGJlIHVzZWQgd2l0aCBub24tY2hhcmFjdGVyIHR5 cGUgZGF0YS4gU28sCisgICAgICAgIEkgb3B0aW1pemUgZm9yIHRoaXMgdXNlIGNhc2UgYW5kIGNv bnNpZGVyIHRoZSBpbnRlZ3JhbCB2YWx1ZSBhcyBtb3JlIHJlYWRhYmxlIHRoYW4gdGhhbiBMTERC J3MKKyAgICAgICAgZGVmYXVsdCBzdW1tYXJ5IHByb3ZpZGVyIHRoYXQgZW1pdHMgdGhlIGNoYXJh Y3RlciBvciBlcXVpdmFsZW50IEMgZXNjYXBlIHNlcXVlbmNlLgorCisgICAgICAgIChXVEZDb21w YWN0UG9pbnRlclR1cGxlUHJvdmlkZXIuaGFzX2NoaWxkcmVuKToKKyAgICAgICAgKFdURkNvbXBh Y3RQb2ludGVyVHVwbGVQcm92aWRlci5udW1fY2hpbGRyZW4pOgorICAgICAgICAoV1RGQ29tcGFj dFBvaW50ZXJUdXBsZVByb3ZpZGVyLmdldF9jaGlsZF9pbmRleCk6CisgICAgICAgIChXVEZDb21w YWN0UG9pbnRlclR1cGxlUHJvdmlkZXIuZ2V0X2NoaWxkX2F0X2luZGV4KToKKyAgICAgICAgKFdU RkNvbXBhY3RQb2ludGVyVHVwbGVQcm92aWRlci51cGRhdGUpOgorICAgICAgICAqIGxsZGIvbGxk Yl93ZWJraXRfdW5pdHRlc3QucHk6CisgICAgICAgIChUZXN0U3VtbWFyeVByb3ZpZGVycy5zZXJp YWxfdGVzdF9XVEZPcHRpb25TZXRQcm92aWRlcl9hbGlhc2VkX2ZsYWcpOgorICAgICAgICAoVGVz dFN1bW1hcnlQcm92aWRlcnMpOgorICAgICAgICAoVGVzdFN1bW1hcnlQcm92aWRlcnMuc2VyaWFs X3Rlc3RfV1RGQ29tcGFjdFBvaW50ZXJUdXBsZV9TdW1tYXJ5UHJvdmlkZXJfZW1wdHkpOgorICAg ICAgICAoVGVzdFN1bW1hcnlQcm92aWRlcnMuc2VyaWFsX3Rlc3RfV1RGQ29tcGFjdFBvaW50ZXJU dXBsZV9TdW1tYXJ5UHJvdmlkZXJfc2ltcGxlKToKKyAgICAgICAgKFRlc3RTdW1tYXJ5UHJvdmlk ZXJzLnNlcmlhbF90ZXN0X1dURkNvbXBhY3RQb2ludGVyVHVwbGVfU3VtbWFyeVByb3ZpZGVyX21h eF90eXBlX3ZhbHVlKToKKyAgICAgICAgKFRlc3RTdW1tYXJ5UHJvdmlkZXJzLnNlcmlhbF90ZXN0 X1dURkNvbXBhY3RQb2ludGVyVHVwbGVfU3VtbWFyeVByb3ZpZGVyX2Jvb2wpOgorICAgICAgICAo VGVzdFN1bW1hcnlQcm92aWRlcnMuc2VyaWFsX3Rlc3RfV1RGQ29tcGFjdFBvaW50ZXJUdXBsZVBy b3ZpZGVyX2VtcHR5KToKKyAgICAgICAgKFRlc3RTdW1tYXJ5UHJvdmlkZXJzLnNlcmlhbF90ZXN0 X1dURkNvbXBhY3RQb2ludGVyVHVwbGVQcm92aWRlcl9zaW1wbGUpOgorICAgICAgICAoVGVzdFN1 bW1hcnlQcm92aWRlcnMuc2VyaWFsX3Rlc3RfV1RGQ29tcGFjdFBvaW50ZXJUdXBsZVByb3ZpZGVy X21heF90eXBlX3ZhbHVlKToKKyAgICAgICAgKFRlc3RTdW1tYXJ5UHJvdmlkZXJzLnNlcmlhbF90 ZXN0X1dURkNvbXBhY3RQb2ludGVyVHVwbGVQcm92aWRlcl9zaW1wbGVfYm9vbCk6CisKIDIwMTkt MTAtMTkgIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgogCiAgICAgICAgIFtsbGRi LXdlYmtpdF0gQWRkIHN1cHBvcnQgZm9yIHByZXR0eS1wcmludGluZyBjb21wbGV4IGJpdG1hc2tz IApkaWZmIC0tZ2l0IGEvVG9vbHMvbGxkYi9sbGRiV2ViS2l0VGVzdGVyL21haW4uY3BwIGIvVG9v bHMvbGxkYi9sbGRiV2ViS2l0VGVzdGVyL21haW4uY3BwCmluZGV4IDY5NDBjNTlmOTM2NzYxZjdi YmNkMGVhNTdiMmIyNTVlZmM4NjFiOGMuLmIwOWU2YmM2ZWM3ZTEzNmNkY2UwZGFkNmYxYTFiNmZh MjA2NDZlMzggMTAwNjQ0Ci0tLSBhL1Rvb2xzL2xsZGIvbGxkYldlYktpdFRlc3Rlci9tYWluLmNw cAorKysgYi9Ub29scy9sbGRiL2xsZGJXZWJLaXRUZXN0ZXIvbWFpbi5jcHAKQEAgLTI1LDYgKzI1 LDcgQEAKIAogI2luY2x1ZGUgIkR1bXBDbGFzc0xheW91dFRlc3RpbmcuaCIKICNpbmNsdWRlIDxz dGRpby5oPgorI2luY2x1ZGUgPHd0Zi9Db21wYWN0UG9pbnRlclR1cGxlLmg+CiAjaW5jbHVkZSA8 d3RmL0hhc2hNYXAuaD4KICNpbmNsdWRlIDx3dGYvSGFzaFNldC5oPgogI2luY2x1ZGUgPHd0Zi9P cHRpb25TZXQuaD4KQEAgLTg2LDYgKzg3LDExIEBAIHN0YXRpYyB2b2lkIHRlc3RTdW1tYXJ5UHJv dmlkZXJzKCkKICAgICBPcHRpb25TZXQ8RXhhbXBsZUZsYWdzPiBleGFtcGxlRmxhZ3NTaW1wbGUg eyBFeGFtcGxlRmxhZ3M6OkEsIEV4YW1wbGVGbGFnczo6RCwgRXhhbXBsZUZsYWdzOjpDIH07CiAg ICAgT3B0aW9uU2V0PEV4YW1wbGVGbGFncz4gZXhhbXBsZUZsYWdzQWxpYXNlZEZsYWcgeyBFeGFt cGxlRmxhZ3M6OkFBbGlhcywgRXhhbXBsZUZsYWdzOjpEIH07CiAKKyAgICBDb21wYWN0UG9pbnRl clR1cGxlPFN0cmluZyosIHVpbnQ4X3Q+IGV4YW1wbGVDb21wYWN0UG9pbnRlclR1cGxlRW1wdHk7 CisgICAgQ29tcGFjdFBvaW50ZXJUdXBsZTxTdHJpbmcqLCB1aW50OF90PiBleGFtcGxlQ29tcGFj dFBvaW50ZXJUdXBsZVNpbXBsZSB7ICZhbjhCaXRTdHJpbmcsIDcgfTsKKyAgICBDb21wYWN0UG9p bnRlclR1cGxlPFN0cmluZyosIHVpbnQ4X3Q+IGV4YW1wbGVDb21wYWN0UG9pbnRlclR1cGxlTWF4 VHlwZVZhbHVlIHsgJmFuOEJpdFN0cmluZywgMjU1IH07CisgICAgQ29tcGFjdFBvaW50ZXJUdXBs ZTxTdHJpbmcqLCBib29sPiBleGFtcGxlQ29tcGFjdFBvaW50ZXJUdXBsZVNpbXBsZUJvb2wgeyAm YW44Qml0U3RyaW5nLCB0cnVlIH07CisKICAgICBicmVha0ZvclRlc3RpbmdTdW1tYXJ5UHJvdmlk ZXJzKCk7CiB9CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL2xsZGIvbGxkYl93ZWJraXQucHkgYi9Ub29s cy9sbGRiL2xsZGJfd2Via2l0LnB5CmluZGV4IDc2ZWQzNmExMDVlYWJjOTE0MmNmYTdiOGE4Y2I4 NTA4NWIxMmQ4NTEuLjE5MzU5OWM3NTY0YzE0YzZiMzFiMDAyMmNiZDg4OTRhYjBiYTM2ZWQgMTAw NjQ0Ci0tLSBhL1Rvb2xzL2xsZGIvbGxkYl93ZWJraXQucHkKKysrIGIvVG9vbHMvbGxkYi9sbGRi X3dlYmtpdC5weQpAQCAtNjcsNiArNjcsNyBAQCBkZWYgX19sbGRiX2luaXRfbW9kdWxlKGRlYnVn Z2VyLCBkaWN0KToKICAgICBkZWJ1Z2dlci5IYW5kbGVDb21tYW5kKCd0eXBlIHN1bW1hcnkgYWRk IC0tZXhwYW5kIC1GIGxsZGJfd2Via2l0LldURkhhc2hTZXRfU3VtbWFyeVByb3ZpZGVyIC14ICJe V1RGOjpIYXNoU2V0PC4rPiQiJykKICAgICBkZWJ1Z2dlci5IYW5kbGVDb21tYW5kKCd0eXBlIHN1 bW1hcnkgYWRkIC0tZXhwYW5kIC1GIGxsZGJfd2Via2l0LldURk1lZGlhVGltZV9TdW1tYXJ5UHJv dmlkZXIgV1RGOjpNZWRpYVRpbWUnKQogICAgIGRlYnVnZ2VyLkhhbmRsZUNvbW1hbmQoJ3R5cGUg c3VtbWFyeSBhZGQgLS1leHBhbmQgLUYgbGxkYl93ZWJraXQuV1RGT3B0aW9uU2V0X1N1bW1hcnlQ cm92aWRlciAteCAiXldURjo6T3B0aW9uU2V0PC4rPiQiJykKKyAgICBkZWJ1Z2dlci5IYW5kbGVD b21tYW5kKCd0eXBlIHN1bW1hcnkgYWRkIC0tZXhwYW5kIC1GIGxsZGJfd2Via2l0LldURkNvbXBh Y3RQb2ludGVyVHVwbGVfU3VtbWFyeVByb3ZpZGVyIC14ICJeV1RGOjpDb21wYWN0UG9pbnRlclR1 cGxlPC4rLC4rPiQiJykKIAogICAgIGRlYnVnZ2VyLkhhbmRsZUNvbW1hbmQoJ3R5cGUgc3VtbWFy eSBhZGQgLUYgbGxkYl93ZWJraXQuV1RGVVJMX1N1bW1hcnlQcm92aWRlciBXVEY6OlVSTCcpCiAg ICAgZGVidWdnZXIuSGFuZGxlQ29tbWFuZCgndHlwZSBzdW1tYXJ5IGFkZCAtRiBsbGRiX3dlYmtp dC5XZWJDb3JlQ29sb3JfU3VtbWFyeVByb3ZpZGVyIFdlYkNvcmU6OkNvbG9yJykKQEAgLTk0LDYg Kzk1LDcgQEAgZGVmIF9fbGxkYl9pbml0X21vZHVsZShkZWJ1Z2dlciwgZGljdCk6CiAgICAgZGVi dWdnZXIuSGFuZGxlQ29tbWFuZCgndHlwZSBzeW50aGV0aWMgYWRkIC14ICJeV1RGOjpWZWN0b3I8 Lis+JCIgLS1weXRob24tY2xhc3MgbGxkYl93ZWJraXQuV1RGVmVjdG9yUHJvdmlkZXInKQogICAg IGRlYnVnZ2VyLkhhbmRsZUNvbW1hbmQoJ3R5cGUgc3ludGhldGljIGFkZCAteCAiXldURjo6SGFz aFRhYmxlPC4rPiQiIC0tcHl0aG9uLWNsYXNzIGxsZGJfd2Via2l0LldURkhhc2hUYWJsZVByb3Zp ZGVyJykKICAgICBkZWJ1Z2dlci5IYW5kbGVDb21tYW5kKCd0eXBlIHN5bnRoZXRpYyBhZGQgLXgg Il5XVEY6Ok9wdGlvblNldDwuKz4kIiAtLXB5dGhvbi1jbGFzcyBsbGRiX3dlYmtpdC5XVEZPcHRp b25TZXRQcm92aWRlcicpCisgICAgZGVidWdnZXIuSGFuZGxlQ29tbWFuZCgndHlwZSBzeW50aGV0 aWMgYWRkIC14ICJeV1RGOjpDb21wYWN0UG9pbnRlclR1cGxlPC4rLC4rPiQiIC0tcHl0aG9uLWNs YXNzIGxsZGJfd2Via2l0LldURkNvbXBhY3RQb2ludGVyVHVwbGVQcm92aWRlcicpCiAKICAgICBh ZGRTdW1tYXJ5QW5kU3ludGhldGljRm9ybWF0dGVyc0ZvclJhd0JpdG1hc2tUeXBlKGRlYnVnZ2Vy LCAiV2ViRXZlbnRGbGFncyIsIHsKICAgICAgICAgMHgwMDAxMDAwMDogIldlYkV2ZW50RmxhZ01h c2tMZWZ0Q29tbWFuZEtleSIsCkBAIC0xNjksNiArMTcxLDExIEBAIGRlZiBXVEZNZWRpYVRpbWVf U3VtbWFyeVByb3ZpZGVyKHZhbG9iaiwgZGljdCk6CiAgICAgcmV0dXJuICJ7ICVkLyVkLCAlZiB9 IiAlIChwcm92aWRlci50aW1lVmFsdWUoKSwgcHJvdmlkZXIudGltZVNjYWxlKCksIGZsb2F0KHBy b3ZpZGVyLnRpbWVWYWx1ZSgpKSAvIHByb3ZpZGVyLnRpbWVTY2FsZSgpKQogCiAKK2RlZiBXVEZD b21wYWN0UG9pbnRlclR1cGxlX1N1bW1hcnlQcm92aWRlcih2YWxvYmosIGRpY3QpOgorICAgIHBy b3ZpZGVyID0gV1RGQ29tcGFjdFBvaW50ZXJUdXBsZVByb3ZpZGVyKHZhbG9iaiwgZGljdCkKKyAg ICByZXR1cm4gInsgdHlwZSA9ICVzIH0iICUgcHJvdmlkZXIudHlwZV9hc19zdHJpbmcoKQorCisK IGRlZiBXZWJDb3JlQ29sb3JfU3VtbWFyeVByb3ZpZGVyKHZhbG9iaiwgZGljdCk6CiAgICAgcHJv dmlkZXIgPSBXZWJDb3JlQ29sb3JQcm92aWRlcih2YWxvYmosIGRpY3QpCiAgICAgcmV0dXJuICJ7 ICVzIH0iICUgcHJvdmlkZXIudG9fc3RyaW5nKCkKQEAgLTg0OSw2ICs4NTYsODkgQEAgY2xhc3Mg UmF3Qml0bWFza1Byb3ZpZGVyQmFzZShGbGFnRW51bWVyYXRpb25Qcm92aWRlcik6CiAgICAgICAg IHJldHVybiByZXN1bHQKIAogCitjbGFzcyBXVEZDb21wYWN0UG9pbnRlclR1cGxlUHJvdmlkZXIo b2JqZWN0KToKKworICAgIFRZUEVfTUFTSyA9IDB4RjgwMDAwMDAwMDAwMDAwNworICAgIFBPSU5U RVJfTUFTSyA9IH5UWVBFX01BU0sKKworICAgIGRlZiBfX2luaXRfXyhzZWxmLCB2YWxvYmosIGlu dGVybmFsX2RpY3QpOgorICAgICAgICBzZWxmLnZhbG9iaiA9IHZhbG9iagorICAgICAgICBzZWxm Ll9pczMyQml0ID0gdmFsb2JqLkdldFRhcmdldCgpLkdldEFkZHJlc3NCeXRlU2l6ZSgpID09IDQK KyAgICAgICAgc2VsZi5fcG9pbnRlciA9IE5vbmUKKyAgICAgICAgc2VsZi5fdHlwZSA9IE5vbmUK KyAgICAgICAgc2VsZi51cGRhdGUoKQorCisgICAgZGVmIHR5cGVfYXNfc3RyaW5nKHNlbGYpOgor ICAgICAgICBpZiBub3Qgc2VsZi5pc19odW1hbl9yZWFkYWJsZV90eXBlKCk6CisgICAgICAgICAg ICByZXR1cm4gIiVzIiAlIHNlbGYuX3R5cGUuR2V0VmFsdWVBc1Vuc2lnbmVkKDApCisgICAgICAg IHJldHVybiAiJXMiICUgc2VsZi5fdHlwZS5HZXRWYWx1ZSgpCisKKyAgICBkZWYgaXNfaHVtYW5f cmVhZGFibGVfdHlwZShzZWxmKToKKyAgICAgICAgIyBUaGUgZGVmYXVsdCBzdW1tYXJ5IHByb3Zp ZGVyIGZvciB1aW50OF90LCB1bnNpZ25lZCBjaGFyIGVtaXRzIHRoZSBBU0NJSSBwcmludGFibGUg Y2hhcmFjdGVyIG9yIGVxdWl2YWxlbnQKKyAgICAgICAgIyBDIGVzY2FwZSBzZXF1ZW5jZSAoZS5n LiBcYSA9IDB4MDcpLiBUeXBpY2FsbHkgdGhlIENvbXBhY3RQb2ludGVyVHVwbGUgaXMgdXNlZCB0 byBlbmNvZGUgbm9uLWNoYXJhY3RlciBpbnRlZ3JhbAorICAgICAgICAjIGRhdGEuIEluIHRoaXMg Y29udGV4dCBpdCBpcyBsZXNzIHJlYWRhYmxlIHRvIHVzZSB0aGUgZGVmYXVsdCBzdW1tYXJ5IHBy b3ZpZGVyLiBTbywgd2UgZG9uJ3QuCisgICAgICAgIHJldHVybiBzZWxmLnZhbG9iai5HZXRUeXBl KCkuR2V0VGVtcGxhdGVBcmd1bWVudFR5cGUoMSkuR2V0QmFzaWNUeXBlKCkgIT0gbGxkYi5lQmFz aWNUeXBlVW5zaWduZWRDaGFyCisKKyAgICAjIExMREIgb3ZlcnJpZGVzCisgICAgZGVmIGhhc19j aGlsZHJlbihzZWxmKToKKyAgICAgICAgcmV0dXJuIHNlbGYuX3R5cGUgaXMgbm90IE5vbmUgYW5k IHNlbGYuX3BvaW50ZXIgaXMgbm90IE5vbmUKKworICAgIGRlZiBudW1fY2hpbGRyZW4oc2VsZik6 CisgICAgICAgIGlmIG5vdCBzZWxmLmhhc19jaGlsZHJlbjoKKyAgICAgICAgICAgIHJldHVybiAw CisgICAgICAgIHJldHVybiAyCisKKyAgICBkZWYgZ2V0X2NoaWxkX2luZGV4KHNlbGYsIG5hbWUp OgorICAgICAgICBpZiBuYW1lID09ICdbMF0nOgorICAgICAgICAgICAgcmV0dXJuIDAKKyAgICAg ICAgaWYgbmFtZSA9PSAnWzFdJzoKKyAgICAgICAgICAgIHJldHVybiAxCisgICAgICAgIGlmIHNl bGYuX2lzMzJCaXQ6CisgICAgICAgICAgICBpZiBuYW1lID09ICdtX3BvaW50ZXInOgorICAgICAg ICAgICAgICAgIHJldHVybiAyCisgICAgICAgICAgICBpZiBuYW1lID09ICdtX3R5cGUnOgorICAg ICAgICAgICAgICAgIHJldHVybiAzCisgICAgICAgIGVsc2U6CisgICAgICAgICAgICBpZiBuYW1l ID09ICdtX2RhdGEnOgorICAgICAgICAgICAgICAgIHJldHVybiAyCisgICAgICAgIHJldHVybiBO b25lCisKKyAgICBkZWYgZ2V0X2NoaWxkX2F0X2luZGV4KHNlbGYsIGluZGV4KToKKyAgICAgICAg aWYgaW5kZXggPCAwIG9yIG5vdCBzZWxmLnZhbG9iai5Jc1ZhbGlkKCk6CisgICAgICAgICAgICBy ZXR1cm4gTm9uZQorICAgICAgICBpZiBpbmRleCA9PSAwOgorICAgICAgICAgICAgcmV0dXJuIHNl bGYuX3BvaW50ZXIKKyAgICAgICAgaWYgaW5kZXggPT0gMToKKyAgICAgICAgICAgIHJldHVybiBz ZWxmLl90eXBlCisgICAgICAgIGlmIHNlbGYuX2lzMzJCaXQ6CisgICAgICAgICAgICBpZiBpbmRl eCA9PSAyOgorICAgICAgICAgICAgICAgIHJldHVybiBzZWxmLl9wb2ludGVyCisgICAgICAgICAg ICBpZiBpbmRleCA9PSAzOgorICAgICAgICAgICAgICAgIHJldHVybiBzZWxmLl90eXBlCisgICAg ICAgIGVsc2U6CisgICAgICAgICAgICBpZiBpbmRleCA9PSAyOgorICAgICAgICAgICAgICAgIHJl dHVybiBzZWxmLnZhbG9iai5HZXRDaGlsZE1lbWJlcldpdGhOYW1lKCdtX2RhdGEnKQorICAgICAg ICByZXR1cm4gTm9uZQorCisgICAgZGVmIHVwZGF0ZShzZWxmKToKKyAgICAgICAgaWYgc2VsZi5f aXMzMkJpdDoKKyAgICAgICAgICAgIHNlbGYuX3BvaW50ZXIgPSBzZWxmLnZhbG9iai5HZXRDaGls ZE1lbWJlcldpdGhOYW1lKCdtX3BvaW50ZXInKQorICAgICAgICAgICAgc2VsZi5fdHlwZSA9IHNl bGYudmFsb2JqLkdldENoaWxkTWVtYmVyV2l0aE5hbWUoJ21fdHlwZScpCisgICAgICAgIGVsc2U6 CisgICAgICAgICAgICBkYXRhID0gc2VsZi52YWxvYmouR2V0Q2hpbGRNZW1iZXJXaXRoTmFtZSgn bV9kYXRhJykuR2V0VmFsdWVBc1Vuc2lnbmVkKDApCisgICAgICAgICAgICBieXRlX29yZGVyID0g c2VsZi52YWxvYmouR2V0VGFyZ2V0KCkuR2V0Qnl0ZU9yZGVyKCkKKyAgICAgICAgICAgIGFkZHJl c3NfYnl0ZV9zaXplID0gc2VsZi52YWxvYmouR2V0VGFyZ2V0KCkuR2V0QWRkcmVzc0J5dGVTaXpl KCkKKworICAgICAgICAgICAgcG9pbnRlcl9kYXRhID0gbGxkYi5TQkRhdGEuQ3JlYXRlRGF0YUZy b21VSW50NjRBcnJheShieXRlX29yZGVyLCBhZGRyZXNzX2J5dGVfc2l6ZSwgW2RhdGEgJiBzZWxm LlBPSU5URVJfTUFTS10pCisgICAgICAgICAgICBzZWxmLl9wb2ludGVyID0gc2VsZi52YWxvYmou Q3JlYXRlVmFsdWVGcm9tRGF0YSgnWzBdJywgcG9pbnRlcl9kYXRhLCBzZWxmLnZhbG9iai5HZXRU eXBlKCkuR2V0VGVtcGxhdGVBcmd1bWVudFR5cGUoMCkpCisKKyAgICAgICAgICAgIHR5cGVfZGF0 YSA9IGxsZGIuU0JEYXRhLkNyZWF0ZURhdGFGcm9tVUludDY0QXJyYXkoYnl0ZV9vcmRlciwgYWRk cmVzc19ieXRlX3NpemUsIFsoZGF0YSA+PiA1OSB8IGRhdGEgPDwgNSkgJiAweEZGXSkKKyAgICAg ICAgICAgIHR5cGVfdG9fdXNlID0gc2VsZi52YWxvYmouR2V0VHlwZSgpLkdldFRlbXBsYXRlQXJn dW1lbnRUeXBlKDEpCisgICAgICAgICAgICBpZiBub3Qgc2VsZi5pc19odW1hbl9yZWFkYWJsZV90 eXBlKCk6CisgICAgICAgICAgICAgICAgdHlwZV90b191c2UgPSBzZWxmLnZhbG9iai5HZXRUYXJn ZXQoKS5HZXRCYXNpY1R5cGUobGxkYi5lQmFzaWNUeXBlVW5zaWduZWRJbnQpCisgICAgICAgICAg ICBzZWxmLl90eXBlID0gc2VsZi52YWxvYmouQ3JlYXRlVmFsdWVGcm9tRGF0YSgnWzFdJywgdHlw ZV9kYXRhLCB0eXBlX3RvX3VzZSkKKworCiBjbGFzcyBXVEZWZWN0b3JQcm92aWRlcjoKICAgICBk ZWYgX19pbml0X18oc2VsZiwgdmFsb2JqLCBpbnRlcm5hbF9kaWN0KToKICAgICAgICAgc2VsZi52 YWxvYmogPSB2YWxvYmoKZGlmZiAtLWdpdCBhL1Rvb2xzL2xsZGIvbGxkYl93ZWJraXRfdW5pdHRl c3QucHkgYi9Ub29scy9sbGRiL2xsZGJfd2Via2l0X3VuaXR0ZXN0LnB5CmluZGV4IGMyODFmZmYx ZjZhYzZiMWI0Yjg4Y2IwNTkzMTljMzMzYmQ0MzNjNmMuLjZkZTc4OTEwMmMzNGVhZjMyOTBiOTM0 MjgxNDQ2YjA3Yjk2MzI0ZjkgMTAwNzU1Ci0tLSBhL1Rvb2xzL2xsZGIvbGxkYl93ZWJraXRfdW5p dHRlc3QucHkKKysrIGIvVG9vbHMvbGxkYi9sbGRiX3dlYmtpdF91bml0dGVzdC5weQpAQCAtMjA0 LDMgKzIwNCw1NyBAQCBjbGFzcyBUZXN0U3VtbWFyeVByb3ZpZGVycyh1bml0dGVzdC5UZXN0Q2Fz ZSk6CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocHJvdmlkZXIuZ2V0X2NoaWxkX2F0X2luZGV4 KDApLkdldFZhbHVlKCksICcxJykKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChwcm92aWRlci5n ZXRfY2hpbGRfYXRfaW5kZXgoMSkuR2V0TmFtZSgpLCAnRCcpCiAgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWwocHJvdmlkZXIuZ2V0X2NoaWxkX2F0X2luZGV4KDEpLkdldFZhbHVlKCksICc4JykKKwor ICAgICMgTUFSSzogV1RGQ29tcGFjdFBvaW50ZXJUdXBsZSB0ZXN0IGNhc2VzCisKKyAgICBkZWYg c2VyaWFsX3Rlc3RfV1RGQ29tcGFjdFBvaW50ZXJUdXBsZV9TdW1tYXJ5UHJvdmlkZXJfZW1wdHko c2VsZik6CisgICAgICAgIHZhcmlhYmxlID0gc2VsZi5fc2JGcmFtZS5GaW5kVmFyaWFibGUoJ2V4 YW1wbGVDb21wYWN0UG9pbnRlclR1cGxlRW1wdHknKQorICAgICAgICBzdW1tYXJ5ID0gbGxkYl93 ZWJraXQuV1RGQ29tcGFjdFBvaW50ZXJUdXBsZV9TdW1tYXJ5UHJvdmlkZXIodmFyaWFibGUsIHt9 KQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHN1bW1hcnksICJ7IHR5cGUgPSAwIH0iKQorCisg ICAgZGVmIHNlcmlhbF90ZXN0X1dURkNvbXBhY3RQb2ludGVyVHVwbGVfU3VtbWFyeVByb3ZpZGVy X3NpbXBsZShzZWxmKToKKyAgICAgICAgdmFyaWFibGUgPSBzZWxmLl9zYkZyYW1lLkZpbmRWYXJp YWJsZSgnZXhhbXBsZUNvbXBhY3RQb2ludGVyVHVwbGVTaW1wbGUnKQorICAgICAgICBzdW1tYXJ5 ID0gbGxkYl93ZWJraXQuV1RGQ29tcGFjdFBvaW50ZXJUdXBsZV9TdW1tYXJ5UHJvdmlkZXIodmFy aWFibGUsIHt9KQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHN1bW1hcnksICJ7IHR5cGUgPSA3 IH0iKQorCisgICAgZGVmIHNlcmlhbF90ZXN0X1dURkNvbXBhY3RQb2ludGVyVHVwbGVfU3VtbWFy eVByb3ZpZGVyX21heF90eXBlX3ZhbHVlKHNlbGYpOgorICAgICAgICB2YXJpYWJsZSA9IHNlbGYu X3NiRnJhbWUuRmluZFZhcmlhYmxlKCdleGFtcGxlQ29tcGFjdFBvaW50ZXJUdXBsZU1heFR5cGVW YWx1ZScpCisgICAgICAgIHN1bW1hcnkgPSBsbGRiX3dlYmtpdC5XVEZDb21wYWN0UG9pbnRlclR1 cGxlX1N1bW1hcnlQcm92aWRlcih2YXJpYWJsZSwge30pCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWwoc3VtbWFyeSwgInsgdHlwZSA9IDI1NSB9IikKKworICAgIGRlZiBzZXJpYWxfdGVzdF9XVEZD b21wYWN0UG9pbnRlclR1cGxlX1N1bW1hcnlQcm92aWRlcl9ib29sKHNlbGYpOgorICAgICAgICB2 YXJpYWJsZSA9IHNlbGYuX3NiRnJhbWUuRmluZFZhcmlhYmxlKCdleGFtcGxlQ29tcGFjdFBvaW50 ZXJUdXBsZVNpbXBsZUJvb2wnKQorICAgICAgICBzdW1tYXJ5ID0gbGxkYl93ZWJraXQuV1RGQ29t cGFjdFBvaW50ZXJUdXBsZV9TdW1tYXJ5UHJvdmlkZXIodmFyaWFibGUsIHt9KQorICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKHN1bW1hcnksICJ7IHR5cGUgPSB0cnVlIH0iKQorCisgICAgZGVmIHNl cmlhbF90ZXN0X1dURkNvbXBhY3RQb2ludGVyVHVwbGVQcm92aWRlcl9lbXB0eShzZWxmKToKKyAg ICAgICAgdmFyaWFibGUgPSBzZWxmLl9zYkZyYW1lLkZpbmRWYXJpYWJsZSgnZXhhbXBsZUNvbXBh Y3RQb2ludGVyVHVwbGVFbXB0eScpCisgICAgICAgIHByb3ZpZGVyID0gbGxkYl93ZWJraXQuV1RG Q29tcGFjdFBvaW50ZXJUdXBsZVByb3ZpZGVyKHZhcmlhYmxlLCB7fSkKKyAgICAgICAgc2VsZi5h c3NlcnRFcXVhbChwcm92aWRlci5nZXRfY2hpbGRfYXRfaW5kZXgoMCkuR2V0TmFtZSgpLCAnWzBd JykKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChwcm92aWRlci5nZXRfY2hpbGRfYXRfaW5kZXgo MCkuR2V0VmFsdWVBc1Vuc2lnbmVkKCksIDApCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocHJv dmlkZXIuZ2V0X2NoaWxkX2F0X2luZGV4KDEpLkdldE5hbWUoKSwgJ1sxXScpCisgICAgICAgIHNl bGYuYXNzZXJ0RXF1YWwocHJvdmlkZXIuZ2V0X2NoaWxkX2F0X2luZGV4KDEpLkdldFZhbHVlQXNV bnNpZ25lZCgpLCAwKQorCisgICAgZGVmIHNlcmlhbF90ZXN0X1dURkNvbXBhY3RQb2ludGVyVHVw bGVQcm92aWRlcl9zaW1wbGUoc2VsZik6CisgICAgICAgIHZhcmlhYmxlID0gc2VsZi5fc2JGcmFt ZS5GaW5kVmFyaWFibGUoJ2V4YW1wbGVDb21wYWN0UG9pbnRlclR1cGxlU2ltcGxlJykKKyAgICAg ICAgcHJvdmlkZXIgPSBsbGRiX3dlYmtpdC5XVEZDb21wYWN0UG9pbnRlclR1cGxlUHJvdmlkZXIo dmFyaWFibGUsIHt9KQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHByb3ZpZGVyLmdldF9jaGls ZF9hdF9pbmRleCgwKS5HZXROYW1lKCksICdbMF0nKQorICAgICAgICBzZWxmLmFzc2VydE5vdEVx dWFsKHByb3ZpZGVyLmdldF9jaGlsZF9hdF9pbmRleCgwKS5HZXRWYWx1ZUFzVW5zaWduZWQoKSwg MCkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChwcm92aWRlci5nZXRfY2hpbGRfYXRfaW5kZXgo MSkuR2V0TmFtZSgpLCAnWzFdJykKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChwcm92aWRlci5n ZXRfY2hpbGRfYXRfaW5kZXgoMSkuR2V0VmFsdWVBc1Vuc2lnbmVkKCksIDcpCisKKyAgICBkZWYg c2VyaWFsX3Rlc3RfV1RGQ29tcGFjdFBvaW50ZXJUdXBsZVByb3ZpZGVyX21heF90eXBlX3ZhbHVl KHNlbGYpOgorICAgICAgICB2YXJpYWJsZSA9IHNlbGYuX3NiRnJhbWUuRmluZFZhcmlhYmxlKCdl eGFtcGxlQ29tcGFjdFBvaW50ZXJUdXBsZU1heFR5cGVWYWx1ZScpCisgICAgICAgIHByb3ZpZGVy ID0gbGxkYl93ZWJraXQuV1RGQ29tcGFjdFBvaW50ZXJUdXBsZVByb3ZpZGVyKHZhcmlhYmxlLCB7 fSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChwcm92aWRlci5nZXRfY2hpbGRfYXRfaW5kZXgo MCkuR2V0TmFtZSgpLCAnWzBdJykKKyAgICAgICAgc2VsZi5hc3NlcnROb3RFcXVhbChwcm92aWRl ci5nZXRfY2hpbGRfYXRfaW5kZXgoMCkuR2V0VmFsdWVBc1Vuc2lnbmVkKCksIDApCisgICAgICAg IHNlbGYuYXNzZXJ0RXF1YWwocHJvdmlkZXIuZ2V0X2NoaWxkX2F0X2luZGV4KDEpLkdldE5hbWUo KSwgJ1sxXScpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocHJvdmlkZXIuZ2V0X2NoaWxkX2F0 X2luZGV4KDEpLkdldFZhbHVlQXNVbnNpZ25lZCgpLCAyNTUpCisKKyAgICBkZWYgc2VyaWFsX3Rl c3RfV1RGQ29tcGFjdFBvaW50ZXJUdXBsZVByb3ZpZGVyX3NpbXBsZV9ib29sKHNlbGYpOgorICAg ICAgICB2YXJpYWJsZSA9IHNlbGYuX3NiRnJhbWUuRmluZFZhcmlhYmxlKCdleGFtcGxlQ29tcGFj dFBvaW50ZXJUdXBsZVNpbXBsZUJvb2wnKQorICAgICAgICBwcm92aWRlciA9IGxsZGJfd2Via2l0 LldURkNvbXBhY3RQb2ludGVyVHVwbGVQcm92aWRlcih2YXJpYWJsZSwge30pCisgICAgICAgIHNl bGYuYXNzZXJ0RXF1YWwocHJvdmlkZXIuZ2V0X2NoaWxkX2F0X2luZGV4KDApLkdldE5hbWUoKSwg J1swXScpCisgICAgICAgIHNlbGYuYXNzZXJ0Tm90RXF1YWwocHJvdmlkZXIuZ2V0X2NoaWxkX2F0 X2luZGV4KDApLkdldFZhbHVlQXNVbnNpZ25lZCgpLCAwKQorICAgICAgICBzZWxmLmFzc2VydEVx dWFsKHByb3ZpZGVyLmdldF9jaGlsZF9hdF9pbmRleCgxKS5HZXROYW1lKCksICdbMV0nKQorICAg ICAgICBzZWxmLmFzc2VydEVxdWFsKHByb3ZpZGVyLmdldF9jaGlsZF9hdF9pbmRleCgxKS5HZXRW YWx1ZSgpLCAndHJ1ZScpCg==