204530 2019-11-22 12:07:32 -0800 Bindings generator fails to add includes for iterable<> key / value types 2019-11-22 15:11:25 -0800 1 1 1 Unclassified WebKit Bindings WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez cdumez commit-queue esprehn+autocc ews-watchlist ggaren kondapallykalyan megan_gardner rniwa sam webkit-bug-importer youennf oldest_to_newest 1592947 0 cdumez 2019-11-22 12:07:32 -0800 Bindings generator fails to add includes for iterable<> key / value types. 1592948 1 384182 cdumez 2019-11-22 12:09:00 -0800 Created attachment 384182 Patch 1593044 2 384182 commit-queue 2019-11-22 15:10:59 -0800 Comment on attachment 384182 Patch Clearing flags on attachment: 384182 Committed r252808: <https://trac.webkit.org/changeset/252808> 1593045 3 commit-queue 2019-11-22 15:11:00 -0800 All reviewed patches have been landed. Closing bug. 1593046 4 webkit-bug-importer 2019-11-22 15:11:25 -0800 <rdar://problem/57442344> 384182 2019-11-22 12:09:00 -0800 2019-11-22 15:10:59 -0800 Patch bug-204530-20191122120859.patch text/plain 11305 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyNzc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzYwY2NmZTU1NjNkYWE4 NTk4NGU0YmM5NGVmMDgwODQ5OGViMGJlZi4uNmI3ZDEwNWEyZDlmMDhiZmNlOGYwNDUwNGM4NWE0 NjFiYzEwNDNmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE5LTExLTIyICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgQmluZGluZ3MgZ2VuZXJhdG9y IGZhaWxzIHRvIGFkZCBpbmNsdWRlcyBmb3IgaXRlcmFibGU8PiBrZXkgLyB2YWx1ZSB0eXBlcwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA0NTMwCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBiaW5kaW5n cy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbToKKyAgICAgICAgKEdlbmVyYXRlSXRlcmFibGVE ZWZpbml0aW9uKToKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNUZXN0SW50 ZXJmYWNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkpTVGVzdEludGVyZmFjZVByb3RvdHlwZTo6 ZmluaXNoQ3JlYXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6anNUZXN0SW50ZXJmYWNlUHJvdG90 eXBlRnVuY3Rpb25FbnRyaWVzQ2FsbGVyKToKKyAgICAgICAgKFdlYkNvcmU6OmpzVGVzdEludGVy ZmFjZVByb3RvdHlwZUZ1bmN0aW9uRW50cmllcyk6CisgICAgICAgIChXZWJDb3JlOjpqc1Rlc3RJ bnRlcmZhY2VQcm90b3R5cGVGdW5jdGlvbktleXNDYWxsZXIpOgorICAgICAgICAoV2ViQ29yZTo6 anNUZXN0SW50ZXJmYWNlUHJvdG90eXBlRnVuY3Rpb25LZXlzKToKKyAgICAgICAgKFdlYkNvcmU6 OmpzVGVzdEludGVyZmFjZVByb3RvdHlwZUZ1bmN0aW9uVmFsdWVzQ2FsbGVyKToKKyAgICAgICAg KFdlYkNvcmU6OmpzVGVzdEludGVyZmFjZVByb3RvdHlwZUZ1bmN0aW9uVmFsdWVzKToKKyAgICAg ICAgKFdlYkNvcmU6OmpzVGVzdEludGVyZmFjZVByb3RvdHlwZUZ1bmN0aW9uRm9yRWFjaENhbGxl cik6CisgICAgICAgIChXZWJDb3JlOjpqc1Rlc3RJbnRlcmZhY2VQcm90b3R5cGVGdW5jdGlvbkZv ckVhY2gpOgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3RJdGVyYWJs ZS5jcHA6CisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTVGVzdE5vZGUuY3Bw OgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvdGVzdC9UZXN0SW50ZXJmYWNlLmlkbDoKKwog MjAxOS0xMS0yMiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAK ICAgICAgICAgRmlsZSBpbnB1dCBzaG91bGQgZmlyZSBhbiAnaW5wdXQnIGV2ZW50IGJlZm9yZSB0 aGUgJ2NoYW5nZScgZXZlbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Nj cmlwdHMvQ29kZUdlbmVyYXRvckpTLnBtIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0 cy9Db2RlR2VuZXJhdG9ySlMucG0KaW5kZXggMmZkNjNlODM2NGE1NTNlMTlhOGE0ZWZjMTlhMDNh ZTFmNzY1YzUwYi4uZmJiYWRmY2U1NGIzYTdhZjFkMzU2N2NkMzFlOTBiNjE1NGYxYWI4NyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMu cG0KKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMu cG0KQEAgLTY0MDcsNiArNjQwNyw5IEBAIHN1YiBHZW5lcmF0ZUl0ZXJhYmxlRGVmaW5pdGlvbgog ICAgIG15ICRpdGVyYXRvclRyYWl0c1R5cGUgPSAkaW50ZXJmYWNlLT5pdGVyYWJsZS0+aXNLZXlW YWx1ZSA/ICJKU0RPTUl0ZXJhdG9yVHlwZTo6TWFwIiA6ICJKU0RPTUl0ZXJhdG9yVHlwZTo6U2V0 IjsKICAgICBteSAkaXRlcmF0b3JUcmFpdHNLZXlUeXBlID0gJGludGVyZmFjZS0+aXRlcmFibGUt PmlzS2V5VmFsdWUgPyBHZXRJRExUeXBlKCRpbnRlcmZhY2UsICRpbnRlcmZhY2UtPml0ZXJhYmxl LT5rZXlUeXBlKSA6ICJ2b2lkIjsKICAgICBteSAkaXRlcmF0b3JUcmFpdHNWYWx1ZVR5cGUgPSBH ZXRJRExUeXBlKCRpbnRlcmZhY2UsICRpbnRlcmZhY2UtPml0ZXJhYmxlLT52YWx1ZVR5cGUpOwor ICAgIAorICAgIEFkZFRvSW1wbEluY2x1ZGVzRm9ySURMVHlwZSgkaW50ZXJmYWNlLT5pdGVyYWJs ZS0+a2V5VHlwZSkgaWYgJGludGVyZmFjZS0+aXRlcmFibGUtPmlzS2V5VmFsdWU7CisgICAgQWRk VG9JbXBsSW5jbHVkZXNGb3JJRExUeXBlKCRpbnRlcmZhY2UtPml0ZXJhYmxlLT52YWx1ZVR5cGUp OwogCiAgICAgcHVzaChAaW1wbENvbnRlbnQsICA8PEVORCk7CiBzdHJ1Y3QgJHtpdGVyYXRvclRy YWl0c05hbWV9IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMv dGVzdC9KUy9KU1Rlc3RJbnRlcmZhY2UuY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2Ny aXB0cy90ZXN0L0pTL0pTVGVzdEludGVyZmFjZS5jcHAKaW5kZXggMWJhZDRkMjI1N2Q5MGViN2Zj ODJjNjYyYjBjZWI1NWUxMzg3NTRiNy4uZTk4NGQzZTI1ZWEzYmY1MTk0OThlM2YyYzhiYTgxY2Qy MGY3ZDE4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0 L0pTL0pTVGVzdEludGVyZmFjZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2Ny aXB0cy90ZXN0L0pTL0pTVGVzdEludGVyZmFjZS5jcHAKQEAgLTMxLDEwICszMSwxNCBAQAogI2lu Y2x1ZGUgIkpTRE9NQ29uc3RydWN0b3IuaCIKICNpbmNsdWRlICJKU0RPTUNvbnZlcnRJbnRlcmZh Y2UuaCIKICNpbmNsdWRlICJKU0RPTUV4Y2VwdGlvbkhhbmRsaW5nLmgiCisjaW5jbHVkZSAiSlNE T01JdGVyYXRvci5oIgogI2luY2x1ZGUgIkpTRE9NT3BlcmF0aW9uLmgiCiAjaW5jbHVkZSAiSlNE T01XcmFwcGVyQ2FjaGUuaCIKKyNpbmNsdWRlICJKU1Rlc3ROb2RlLmgiCisjaW5jbHVkZSAiSlNU ZXN0T2JqLmgiCiAjaW5jbHVkZSAiU2NyaXB0RXhlY3V0aW9uQ29udGV4dC5oIgogI2luY2x1ZGUg IlRlc3RTdXBwbGVtZW50YWwuaCIKKyNpbmNsdWRlIDxKYXZhU2NyaXB0Q29yZS9CdWlsdGluTmFt ZXMuaD4KICNpbmNsdWRlIDxKYXZhU2NyaXB0Q29yZS9GdW5jdGlvblByb3RvdHlwZS5oPgogI2lu Y2x1ZGUgPEphdmFTY3JpcHRDb3JlL0hlYXBBbmFseXplci5oPgogI2luY2x1ZGUgPEphdmFTY3Jp cHRDb3JlL0pTQ0lubGluZXMuaD4KQEAgLTU0LDcgKzU4LDYgQEAKICNpbmNsdWRlICJKU0RPTUNv bnZlcnROdW1iZXJzLmgiCiAjaW5jbHVkZSAiSlNET01HbG9iYWxPYmplY3QuaCIKICNpbmNsdWRl ICJKU05vZGUuaCIKLSNpbmNsdWRlICJKU1Rlc3RPYmouaCIKICNlbmRpZgogCiAjaWYgRU5BQkxF KENvbmRpdGlvbjIyKSB8fCBFTkFCTEUoQ29uZGl0aW9uMjMpCkBAIC05NSw2ICs5OCwxMSBAQCBK U0M6OkVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwganNUZXN0SW50ZXJmYWNlUHJvdG90eXBl RnVuY3Rpb25TdXBwbGVtZW50YWxNZQogI2lmIEVOQUJMRShDb25kaXRpb24xMSkgfHwgRU5BQkxF KENvbmRpdGlvbjEyKQogSlNDOjpFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGpzVGVzdElu dGVyZmFjZUNvbnN0cnVjdG9yRnVuY3Rpb25TdXBwbGVtZW50YWxNZXRob2Q0KEpTQzo6SlNHbG9i YWxPYmplY3QqLCBKU0M6OkNhbGxGcmFtZSopOwogI2VuZGlmCitKU0M6OkVuY29kZWRKU1ZhbHVl IEpTQ19IT1NUX0NBTEwganNUZXN0SW50ZXJmYWNlUHJvdG90eXBlRnVuY3Rpb25TeW1ib2xJdGVy YXRvcihKU0M6OkpTR2xvYmFsT2JqZWN0KiwgSlNDOjpDYWxsRnJhbWUqKTsKK0pTQzo6RW5jb2Rl ZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBqc1Rlc3RJbnRlcmZhY2VQcm90b3R5cGVGdW5jdGlvbkVu dHJpZXMoSlNDOjpKU0dsb2JhbE9iamVjdCosIEpTQzo6Q2FsbEZyYW1lKik7CitKU0M6OkVuY29k ZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwganNUZXN0SW50ZXJmYWNlUHJvdG90eXBlRnVuY3Rpb25L ZXlzKEpTQzo6SlNHbG9iYWxPYmplY3QqLCBKU0M6OkNhbGxGcmFtZSopOworSlNDOjpFbmNvZGVk SlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGpzVGVzdEludGVyZmFjZVByb3RvdHlwZUZ1bmN0aW9uVmFs dWVzKEpTQzo6SlNHbG9iYWxPYmplY3QqLCBKU0M6OkNhbGxGcmFtZSopOworSlNDOjpFbmNvZGVk SlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGpzVGVzdEludGVyZmFjZVByb3RvdHlwZUZ1bmN0aW9uRm9y RWFjaChKU0M6OkpTR2xvYmFsT2JqZWN0KiwgSlNDOjpDYWxsRnJhbWUqKTsKIAogLy8gQXR0cmli dXRlcwogCkBAIC0zNzYsNiArMzg0LDEwIEBAIHN0YXRpYyBjb25zdCBIYXNoVGFibGVWYWx1ZSBK U1Rlc3RJbnRlcmZhY2VQcm90b3R5cGVUYWJsZVZhbHVlc1tdID0KICNlbHNlCiAgICAgeyAwLCAw LCBOb0ludHJpbnNpYywgeyAwLCAwIH0gfSwKICNlbmRpZgorICAgIHsgImVudHJpZXMiLCBzdGF0 aWNfY2FzdDx1bnNpZ25lZD4oSlNDOjpQcm9wZXJ0eUF0dHJpYnV0ZTo6RnVuY3Rpb24pLCBOb0lu dHJpbnNpYywgeyAoaW50cHRyX3Qpc3RhdGljX2Nhc3Q8UmF3TmF0aXZlRnVuY3Rpb24+KGpzVGVz dEludGVyZmFjZVByb3RvdHlwZUZ1bmN0aW9uRW50cmllcyksIChpbnRwdHJfdCkgKDApIH0gfSwK KyAgICB7ICJrZXlzIiwgc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KEpTQzo6UHJvcGVydHlBdHRyaWJ1 dGU6OkZ1bmN0aW9uKSwgTm9JbnRyaW5zaWMsIHsgKGludHB0cl90KXN0YXRpY19jYXN0PFJhd05h dGl2ZUZ1bmN0aW9uPihqc1Rlc3RJbnRlcmZhY2VQcm90b3R5cGVGdW5jdGlvbktleXMpLCAoaW50 cHRyX3QpICgwKSB9IH0sCisgICAgeyAidmFsdWVzIiwgc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KEpT Qzo6UHJvcGVydHlBdHRyaWJ1dGU6OkZ1bmN0aW9uKSwgTm9JbnRyaW5zaWMsIHsgKGludHB0cl90 KXN0YXRpY19jYXN0PFJhd05hdGl2ZUZ1bmN0aW9uPihqc1Rlc3RJbnRlcmZhY2VQcm90b3R5cGVG dW5jdGlvblZhbHVlcyksIChpbnRwdHJfdCkgKDApIH0gfSwKKyAgICB7ICJmb3JFYWNoIiwgc3Rh dGljX2Nhc3Q8dW5zaWduZWQ+KEpTQzo6UHJvcGVydHlBdHRyaWJ1dGU6OkZ1bmN0aW9uKSwgTm9J bnRyaW5zaWMsIHsgKGludHB0cl90KXN0YXRpY19jYXN0PFJhd05hdGl2ZUZ1bmN0aW9uPihqc1Rl c3RJbnRlcmZhY2VQcm90b3R5cGVGdW5jdGlvbkZvckVhY2gpLCAoaW50cHRyX3QpICgxKSB9IH0s CiAjaWYgRU5BQkxFKENvbmRpdGlvbjIyKSB8fCBFTkFCTEUoQ29uZGl0aW9uMjMpCiAgICAgeyAi SU1QTEVNRU5UU0NPTlNUQU5UMSIsIEpTQzo6UHJvcGVydHlBdHRyaWJ1dGU6OkRvbnREZWxldGUg fCBKU0M6OlByb3BlcnR5QXR0cmlidXRlOjpSZWFkT25seSB8IEpTQzo6UHJvcGVydHlBdHRyaWJ1 dGU6OkNvbnN0YW50SW50ZWdlciwgTm9JbnRyaW5zaWMsIHsgKGxvbmcgbG9uZykoMSkgfSB9LAog I2Vsc2UKQEAgLTQwNCw2ICs0MTYsNyBAQCB2b2lkIEpTVGVzdEludGVyZmFjZVByb3RvdHlwZTo6 ZmluaXNoQ3JlYXRpb24oVk0mIHZtKQogewogICAgIEJhc2U6OmZpbmlzaENyZWF0aW9uKHZtKTsK ICAgICByZWlmeVN0YXRpY1Byb3BlcnRpZXModm0sIEpTVGVzdEludGVyZmFjZTo6aW5mbygpLCBK U1Rlc3RJbnRlcmZhY2VQcm90b3R5cGVUYWJsZVZhbHVlcywgKnRoaXMpOworICAgIHB1dERpcmVj dCh2bSwgdm0ucHJvcGVydHlOYW1lcy0+aXRlcmF0b3JTeW1ib2wsIGdldERpcmVjdCh2bSwgdm0u cHJvcGVydHlOYW1lcy0+YnVpbHRpbk5hbWVzKCkuZW50cmllc1B1YmxpY05hbWUoKSksIHN0YXRp Y19jYXN0PHVuc2lnbmVkPihKU0M6OlByb3BlcnR5QXR0cmlidXRlOjpEb250RW51bSkpOwogfQog CiBjb25zdCBDbGFzc0luZm8gSlNUZXN0SW50ZXJmYWNlOjpzX2luZm8gPSB7ICJUZXN0SW50ZXJm YWNlIiwgJkJhc2U6OnNfaW5mbywgbnVsbHB0ciwgbnVsbHB0ciwgQ1JFQVRFX01FVEhPRF9UQUJM RShKU1Rlc3RJbnRlcmZhY2UpIH07CkBAIC0xMDM4LDYgKzEwNTEsNjEgQEAgRW5jb2RlZEpTVmFs dWUgSlNDX0hPU1RfQ0FMTCBqc1Rlc3RJbnRlcmZhY2VDb25zdHJ1Y3RvckZ1bmN0aW9uU3VwcGxl bWVudGFsTWV0aG8KIAogI2VuZGlmCiAKK3N0cnVjdCBUZXN0SW50ZXJmYWNlSXRlcmF0b3JUcmFp dHMgeworICAgIHN0YXRpYyBjb25zdGV4cHIgSlNET01JdGVyYXRvclR5cGUgdHlwZSA9IEpTRE9N SXRlcmF0b3JUeXBlOjpNYXA7CisgICAgdXNpbmcgS2V5VHlwZSA9IElETEludGVyZmFjZTxUZXN0 Tm9kZT47CisgICAgdXNpbmcgVmFsdWVUeXBlID0gSURMSW50ZXJmYWNlPFRlc3RPYmo+OworfTsK KwordXNpbmcgVGVzdEludGVyZmFjZUl0ZXJhdG9yID0gSlNET01JdGVyYXRvcjxKU1Rlc3RJbnRl cmZhY2UsIFRlc3RJbnRlcmZhY2VJdGVyYXRvclRyYWl0cz47Cit1c2luZyBUZXN0SW50ZXJmYWNl SXRlcmF0b3JQcm90b3R5cGUgPSBKU0RPTUl0ZXJhdG9yUHJvdG90eXBlPEpTVGVzdEludGVyZmFj ZSwgVGVzdEludGVyZmFjZUl0ZXJhdG9yVHJhaXRzPjsKKwordGVtcGxhdGU8PgorY29uc3QgSlND OjpDbGFzc0luZm8gVGVzdEludGVyZmFjZUl0ZXJhdG9yOjpzX2luZm8gPSB7ICJUZXN0SW50ZXJm YWNlIEl0ZXJhdG9yIiwgJkJhc2U6OnNfaW5mbywgbnVsbHB0ciwgbnVsbHB0ciwgQ1JFQVRFX01F VEhPRF9UQUJMRShUZXN0SW50ZXJmYWNlSXRlcmF0b3IpIH07CisKK3RlbXBsYXRlPD4KK2NvbnN0 IEpTQzo6Q2xhc3NJbmZvIFRlc3RJbnRlcmZhY2VJdGVyYXRvclByb3RvdHlwZTo6c19pbmZvID0g eyAiVGVzdEludGVyZmFjZSBJdGVyYXRvciIsICZCYXNlOjpzX2luZm8sIG51bGxwdHIsIG51bGxw dHIsIENSRUFURV9NRVRIT0RfVEFCTEUoVGVzdEludGVyZmFjZUl0ZXJhdG9yUHJvdG90eXBlKSB9 OworCitzdGF0aWMgaW5saW5lIEVuY29kZWRKU1ZhbHVlIGpzVGVzdEludGVyZmFjZVByb3RvdHlw ZUZ1bmN0aW9uRW50cmllc0NhbGxlcihKU0dsb2JhbE9iamVjdCosIENhbGxGcmFtZSosIEpTVGVz dEludGVyZmFjZSogdGhpc09iamVjdCwgSlNDOjpUaHJvd1Njb3BlJikKK3sKKyAgICByZXR1cm4g SlNWYWx1ZTo6ZW5jb2RlKGl0ZXJhdG9yQ3JlYXRlPFRlc3RJbnRlcmZhY2VJdGVyYXRvcj4oKnRo aXNPYmplY3QsIEl0ZXJhdGlvbktpbmQ6OktleVZhbHVlKSk7Cit9CisKK0pTQzo6RW5jb2RlZEpT VmFsdWUgSlNDX0hPU1RfQ0FMTCBqc1Rlc3RJbnRlcmZhY2VQcm90b3R5cGVGdW5jdGlvbkVudHJp ZXMoSlNDOjpKU0dsb2JhbE9iamVjdCogbGV4aWNhbEdsb2JhbE9iamVjdCwgSlNDOjpDYWxsRnJh bWUqIGNhbGxGcmFtZSkKK3sKKyAgICByZXR1cm4gSURMT3BlcmF0aW9uPEpTVGVzdEludGVyZmFj ZT46OmNhbGw8anNUZXN0SW50ZXJmYWNlUHJvdG90eXBlRnVuY3Rpb25FbnRyaWVzQ2FsbGVyPigq bGV4aWNhbEdsb2JhbE9iamVjdCwgKmNhbGxGcmFtZSwgImVudHJpZXMiKTsKK30KKworc3RhdGlj IGlubGluZSBFbmNvZGVkSlNWYWx1ZSBqc1Rlc3RJbnRlcmZhY2VQcm90b3R5cGVGdW5jdGlvbktl eXNDYWxsZXIoSlNHbG9iYWxPYmplY3QqLCBDYWxsRnJhbWUqLCBKU1Rlc3RJbnRlcmZhY2UqIHRo aXNPYmplY3QsIEpTQzo6VGhyb3dTY29wZSYpCit7CisgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29k ZShpdGVyYXRvckNyZWF0ZTxUZXN0SW50ZXJmYWNlSXRlcmF0b3I+KCp0aGlzT2JqZWN0LCBJdGVy YXRpb25LaW5kOjpLZXkpKTsKK30KKworSlNDOjpFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxM IGpzVGVzdEludGVyZmFjZVByb3RvdHlwZUZ1bmN0aW9uS2V5cyhKU0M6OkpTR2xvYmFsT2JqZWN0 KiBsZXhpY2FsR2xvYmFsT2JqZWN0LCBKU0M6OkNhbGxGcmFtZSogY2FsbEZyYW1lKQoreworICAg IHJldHVybiBJRExPcGVyYXRpb248SlNUZXN0SW50ZXJmYWNlPjo6Y2FsbDxqc1Rlc3RJbnRlcmZh Y2VQcm90b3R5cGVGdW5jdGlvbktleXNDYWxsZXI+KCpsZXhpY2FsR2xvYmFsT2JqZWN0LCAqY2Fs bEZyYW1lLCAia2V5cyIpOworfQorCitzdGF0aWMgaW5saW5lIEVuY29kZWRKU1ZhbHVlIGpzVGVz dEludGVyZmFjZVByb3RvdHlwZUZ1bmN0aW9uVmFsdWVzQ2FsbGVyKEpTR2xvYmFsT2JqZWN0Kiwg Q2FsbEZyYW1lKiwgSlNUZXN0SW50ZXJmYWNlKiB0aGlzT2JqZWN0LCBKU0M6OlRocm93U2NvcGUm KQoreworICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoaXRlcmF0b3JDcmVhdGU8VGVzdEludGVy ZmFjZUl0ZXJhdG9yPigqdGhpc09iamVjdCwgSXRlcmF0aW9uS2luZDo6VmFsdWUpKTsKK30KKwor SlNDOjpFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGpzVGVzdEludGVyZmFjZVByb3RvdHlw ZUZ1bmN0aW9uVmFsdWVzKEpTQzo6SlNHbG9iYWxPYmplY3QqIGxleGljYWxHbG9iYWxPYmplY3Qs IEpTQzo6Q2FsbEZyYW1lKiBjYWxsRnJhbWUpCit7CisgICAgcmV0dXJuIElETE9wZXJhdGlvbjxK U1Rlc3RJbnRlcmZhY2U+OjpjYWxsPGpzVGVzdEludGVyZmFjZVByb3RvdHlwZUZ1bmN0aW9uVmFs dWVzQ2FsbGVyPigqbGV4aWNhbEdsb2JhbE9iamVjdCwgKmNhbGxGcmFtZSwgInZhbHVlcyIpOwor fQorCitzdGF0aWMgaW5saW5lIEVuY29kZWRKU1ZhbHVlIGpzVGVzdEludGVyZmFjZVByb3RvdHlw ZUZ1bmN0aW9uRm9yRWFjaENhbGxlcihKU0dsb2JhbE9iamVjdCogbGV4aWNhbEdsb2JhbE9iamVj dCwgQ2FsbEZyYW1lKiBjYWxsRnJhbWUsIEpTVGVzdEludGVyZmFjZSogdGhpc09iamVjdCwgSlND OjpUaHJvd1Njb3BlJiB0aHJvd1Njb3BlKQoreworICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUo aXRlcmF0b3JGb3JFYWNoPFRlc3RJbnRlcmZhY2VJdGVyYXRvcj4oKmxleGljYWxHbG9iYWxPYmpl Y3QsICpjYWxsRnJhbWUsICp0aGlzT2JqZWN0LCB0aHJvd1Njb3BlKSk7Cit9CisKK0pTQzo6RW5j b2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBqc1Rlc3RJbnRlcmZhY2VQcm90b3R5cGVGdW5jdGlv bkZvckVhY2goSlNDOjpKU0dsb2JhbE9iamVjdCogbGV4aWNhbEdsb2JhbE9iamVjdCwgSlNDOjpD YWxsRnJhbWUqIGNhbGxGcmFtZSkKK3sKKyAgICByZXR1cm4gSURMT3BlcmF0aW9uPEpTVGVzdElu dGVyZmFjZT46OmNhbGw8anNUZXN0SW50ZXJmYWNlUHJvdG90eXBlRnVuY3Rpb25Gb3JFYWNoQ2Fs bGVyPigqbGV4aWNhbEdsb2JhbE9iamVjdCwgKmNhbGxGcmFtZSwgImZvckVhY2giKTsKK30KKwog dm9pZCBKU1Rlc3RJbnRlcmZhY2U6OmFuYWx5emVIZWFwKEpTQ2VsbCogY2VsbCwgSGVhcEFuYWx5 emVyJiBhbmFseXplcikKIHsKICAgICBhdXRvKiB0aGlzT2JqZWN0ID0ganNDYXN0PEpTVGVzdElu dGVyZmFjZSo+KGNlbGwpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2Ny aXB0cy90ZXN0L0pTL0pTVGVzdEl0ZXJhYmxlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3RJdGVyYWJsZS5jcHAKaW5kZXggNDQ2YzBkZmJmYzc4MmQ1 M2JiZWJjNTcwYjNlOWM0ZTY0YjRiYTllZC4uZGQzOTgyNGZlNWZlYzc1NmYzYTdjYjQ3MjE0ZGJl Mjg0YjE2ZjQwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90 ZXN0L0pTL0pTVGVzdEl0ZXJhYmxlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9z Y3JpcHRzL3Rlc3QvSlMvSlNUZXN0SXRlcmFibGUuY3BwCkBAIC0yNCwxMCArMjQsMTIgQEAKICNp bmNsdWRlICJBY3RpdmVET01PYmplY3QuaCIKICNpbmNsdWRlICJKU0RPTUJpbmRpbmcuaCIKICNp bmNsdWRlICJKU0RPTUNvbnN0cnVjdG9yTm90Q29uc3RydWN0YWJsZS5oIgorI2luY2x1ZGUgIkpT RE9NQ29udmVydEludGVyZmFjZS5oIgogI2luY2x1ZGUgIkpTRE9NRXhjZXB0aW9uSGFuZGxpbmcu aCIKICNpbmNsdWRlICJKU0RPTUl0ZXJhdG9yLmgiCiAjaW5jbHVkZSAiSlNET01PcGVyYXRpb24u aCIKICNpbmNsdWRlICJKU0RPTVdyYXBwZXJDYWNoZS5oIgorI2luY2x1ZGUgIkpTVGVzdE5vZGUu aCIKICNpbmNsdWRlICJTY3JpcHRFeGVjdXRpb25Db250ZXh0LmgiCiAjaW5jbHVkZSA8SmF2YVNj cmlwdENvcmUvQnVpbHRpbk5hbWVzLmg+CiAjaW5jbHVkZSA8SmF2YVNjcmlwdENvcmUvRnVuY3Rp b25Qcm90b3R5cGUuaD4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Njcmlw dHMvdGVzdC9KUy9KU1Rlc3ROb2RlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Njcmlw dHMvdGVzdC9KUy9KU1Rlc3ROb2RlLmNwcAppbmRleCAzOTI1YzQyYmI5ODY5MDg0ZDUwZTcxZDUw YThmOTQ3ZTAxZTFlZDgzLi43YzMzNzEyMThjOWM2YTg3ZWI0MGNkOWRjMjk2ZGM1MDQzZDU2Mzky IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNU ZXN0Tm9kZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pT L0pTVGVzdE5vZGUuY3BwCkBAIC0zMyw2ICszMyw3IEBACiAjaW5jbHVkZSAiSlNET01PcGVyYXRp b24uaCIKICNpbmNsdWRlICJKU0RPTU9wZXJhdGlvblJldHVybmluZ1Byb21pc2UuaCIKICNpbmNs dWRlICJKU0RPTVdyYXBwZXJDYWNoZS5oIgorI2luY2x1ZGUgIkpTVGVzdE5vZGUuaCIKICNpbmNs dWRlICJSdW50aW1lRW5hYmxlZEZlYXR1cmVzLmgiCiAjaW5jbHVkZSAiU2NyaXB0RXhlY3V0aW9u Q29udGV4dC5oIgogI2luY2x1ZGUgPEphdmFTY3JpcHRDb3JlL0J1aWx0aW5OYW1lcy5oPgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Rlc3RJbnRlcmZh Y2UuaWRsIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Rlc3RJbnRlcmZh Y2UuaWRsCmluZGV4IDU3OGE0NTMyOGM4ZTc2YWJjMmZjM2FjYTE2M2ZiODAxZGYzNjIzZGEuLjJm YmJiOGY3NTUyMTM2NDkzZjRhYjM2NGI4NTUyMTE3N2JiOTM5MzkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9UZXN0SW50ZXJmYWNlLmlkbAorKysgYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVGVzdEludGVyZmFjZS5pZGwKQEAg LTM4LDYgKzM4LDcgQEAKICAgICBFeHBvcnRNYWNybz1XRUJDT1JFX0VYUE9SVCwKICAgICBJbXBs ZW1lbnRhdGlvbkxhY2tzVlRhYmxlCiBdIGludGVyZmFjZSBUZXN0SW50ZXJmYWNlIHsKKyAgICBp dGVyYWJsZTxUZXN0Tm9kZSwgVGVzdE9iaj47CiB9OwogCiBUZXN0SW50ZXJmYWNlIGltcGxlbWVu dHMgVGVzdEltcGxlbWVudHM7Cg==