239056 2022-04-10 18:26:10 -0700 [WebGPU] Make sure asynchronous things are asynchronous 2022-04-11 17:31:16 -0700 1 1 1 Unclassified WebKit WebGPU WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 239057 1 mmaxfield mmaxfield dino djg kkinnunen webkit-bug-importer oldest_to_newest 1860175 0 mmaxfield 2022-04-10 18:26:10 -0700 . 1860176 1 457218 mmaxfield 2022-04-10 18:29:22 -0700 Created attachment 457218 Patch 1860497 2 mmaxfield 2022-04-11 17:30:33 -0700 Committed r292747 (249531@trunk): <https://commits.webkit.org/249531@trunk> 1860498 3 webkit-bug-importer 2022-04-11 17:31:16 -0700 <rdar://problem/91598420> 457218 2022-04-10 18:29:22 -0700 2022-04-11 01:21:16 -0700 Patch patch.diff text/plain 11762 mmaxfield Y29tbWl0IGMwOTM0ZDNhOWY0YWZlMDJlYWE5ZWMyMWUzMzFjY2ViNDJiZmI0NjcKQXV0aG9yOiBN eWxlcyBDLiBNYXhmaWVsZCA8bW1heGZpZWxkQGFwcGxlLmNvbT4KRGF0ZTogICBTdW4gQXByIDEw IDE4OjI4OjQyIDIwMjIgLTA3MDAKCiAgICBBc3luY2hyb25vdXMgdGhpbmdzCgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkdQVS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViR1BVL0NoYW5nZUxvZwppbmRl eCA2ZTZmOGE5NDBlYjMuLjg3YjkyODFkNDdhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkdQVS9D aGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkdQVS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMSBAQAor MjAyMi0wNC0xMCAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgorCisg ICAgICAgIFtXZWJHUFVdIE1ha2Ugc3VyZSBhc3luY2hyb25vdXMgdGhpbmdzIGFyZSBhc3luY2hy b25vdXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIz OTA1NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRo aXMgaXNuJ3Qgc3RyaWN0bHkgbmVjZXNzYXJ5LCBiZWNhdXNlIHRoZXNlIGFzeW5jaHJvbm91cyBj YWxsYmFja3MgZ2V0IGhvb2tlZCB1cAorICAgICAgICB0byBwcm9taXNlcyBpbiB0aGUgYnJvd3Nl ciB3aGljaCBvbmx5IGNhbGwgdGhlaXIgY2FsbGJhY2tzIGF0IG1pY3JvdGFzayBib3VuZGFyaWVz LgorICAgICAgICBIb3dldmVyLCBmb3IgbmF0aXZlIGNvZGUgdGhhdCB1c2VzIFdlYkdQVS5mcmFt ZXdvcmssIGl0J3MgcHJvYmFibHkgYmV0dGVyIHRvIG1ha2UKKyAgICAgICAgc3VyZSB0aGUgYXN5 bmNocm9ub3VzIGNhbGxiYWNrcyBhcmUgYWN0dWFsbHkgYXN5bmNocm9ub3VzLgorCisgICAgICAg ICogV2ViR1BVL0FkYXB0ZXIubW06CisgICAgICAgIChXZWJHUFU6OkFkYXB0ZXI6OnJlcXVlc3RE ZXZpY2UpOgorICAgICAgICAqIFdlYkdQVS9CdWZmZXIubW06CisgICAgICAgIChXZWJHUFU6OkJ1 ZmZlcjo6bWFwQXN5bmMpOgorICAgICAgICAqIFdlYkdQVS9Db21wdXRlUGlwZWxpbmUubW06Cisg ICAgICAgIChXZWJHUFU6OkRldmljZTo6Y3JlYXRlQ29tcHV0ZVBpcGVsaW5lQXN5bmMpOgorICAg ICAgICAqIFdlYkdQVS9EZXZpY2UubW06CisgICAgICAgIChXZWJHUFU6OkRldmljZTo6bG9zZVRo ZURldmljZSk6CisgICAgICAgIChXZWJHUFU6OkRldmljZTo6cG9wRXJyb3JTY29wZSk6CisgICAg ICAgICogV2ViR1BVL0luc3RhbmNlLm1tOgorICAgICAgICAoV2ViR1BVOjpJbnN0YW5jZTo6cmVx dWVzdEFkYXB0ZXIpOgorICAgICAgICAqIFdlYkdQVS9SZW5kZXJQaXBlbGluZS5tbToKKyAgICAg ICAgKFdlYkdQVTo6RGV2aWNlOjpjcmVhdGVSZW5kZXJQaXBlbGluZUFzeW5jKToKKyAgICAgICAg KiBXZWJHUFUvU2hhZGVyTW9kdWxlLm1tOgorICAgICAgICAoV2ViR1BVOjpTaGFkZXJNb2R1bGU6 OmdldENvbXBpbGF0aW9uSW5mbyk6CisKIDIwMjItMDQtMTAgIE15bGVzIEMuIE1heGZpZWxkICA8 bW1heGZpZWxkQGFwcGxlLmNvbT4KIAogICAgICAgICBbV2ViR1BVXSBSR0I5RTVVZmxvYXQgdGV4 dHVyZXMgc2hvdWxkIG5vdCBiZSBtdWx0aXNhbXBsYWJsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkdQVS9XZWJHUFUvQWRhcHRlci5tbSBiL1NvdXJjZS9XZWJHUFUvV2ViR1BVL0FkYXB0ZXIubW0K aW5kZXggODJkZWFkMjkzYzk1Li4xNmJkYjZmMTJmMDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJH UFUvV2ViR1BVL0FkYXB0ZXIubW0KKysrIGIvU291cmNlL1dlYkdQVS9XZWJHUFUvQWRhcHRlci5t bQpAQCAtMTE0LDIxICsxMTQsMzAgQEAgc3RhdGljIGJvb2wgZGV2aWNlTWVldHNSZXF1aXJlZExp bWl0cyhpZDxNVExEZXZpY2U+LCBjb25zdCBXR1BVUmVxdWlyZWRMaW1pdHMmIHIKIHZvaWQgQWRh cHRlcjo6cmVxdWVzdERldmljZShjb25zdCBXR1BVRGV2aWNlRGVzY3JpcHRvciYgZGVzY3JpcHRv ciwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChXR1BVUmVxdWVzdERldmljZVN0YXR1cywgUmVmPERl dmljZT4mJiwgU3RyaW5nJiYpPiYmIGNhbGxiYWNrKQogewogICAgIGlmIChkZXNjcmlwdG9yLm5l eHRJbkNoYWluKSB7Ci0gICAgICAgIGNhbGxiYWNrKFdHUFVSZXF1ZXN0RGV2aWNlU3RhdHVzX0Vy cm9yLCBEZXZpY2U6OmNyZWF0ZUludmFsaWQoKnRoaXMpLCAiVW5rbm93biBkZXNjcmlwdG9yIHR5 cGUiX3MpOworICAgICAgICBpbnN0YW5jZSgpLnNjaGVkdWxlV29yayhbc3Ryb25nVGhpcyA9IFJl ZiB7ICp0aGlzIH0sIGNhbGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayldKCkgbXV0YWJsZSB7Cisg ICAgICAgICAgICBjYWxsYmFjayhXR1BVUmVxdWVzdERldmljZVN0YXR1c19FcnJvciwgRGV2aWNl OjpjcmVhdGVJbnZhbGlkKHN0cm9uZ1RoaXMpLCAiVW5rbm93biBkZXNjcmlwdG9yIHR5cGUiX3Mp OworICAgICAgICB9KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAogICAgIGlmIChkZXNjcmlw dG9yLnJlcXVpcmVkRmVhdHVyZXNDb3VudCkgewotICAgICAgICBjYWxsYmFjayhXR1BVUmVxdWVz dERldmljZVN0YXR1c19FcnJvciwgRGV2aWNlOjpjcmVhdGVJbnZhbGlkKCp0aGlzKSwgIkRldmlj ZSBkb2VzIG5vdCBzdXBwb3J0IHJlcXVlc3RlZCBmZWF0dXJlcyJfcyk7CisgICAgICAgIGluc3Rh bmNlKCkuc2NoZWR1bGVXb3JrKFtzdHJvbmdUaGlzID0gUmVmIHsgKnRoaXMgfSwgY2FsbGJhY2sg PSBXVEZNb3ZlKGNhbGxiYWNrKV0oKSBtdXRhYmxlIHsKKyAgICAgICAgICAgIGNhbGxiYWNrKFdH UFVSZXF1ZXN0RGV2aWNlU3RhdHVzX0Vycm9yLCBEZXZpY2U6OmNyZWF0ZUludmFsaWQoc3Ryb25n VGhpcyksICJEZXZpY2UgZG9lcyBub3Qgc3VwcG9ydCByZXF1ZXN0ZWQgZmVhdHVyZXMiX3MpOwor ICAgICAgICB9KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAogICAgIGlmIChkZXNjcmlwdG9y LnJlcXVpcmVkTGltaXRzICYmICFkZXZpY2VNZWV0c1JlcXVpcmVkTGltaXRzKG1fZGV2aWNlLCAq ZGVzY3JpcHRvci5yZXF1aXJlZExpbWl0cykpIHsKLSAgICAgICAgY2FsbGJhY2soV0dQVVJlcXVl c3REZXZpY2VTdGF0dXNfRXJyb3IsIERldmljZTo6Y3JlYXRlSW52YWxpZCgqdGhpcyksICJEZXZp Y2UgZG9lcyBub3Qgc3VwcG9ydCByZXF1ZXN0ZWQgbGltaXRzIl9zKTsKKyAgICAgICAgaW5zdGFu Y2UoKS5zY2hlZHVsZVdvcmsoW3N0cm9uZ1RoaXMgPSBSZWYgeyAqdGhpcyB9LCBjYWxsYmFjayA9 IFdURk1vdmUoY2FsbGJhY2spXSgpIG11dGFibGUgeworICAgICAgICAgICAgY2FsbGJhY2soV0dQ VVJlcXVlc3REZXZpY2VTdGF0dXNfRXJyb3IsIERldmljZTo6Y3JlYXRlSW52YWxpZChzdHJvbmdU aGlzKSwgIkRldmljZSBkb2VzIG5vdCBzdXBwb3J0IHJlcXVlc3RlZCBsaW1pdHMiX3MpOworICAg ICAgICB9KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIGNhbGxiYWNrKFdHUFVSZXF1 ZXN0RGV2aWNlU3RhdHVzX1N1Y2Nlc3MsIERldmljZTo6Y3JlYXRlKG1fZGV2aWNlLCBTdHJpbmc6 OmZyb21MYXRpbjEoZGVzY3JpcHRvci5sYWJlbCksICp0aGlzKSwgeyB9KTsKKyAgICBhdXRvIGxh YmVsID0gU3RyaW5nOjpmcm9tTGF0aW4xKGRlc2NyaXB0b3IubGFiZWwpOworICAgIGluc3RhbmNl KCkuc2NoZWR1bGVXb3JrKFtzdHJvbmdUaGlzID0gUmVmIHsgKnRoaXMgfSwgbGFiZWwgPSBXVEZN b3ZlKGxhYmVsKSwgY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKV0oKSBtdXRhYmxlIHsKKyAg ICAgICAgY2FsbGJhY2soV0dQVVJlcXVlc3REZXZpY2VTdGF0dXNfU3VjY2VzcywgRGV2aWNlOjpj cmVhdGUoc3Ryb25nVGhpcy0+bV9kZXZpY2UsIFdURk1vdmUobGFiZWwpLCBzdHJvbmdUaGlzKSwg eyB9KTsKKyAgICB9KTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViR1BVCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViR1BVL1dlYkdQVS9CdWZmZXIubW0gYi9Tb3VyY2UvV2ViR1BVL1dlYkdQVS9CdWZm ZXIubW0KaW5kZXggMDdmZjdlZTM2NjFlLi5iYTJjYTMxYzg3YTUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJHUFUvV2ViR1BVL0J1ZmZlci5tbQorKysgYi9Tb3VyY2UvV2ViR1BVL1dlYkdQVS9CdWZm ZXIubW0KQEAgLTI1Miw3ICsyNTIsOSBAQCB2b2lkIEJ1ZmZlcjo6bWFwQXN5bmMoV0dQVU1hcE1v ZGVGbGFncyBtb2RlLCBzaXplX3Qgb2Zmc2V0LCBzaXplX3Qgc2l6ZSwgQ29tcGxldAogICAgIGlm ICghdmFsaWRhdGVNYXBBc3luYyhtb2RlLCBvZmZzZXQsIHJhbmdlU2l6ZSkpIHsKICAgICAgICAg bV9kZXZpY2UtPmdlbmVyYXRlQVZhbGlkYXRpb25FcnJvcigiVmFsaWRhdGlvbiBmYWlsdXJlLiJf cyk7CiAKLSAgICAgICAgY2FsbGJhY2soV0dQVUJ1ZmZlck1hcEFzeW5jU3RhdHVzX0Vycm9yKTsK KyAgICAgICAgbV9kZXZpY2UtPmluc3RhbmNlKCkuc2NoZWR1bGVXb3JrKFtjYWxsYmFjayA9IFdU Rk1vdmUoY2FsbGJhY2spXSgpIG11dGFibGUgeworICAgICAgICAgICAgY2FsbGJhY2soV0dQVUJ1 ZmZlck1hcEFzeW5jU3RhdHVzX0Vycm9yKTsKKyAgICAgICAgfSk7CiAgICAgICAgIHJldHVybjsK ICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJHUFUvV2ViR1BVL0NvbXB1dGVQaXBlbGlu ZS5tbSBiL1NvdXJjZS9XZWJHUFUvV2ViR1BVL0NvbXB1dGVQaXBlbGluZS5tbQppbmRleCA3MjRh ZGFmZWE0OTAuLjJhMjA5ZGYzNmVhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkdQVS9XZWJHUFUv Q29tcHV0ZVBpcGVsaW5lLm1tCisrKyBiL1NvdXJjZS9XZWJHUFUvV2ViR1BVL0NvbXB1dGVQaXBl bGluZS5tbQpAQCAtMTcyLDcgKzE3Miw5IEBAIHZvaWQgRGV2aWNlOjpjcmVhdGVDb21wdXRlUGlw ZWxpbmVBc3luYyhjb25zdCBXR1BVQ29tcHV0ZVBpcGVsaW5lRGVzY3JpcHRvciYgZGVzCiB7CiAg ICAgLy8gRklYTUU6IEltcGxlbWVudCB0aGlzCiAgICAgVU5VU0VEX1BBUkFNKGRlc2NyaXB0b3Ip OwotICAgIGNhbGxiYWNrKFdHUFVDcmVhdGVQaXBlbGluZUFzeW5jU3RhdHVzX0Vycm9yLCBDb21w dXRlUGlwZWxpbmU6OmNyZWF0ZUludmFsaWQoKnRoaXMpLCB7IH0pOworICAgIGluc3RhbmNlKCku c2NoZWR1bGVXb3JrKFtzdHJvbmdUaGlzID0gUmVmIHsgKnRoaXMgfSwgY2FsbGJhY2sgPSBXVEZN b3ZlKGNhbGxiYWNrKV0oKSBtdXRhYmxlIHsKKyAgICAgICAgY2FsbGJhY2soV0dQVUNyZWF0ZVBp cGVsaW5lQXN5bmNTdGF0dXNfRXJyb3IsIENvbXB1dGVQaXBlbGluZTo6Y3JlYXRlSW52YWxpZChz dHJvbmdUaGlzKSwgeyB9KTsKKyAgICB9KTsKIH0KIAogQ29tcHV0ZVBpcGVsaW5lOjpDb21wdXRl UGlwZWxpbmUoaWQ8TVRMQ29tcHV0ZVBpcGVsaW5lU3RhdGU+IGNvbXB1dGVQaXBlbGluZVN0YXRl LCBEZXZpY2UmIGRldmljZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJHUFUvV2ViR1BVL0Rldmlj ZS5tbSBiL1NvdXJjZS9XZWJHUFUvV2ViR1BVL0RldmljZS5tbQppbmRleCBmYzFjNzkzNDQ5ZmEu LjM1MTZlZGM4YTQ2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkdQVS9XZWJHUFUvRGV2aWNlLm1t CisrKyBiL1NvdXJjZS9XZWJHUFUvV2ViR1BVL0RldmljZS5tbQpAQCAtMTE1LDggKzExNSwxMSBA QCB2b2lkIERldmljZTo6bG9zZVRoZURldmljZShXR1BVRGV2aWNlTG9zdFJlYXNvbiByZWFzb24p CiAKICAgICBtYWtlSW52YWxpZCgpOwogCi0gICAgaWYgKG1fZGV2aWNlTG9zdENhbGxiYWNrKQot ICAgICAgICBtX2RldmljZUxvc3RDYWxsYmFjayhyZWFzb24sICJEZXZpY2UgbG9zdC4iX3MpOwor ICAgIGlmIChtX2RldmljZUxvc3RDYWxsYmFjaykgeworICAgICAgICBpbnN0YW5jZSgpLnNjaGVk dWxlV29yayhbZGV2aWNlTG9zdENhbGxiYWNrID0gV1RGTW92ZShtX2RldmljZUxvc3RDYWxsYmFj ayksIHJlYXNvbl0oKSB7CisgICAgICAgICAgICBkZXZpY2VMb3N0Q2FsbGJhY2socmVhc29uLCAi RGV2aWNlIGxvc3QuIl9zKTsKKyAgICAgICAgfSk7CisgICAgfQogCiAgICAgLy8gRklYTUU6IFRo ZSBzcGVjIGRvZXNuJ3QgYWN0dWFsbHkgc2F5IHRvIGRvIHRoaXMsIGJ1dCBpdCdzIHByZXR0eSBp bXBvcnRhbnQgYmVjYXVzZQogICAgIC8vIHRoZSB0b3RhbCBudW1iZXIgb2YgY29tbWFuZCBxdWV1 ZXMgYWxpdmUgYXQgYSB0aW1lIGlzIGxpbWl0ZWQgdG8gYSBwcmV0dHkgbG93IGxpbWl0LgpAQCAt MjA2LDcgKzIwOSw5IEBAIGJvb2wgRGV2aWNlOjpwb3BFcnJvclNjb3BlKENvbXBsZXRpb25IYW5k bGVyPHZvaWQoV0dQVUVycm9yVHlwZSwgU3RyaW5nJiYpPiYmIGNhCiAgICAgLy8gaHR0cHM6Ly9n cHV3ZWIuZ2l0aHViLmlvL2dwdXdlYi8jZG9tLWdwdWRldmljZS1wb3BlcnJvcnNjb3BlCiAKICAg ICBpZiAoIXZhbGlkYXRlUG9wRXJyb3JTY29wZSgpKSB7Ci0gICAgICAgIGNhbGxiYWNrKFdHUFVF cnJvclR5cGVfVW5rbm93biwgInBvcEVycm9yU2NvcGUoKSBmYWlsZWQgdmFsaWRhdGlvbi4iX3Mp OworICAgICAgICBpbnN0YW5jZSgpLnNjaGVkdWxlV29yayhbY2FsbGJhY2sgPSBXVEZNb3ZlKGNh bGxiYWNrKV0oKSBtdXRhYmxlIHsKKyAgICAgICAgICAgIGNhbGxiYWNrKFdHUFVFcnJvclR5cGVf VW5rbm93biwgInBvcEVycm9yU2NvcGUoKSBmYWlsZWQgdmFsaWRhdGlvbi4iX3MpOworICAgICAg ICB9KTsKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkdQVS9XZWJHUFUvSW5zdGFuY2UubW0gYi9Tb3VyY2UvV2ViR1BVL1dlYkdQVS9JbnN0YW5j ZS5tbQppbmRleCA5YjI0Nzk1OWM3ZTkuLjhlYzA2MjY2YjM0MCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkdQVS9XZWJHUFUvSW5zdGFuY2UubW0KKysrIGIvU291cmNlL1dlYkdQVS9XZWJHUFUvSW5z dGFuY2UubW0KQEAgLTE0OSwzMSArMTQ5LDQzIEBAIHZvaWQgSW5zdGFuY2U6OnJlcXVlc3RBZGFw dGVyKGNvbnN0IFdHUFVSZXF1ZXN0QWRhcHRlck9wdGlvbnMmIG9wdGlvbnMsIENvbXBsZXRpCiAg ICAgYXV0byBzb3J0ZWREZXZpY2VzID0gV2ViR1BVOjpzb3J0ZWREZXZpY2VzKGRldmljZXMsIG9w dGlvbnMucG93ZXJQcmVmZXJlbmNlKTsKIAogICAgIGlmIChvcHRpb25zLm5leHRJbkNoYWluKSB7 Ci0gICAgICAgIGNhbGxiYWNrKFdHUFVSZXF1ZXN0QWRhcHRlclN0YXR1c19FcnJvciwgQWRhcHRl cjo6Y3JlYXRlSW52YWxpZCgqdGhpcyksICJVbmtub3duIGRlc2NyaXB0b3IgdHlwZSJfcyk7Cisg ICAgICAgIHNjaGVkdWxlV29yayhbc3Ryb25nVGhpcyA9IFJlZiB7ICp0aGlzIH0sIGNhbGxiYWNr ID0gV1RGTW92ZShjYWxsYmFjayldKCkgbXV0YWJsZSB7CisgICAgICAgICAgICBjYWxsYmFjayhX R1BVUmVxdWVzdEFkYXB0ZXJTdGF0dXNfRXJyb3IsIEFkYXB0ZXI6OmNyZWF0ZUludmFsaWQoc3Ry b25nVGhpcyksICJVbmtub3duIGRlc2NyaXB0b3IgdHlwZSJfcyk7CisgICAgICAgIH0pOwogICAg ICAgICByZXR1cm47CiAgICAgfQogCiAgICAgaWYgKG9wdGlvbnMuZm9yY2VGYWxsYmFja0FkYXB0 ZXIpIHsKLSAgICAgICAgY2FsbGJhY2soV0dQVVJlcXVlc3RBZGFwdGVyU3RhdHVzX1VuYXZhaWxh YmxlLCBBZGFwdGVyOjpjcmVhdGVJbnZhbGlkKCp0aGlzKSwgIk5vIGFkYXB0ZXJzIHByZXNlbnQi X3MpOworICAgICAgICBzY2hlZHVsZVdvcmsoW3N0cm9uZ1RoaXMgPSBSZWYgeyAqdGhpcyB9LCBj YWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2spXSgpIG11dGFibGUgeworICAgICAgICAgICAgY2Fs bGJhY2soV0dQVVJlcXVlc3RBZGFwdGVyU3RhdHVzX1VuYXZhaWxhYmxlLCBBZGFwdGVyOjpjcmVh dGVJbnZhbGlkKHN0cm9uZ1RoaXMpLCAiTm8gYWRhcHRlcnMgcHJlc2VudCJfcyk7CisgICAgICAg IH0pOwogICAgICAgICByZXR1cm47CiAgICAgfQogCiAgICAgaWYgKCFzb3J0ZWREZXZpY2VzKSB7 Ci0gICAgICAgIGNhbGxiYWNrKFdHUFVSZXF1ZXN0QWRhcHRlclN0YXR1c19FcnJvciwgQWRhcHRl cjo6Y3JlYXRlSW52YWxpZCgqdGhpcyksICJVbmtub3duIHBvd2VyIHByZWZlcmVuY2UiX3MpOwor ICAgICAgICBzY2hlZHVsZVdvcmsoW3N0cm9uZ1RoaXMgPSBSZWYgeyAqdGhpcyB9LCBjYWxsYmFj ayA9IFdURk1vdmUoY2FsbGJhY2spXSgpIG11dGFibGUgeworICAgICAgICAgICAgY2FsbGJhY2so V0dQVVJlcXVlc3RBZGFwdGVyU3RhdHVzX0Vycm9yLCBBZGFwdGVyOjpjcmVhdGVJbnZhbGlkKHN0 cm9uZ1RoaXMpLCAiVW5rbm93biBwb3dlciBwcmVmZXJlbmNlIl9zKTsKKyAgICAgICAgfSk7CiAg ICAgICAgIHJldHVybjsKICAgICB9CiAKICAgICBpZiAoIXNvcnRlZERldmljZXMuY291bnQpIHsK LSAgICAgICAgY2FsbGJhY2soV0dQVVJlcXVlc3RBZGFwdGVyU3RhdHVzX1VuYXZhaWxhYmxlLCBB ZGFwdGVyOjpjcmVhdGVJbnZhbGlkKCp0aGlzKSwgIk5vIGFkYXB0ZXJzIHByZXNlbnQiX3MpOwor ICAgICAgICBzY2hlZHVsZVdvcmsoW3N0cm9uZ1RoaXMgPSBSZWYgeyAqdGhpcyB9LCBjYWxsYmFj ayA9IFdURk1vdmUoY2FsbGJhY2spXSgpIG11dGFibGUgeworICAgICAgICAgICAgY2FsbGJhY2so V0dQVVJlcXVlc3RBZGFwdGVyU3RhdHVzX1VuYXZhaWxhYmxlLCBBZGFwdGVyOjpjcmVhdGVJbnZh bGlkKHN0cm9uZ1RoaXMpLCAiTm8gYWRhcHRlcnMgcHJlc2VudCJfcyk7CisgICAgICAgIH0pOwog ICAgICAgICByZXR1cm47CiAgICAgfQogCiAgICAgaWYgKCFzb3J0ZWREZXZpY2VzWzBdKSB7Ci0g ICAgICAgIGNhbGxiYWNrKFdHUFVSZXF1ZXN0QWRhcHRlclN0YXR1c19FcnJvciwgQWRhcHRlcjo6 Y3JlYXRlSW52YWxpZCgqdGhpcyksICJBZGFwdGVyIGlzIGludGVybmFsbHkgbnVsbCJfcyk7Cisg ICAgICAgIHNjaGVkdWxlV29yayhbc3Ryb25nVGhpcyA9IFJlZiB7ICp0aGlzIH0sIGNhbGxiYWNr ID0gV1RGTW92ZShjYWxsYmFjayldKCkgbXV0YWJsZSB7CisgICAgICAgICAgICBjYWxsYmFjayhX R1BVUmVxdWVzdEFkYXB0ZXJTdGF0dXNfRXJyb3IsIEFkYXB0ZXI6OmNyZWF0ZUludmFsaWQoc3Ry b25nVGhpcyksICJBZGFwdGVyIGlzIGludGVybmFsbHkgbnVsbCJfcyk7CisgICAgICAgIH0pOwog ICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgY2FsbGJhY2soV0dQVVJlcXVlc3RBZGFwdGVy U3RhdHVzX1N1Y2Nlc3MsIEFkYXB0ZXI6OmNyZWF0ZShzb3J0ZWREZXZpY2VzWzBdLCAqdGhpcyks IHsgfSk7CisgICAgc2NoZWR1bGVXb3JrKFtzdHJvbmdUaGlzID0gUmVmIHsgKnRoaXMgfSwgZGV2 aWNlID0gc29ydGVkRGV2aWNlc1swXSwgY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKV0oKSBt dXRhYmxlIHsKKyAgICAgICAgY2FsbGJhY2soV0dQVVJlcXVlc3RBZGFwdGVyU3RhdHVzX1N1Y2Nl c3MsIEFkYXB0ZXI6OmNyZWF0ZShkZXZpY2UsIHN0cm9uZ1RoaXMpLCB7IH0pOworICAgIH0pOwog fQogCiB9IC8vIG5hbWVzcGFjZSBXZWJHUFUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJHUFUvV2Vi R1BVL1JlbmRlclBpcGVsaW5lLm1tIGIvU291cmNlL1dlYkdQVS9XZWJHUFUvUmVuZGVyUGlwZWxp bmUubW0KaW5kZXggZTRlZDIzMGFkZDFhLi4yNzE2MDk4Y2NiNzUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJHUFUvV2ViR1BVL1JlbmRlclBpcGVsaW5lLm1tCisrKyBiL1NvdXJjZS9XZWJHUFUvV2Vi R1BVL1JlbmRlclBpcGVsaW5lLm1tCkBAIC00Miw3ICs0Miw5IEBAIHZvaWQgRGV2aWNlOjpjcmVh dGVSZW5kZXJQaXBlbGluZUFzeW5jKGNvbnN0IFdHUFVSZW5kZXJQaXBlbGluZURlc2NyaXB0b3Im IGRlc2NyCiB7CiAgICAgLy8gRklYTUU6IEltcGxlbWVudCB0aGlzLgogICAgIFVOVVNFRF9QQVJB TShkZXNjcmlwdG9yKTsKLSAgICBjYWxsYmFjayhXR1BVQ3JlYXRlUGlwZWxpbmVBc3luY1N0YXR1 c19FcnJvciwgUmVuZGVyUGlwZWxpbmU6OmNyZWF0ZUludmFsaWQoKnRoaXMpLCB7IH0pOworICAg IGluc3RhbmNlKCkuc2NoZWR1bGVXb3JrKFtzdHJvbmdUaGlzID0gUmVmIHsgKnRoaXMgfSwgY2Fs bGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKV0oKSBtdXRhYmxlIHsKKyAgICAgICAgY2FsbGJhY2so V0dQVUNyZWF0ZVBpcGVsaW5lQXN5bmNTdGF0dXNfRXJyb3IsIFJlbmRlclBpcGVsaW5lOjpjcmVh dGVJbnZhbGlkKHN0cm9uZ1RoaXMpLCB7IH0pOworICAgIH0pOwogfQogCiBSZW5kZXJQaXBlbGlu ZTo6UmVuZGVyUGlwZWxpbmUoaWQ8TVRMUmVuZGVyUGlwZWxpbmVTdGF0ZT4gcmVuZGVyUGlwZWxp bmVTdGF0ZSwgRGV2aWNlJiBkZXZpY2UpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViR1BVL1dlYkdQ VS9TaGFkZXJNb2R1bGUubW0gYi9Tb3VyY2UvV2ViR1BVL1dlYkdQVS9TaGFkZXJNb2R1bGUubW0K aW5kZXggMWIzNWFmZmUyOWNlLi4xMGQwNmQwODNlZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJH UFUvV2ViR1BVL1NoYWRlck1vZHVsZS5tbQorKysgYi9Tb3VyY2UvV2ViR1BVL1dlYkdQVS9TaGFk ZXJNb2R1bGUubW0KQEAgLTIwNyw3ICsyMDcsOSBAQCB2b2lkIFNoYWRlck1vZHVsZTo6Z2V0Q29t cGlsYXRpb25JbmZvKENvbXBsZXRpb25IYW5kbGVyPHZvaWQoV0dQVUNvbXBpbGF0aW9uSW5mbwog ICAgICAgICAgICAgc3RhdGljX2Nhc3Q8dWludDMyX3Q+KGNvbXBpbGF0aW9uTWVzc2FnZURhdGEu Y29tcGlsYXRpb25NZXNzYWdlcy5zaXplKCkpLAogICAgICAgICAgICAgY29tcGlsYXRpb25NZXNz YWdlRGF0YS5jb21waWxhdGlvbk1lc3NhZ2VzLmRhdGEoKSwKICAgICAgICAgfTsKLSAgICAgICAg Y2FsbGJhY2soV0dQVUNvbXBpbGF0aW9uSW5mb1JlcXVlc3RTdGF0dXNfU3VjY2VzcywgY29tcGls YXRpb25JbmZvKTsKKyAgICAgICAgbV9kZXZpY2UtPmluc3RhbmNlKCkuc2NoZWR1bGVXb3JrKFtj b21waWxhdGlvbkluZm8gPSBXVEZNb3ZlKGNvbXBpbGF0aW9uSW5mbyksIGNhbGxiYWNrID0gV1RG TW92ZShjYWxsYmFjayldKCkgbXV0YWJsZSB7CisgICAgICAgICAgICBjYWxsYmFjayhXR1BVQ29t cGlsYXRpb25JbmZvUmVxdWVzdFN0YXR1c19TdWNjZXNzLCBjb21waWxhdGlvbkluZm8pOworICAg ICAgICB9KTsKICAgICB9LCBbJl0oY29uc3QgV0dTTDo6RmFpbGVkQ2hlY2smIGZhaWxlZENoZWNr KSB7CiAgICAgICAgIGF1dG8gY29tcGlsYXRpb25NZXNzYWdlRGF0YShjb252ZXJ0TWVzc2FnZXMo CiAgICAgICAgICAgICB7IGZhaWxlZENoZWNrLmVycm9ycywgV0dQVUNvbXBpbGF0aW9uTWVzc2Fn ZVR5cGVfRXJyb3IgfSwKQEAgLTIxNyw3ICsyMTksOSBAQCB2b2lkIFNoYWRlck1vZHVsZTo6Z2V0 Q29tcGlsYXRpb25JbmZvKENvbXBsZXRpb25IYW5kbGVyPHZvaWQoV0dQVUNvbXBpbGF0aW9uSW5m bwogICAgICAgICAgICAgc3RhdGljX2Nhc3Q8dWludDMyX3Q+KGNvbXBpbGF0aW9uTWVzc2FnZURh dGEuY29tcGlsYXRpb25NZXNzYWdlcy5zaXplKCkpLAogICAgICAgICAgICAgY29tcGlsYXRpb25N ZXNzYWdlRGF0YS5jb21waWxhdGlvbk1lc3NhZ2VzLmRhdGEoKSwKICAgICAgICAgfTsKLSAgICAg ICAgY2FsbGJhY2soV0dQVUNvbXBpbGF0aW9uSW5mb1JlcXVlc3RTdGF0dXNfRXJyb3IsIGNvbXBp bGF0aW9uSW5mbyk7CisgICAgICAgIG1fZGV2aWNlLT5pbnN0YW5jZSgpLnNjaGVkdWxlV29yayhb Y29tcGlsYXRpb25JbmZvID0gV1RGTW92ZShjb21waWxhdGlvbkluZm8pLCBjYWxsYmFjayA9IFdU Rk1vdmUoY2FsbGJhY2spXSgpIG11dGFibGUgeworICAgICAgICAgICAgY2FsbGJhY2soV0dQVUNv bXBpbGF0aW9uSW5mb1JlcXVlc3RTdGF0dXNfRXJyb3IsIGNvbXBpbGF0aW9uSW5mbyk7CisgICAg ICAgIH0pOwogICAgIH0sIFtdKHN0ZDo6bW9ub3N0YXRlKSB7CiAgICAgICAgIEFTU0VSVF9OT1Rf UkVBQ0hFRCgpOwogICAgIH0pOwo=